Formatting XbaseGeneratorFragment2.xtend file.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
This commit is contained in:
Tamas Miklossy 2020-05-19 11:54:41 +02:00
parent c8b51fee59
commit 04d660f741
2 changed files with 44 additions and 45 deletions

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015, 2017 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@ -86,7 +86,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
language.webGenModule.superClass = 'org.eclipse.xtext.xbase.web.DefaultXbaseWebModule'.typeRef
}
protected def contributeEditorStub() {
protected def contributeEditorStub() {
if (projectConfig.eclipsePlugin?.srcGen !== null) {
val file = fileAccessFactory.createGeneratedJavaFile(grammar.eclipsePluginEditor)
@ -100,7 +100,6 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
'''
file.writeTo(projectConfig.eclipsePlugin.srcGen)
}
if (projectConfig.eclipsePlugin.manifest !== null) {
projectConfig.eclipsePlugin.manifest.exportedPackages += grammar.eclipsePluginEditor.packageName
@ -131,7 +130,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
'org.eclipse.xtext.xbase.typesystem.internal.LogicalContainerAwareBatchTypeResolver'.typeRef)
.addTypeToType('org.eclipse.xtext.xbase.typesystem.internal.DefaultReentrantTypeResolver'.typeRef,
'org.eclipse.xtext.xbase.typesystem.internal.LogicalContainerAwareReentrantTypeResolver'.typeRef)
.addTypeToType(IResourceValidator.typeRef,
.addTypeToType(IResourceValidator.typeRef,
'org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator'.typeRef)
if (generateXtendInferrer) {
bindingFactory
@ -162,16 +161,16 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
'''
// Rename refactoring
bindingFactory
.addTypeToType('org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler'.typeRef,
.addTypeToType('org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler'.typeRef,
'org.eclipse.xtext.xbase.ui.jvmmodel.findrefs.JvmModelFindReferenceHandler'.typeRef)
.addTypeToType('org.eclipse.xtext.ui.editor.findrefs.ReferenceQueryExecutor'.typeRef,
.addTypeToType('org.eclipse.xtext.ui.editor.findrefs.ReferenceQueryExecutor'.typeRef,
'org.eclipse.xtext.xbase.ui.jvmmodel.findrefs.JvmModelReferenceQueryExecutor'.typeRef)
// overrides binding from org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
.addTypeToType('org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator'.typeRef,
'org.eclipse.xtext.xbase.ui.jvmmodel.refactoring.JvmModelDependentElementsCalculator'.typeRef)
// overrides binding from RefactorElementNameFragment
.addTypeToType('org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider'.typeRef,
.addTypeToType('org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider'.typeRef,
'org.eclipse.xtext.xbase.ui.jvmmodel.refactoring.jdt.CombinedJvmJdtRenameRefactoringProvider'.typeRef)
// overrides binding from RefactorElementNameFragment
.addTypeToType('org.eclipse.xtext.ui.refactoring.IReferenceUpdater'.typeRef,
@ -180,22 +179,22 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
.addfinalTypeToType('org.eclipse.xtext.ui.refactoring.ui.IRenameContextFactory'.typeRef,
'org.eclipse.xtext.xbase.ui.jvmmodel.refactoring.jdt.CombinedJvmJdtRenameContextFactory'.typeRef)
// overrides binding from RefactorElementNameFragment
.addTypeToType('org.eclipse.xtext.ui.refactoring.IRenameStrategy'.typeRef,
.addTypeToType('org.eclipse.xtext.ui.refactoring.IRenameStrategy'.typeRef,
'org.eclipse.xtext.xbase.ui.jvmmodel.refactoring.DefaultJvmModelRenameStrategy'.typeRef)
.addTypeToType(new TypeReference('org.eclipse.xtext.common.types.ui.refactoring.participant', 'JdtRenameParticipant.ContextFactory'),
new TypeReference ('org.eclipse.xtext.xbase.ui.jvmmodel.refactoring', 'JvmModelJdtRenameParticipantContext.ContextFactory'))
.addTypeToType('org.eclipse.xtext.ui.editor.outline.impl.OutlineNodeElementOpener'.typeRef,
.addTypeToType('org.eclipse.xtext.ui.editor.outline.impl.OutlineNodeElementOpener'.typeRef,
'org.eclipse.xtext.xbase.ui.jvmmodel.outline.JvmOutlineNodeElementOpener'.typeRef)
.addTypeToType('org.eclipse.xtext.ui.editor.GlobalURIEditorOpener'.typeRef,
.addTypeToType('org.eclipse.xtext.ui.editor.GlobalURIEditorOpener'.typeRef,
'org.eclipse.xtext.common.types.ui.navigation.GlobalDerivedMemberAwareURIEditorOpener'.typeRef)
.addTypeToType('org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation'.typeRef,
.addTypeToType('org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation'.typeRef,
new TypeReference('org.eclipse.xtext.common.types.ui.query', 'IJavaSearchParticipation.No'))
// DerivedMemberAwareEditorOpener
.addConfiguredBinding('LanguageSpecificURIEditorOpener', statement)
} else {
bindingFactory
.addTypeToType('org.eclipse.xtext.ui.refactoring.IRenameStrategy'.typeRef,
.addTypeToType('org.eclipse.xtext.ui.refactoring.IRenameStrategy'.typeRef,
'org.eclipse.xtext.xbase.ui.refactoring.XbaseRenameStrategy'.typeRef)
}
if (language.grammar.usesXImportSection) {
@ -225,10 +224,10 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
val firstRuleType = language.grammar.rules.head.type.classifier.getJavaTypeName(language.grammar.eResource.resourceSet).typeRef
fileAccessFactory.createXtendFile(jvmModelInferrer, '''
/**
* <p>Infers a JVM model from the source model.</p>
* <p>Infers a JVM model from the source model.</p>
*
* <p>The JVM model should contain all elements that would appear in the Java code
* which is generated from the source model. Other models link against the JVM model rather than the source model.</p>
* <p>The JVM model should contain all elements that would appear in the Java code
* which is generated from the source model. Other models link against the JVM model rather than the source model.</p>
*/
class «jvmModelInferrer.simpleName» extends «'org.eclipse.xtext.xbase.jvmmodel.AbstractModelInferrer'.typeRef» {
@ -240,7 +239,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
/**
* The dispatch method {@code infer} is called for each instance of the
* given element's type that is contained in a resource.
*
*
* @param element
* the model to create one or more
* {@link org.eclipse.xtext.common.types.JvmDeclaredType declared
@ -264,10 +263,10 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
// Here you explain how your model is mapped to Java elements, by writing the actual translation code.
// An implementation for the initial hello world example could look like this:
// acceptor.accept(element.toClass("my.company.greeting.MyGreetings")) [
// for (greeting : element.greetings) {
// members += greeting.toMethod("hello" + greeting.name, typeRef(String)) [
// body = «"'''"»
// acceptor.accept(element.toClass("my.company.greeting.MyGreetings")) [
// for (greeting : element.greetings) {
// members += greeting.toMethod("hello" + greeting.name, typeRef(String)) [
// body = «"'''"»
// return "Hello «'«'»greeting.name«'»'»";
// «"'''"»
// ]
@ -284,7 +283,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
projectConfig.eclipsePlugin.pluginXml.entries += '''
<!-- Type Hierarchy -->
<extension point="org.eclipse.ui.handlers">
<handler
<handler
class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.xtext.xbase.ui.hierarchy.OpenTypeHierarchyHandler"
commandId="org.eclipse.xtext.xbase.ui.hierarchy.OpenTypeHierarchy">
<activeWhen>
@ -293,7 +292,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
</reference>
</activeWhen>
</handler>
<handler
<handler
class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.xtext.xbase.ui.hierarchy.QuickTypeHierarchyHandler"
commandId="org.eclipse.jdt.ui.edit.text.java.open.hierarchy">
<activeWhen>
@ -357,7 +356,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
projectConfig.eclipsePlugin.pluginXml.entries += '''
<!-- Call Hierachy -->
<extension point="org.eclipse.ui.handlers">
<handler
<handler
class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.xtext.xbase.ui.hierarchy.OpenCallHierachyHandler"
commandId="org.eclipse.xtext.xbase.ui.hierarchy.OpenCallHierarchy">
<activeWhen>
@ -386,14 +385,14 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
<factory class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.xtext.builder.smap.StratumBreakpointAdapterFactory"
adaptableType="«grammar.eclipsePluginEditor.name»">
<adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
</factory>
</factory>
</extension>
<extension point="org.eclipse.ui.editorActions">
<editorContribution targetID="«name»"
<editorContribution targetID="«name»"
id="«name».rulerActions">
<action
label="Not Used"
class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
style="push"
actionID="RulerDoubleClick"
id="«name».doubleClickBreakpointAction"/>
@ -426,7 +425,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
</extension>
<!-- Introduce Local Variable Refactoring -->
<extension point="org.eclipse.ui.handlers">
<handler
<handler
class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.xtext.xbase.ui.refactoring.ExtractVariableHandler"
commandId="org.eclipse.xtext.xbase.ui.refactoring.ExtractLocalVariable">
<activeWhen>

View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2015, 2017 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@ -321,16 +321,16 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder.append("/**");
_builder.newLine();
_builder.append(" ");
_builder.append("* <p>Infers a JVM model from the source model.</p> ");
_builder.append("* <p>Infers a JVM model from the source model.</p>");
_builder.newLine();
_builder.append(" ");
_builder.append("*");
_builder.newLine();
_builder.append(" ");
_builder.append("* <p>The JVM model should contain all elements that would appear in the Java code ");
_builder.append("* <p>The JVM model should contain all elements that would appear in the Java code");
_builder.newLine();
_builder.append(" ");
_builder.append("* which is generated from the source model. Other models link against the JVM model rather than the source model.</p> ");
_builder.append("* which is generated from the source model. Other models link against the JVM model rather than the source model.</p>");
_builder.newLine();
_builder.append(" ");
_builder.append("*/");
@ -371,7 +371,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder.append("* given element\'s type that is contained in a resource.");
_builder.newLine();
_builder.append("\t ");
_builder.append("* ");
_builder.append("*");
_builder.newLine();
_builder.append("\t ");
_builder.append("* @param element");
@ -446,13 +446,13 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder.append("\t\t");
_builder.append("// An implementation for the initial hello world example could look like this:");
_builder.newLine();
_builder.append("// \t\tacceptor.accept(element.toClass(\"my.company.greeting.MyGreetings\")) [");
_builder.append("//\t\tacceptor.accept(element.toClass(\"my.company.greeting.MyGreetings\")) [");
_builder.newLine();
_builder.append("// \t\t\tfor (greeting : element.greetings) {");
_builder.append("//\t\t\tfor (greeting : element.greetings) {");
_builder.newLine();
_builder.append("// \t\t\t\tmembers += greeting.toMethod(\"hello\" + greeting.name, typeRef(String)) [");
_builder.append("//\t\t\t\tmembers += greeting.toMethod(\"hello\" + greeting.name, typeRef(String)) [");
_builder.newLine();
_builder.append("// \t\t\t\t\tbody = ");
_builder.append("//\t\t\t\t\tbody = ");
_builder.append("\'\'\'");
_builder.newLineIfNotEmpty();
_builder.append("//\t\t\t\t\t\treturn \"Hello ");
@ -492,7 +492,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder.append("<extension point=\"org.eclipse.ui.handlers\">");
_builder.newLine();
_builder.append("\t");
_builder.append("<handler ");
_builder.append("<handler");
_builder.newLine();
_builder.append("\t\t");
_builder.append("class=\"");
@ -524,7 +524,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder.append("</handler>");
_builder.newLine();
_builder.append("\t");
_builder.append("<handler ");
_builder.append("<handler");
_builder.newLine();
_builder.append("\t\t");
_builder.append("class=\"");
@ -736,7 +736,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder_1.append("<extension point=\"org.eclipse.ui.handlers\">");
_builder_1.newLine();
_builder_1.append("\t");
_builder_1.append("<handler ");
_builder_1.append("<handler");
_builder_1.newLine();
_builder_1.append("\t\t");
_builder_1.append("class=\"");
@ -827,7 +827,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder_2.append("<adapter type=\"org.eclipse.debug.ui.actions.IToggleBreakpointsTarget\"/>");
_builder_2.newLine();
_builder_2.append("\t");
_builder_2.append("</factory> ");
_builder_2.append("</factory>");
_builder_2.newLine();
_builder_2.append("</extension>");
_builder_2.newLine();
@ -836,7 +836,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder_2.append("\t");
_builder_2.append("<editorContribution targetID=\"");
_builder_2.append(name, "\t");
_builder_2.append("\" ");
_builder_2.append("\"");
_builder_2.newLineIfNotEmpty();
_builder_2.append("\t\t");
_builder_2.append("id=\"");
@ -849,10 +849,10 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder_2.append("\t\t\t");
_builder_2.append("label=\"Not Used\"");
_builder_2.newLine();
_builder_2.append(" \t\t\t");
_builder_2.append("\t\t\t");
_builder_2.append("class=\"");
TypeReference _eclipsePluginExecutableExtensionFactory_5 = this._xtextGeneratorNaming.getEclipsePluginExecutableExtensionFactory(this.getGrammar());
_builder_2.append(_eclipsePluginExecutableExtensionFactory_5, " \t\t\t");
_builder_2.append(_eclipsePluginExecutableExtensionFactory_5, "\t\t\t");
_builder_2.append(":org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate\"");
_builder_2.newLineIfNotEmpty();
_builder_2.append("\t\t\t");
@ -968,7 +968,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
_builder_2.append("<extension point=\"org.eclipse.ui.handlers\">");
_builder_2.newLine();
_builder_2.append("\t");
_builder_2.append("<handler ");
_builder_2.append("<handler");
_builder_2.newLine();
_builder_2.append("\t\t");
_builder_2.append("class=\"");