Merge pull request #109 from kthoms/kth/issue108

[#108] Ecore2Xtext use new formatter fragment
This commit is contained in:
Lorenzo Bettini 2016-09-26 09:12:44 +02:00 committed by GitHub
commit c93db76702
2 changed files with 26 additions and 4 deletions

View file

@ -12,6 +12,17 @@ import org.eclipse.xtext.xtext.wizard.ecore2xtext.Ecore2XtextGrammarCreator
import static org.eclipse.xtext.xtext.wizard.ExternalDependency.*
/**
* @author Dennis Huebner - Initial contribution and API
* @author Sven Efftinge
* @author Miro Spoenemann
* @author Stefan Oehme
* @author Christian Schneider
* @author Moritz Eysholdt
* @author Lorenzo Bettini - bug#494176
* @author Karsten Thoms - bug#484500, issue#108
* @since 2.9
*/
class RuntimeProjectDescriptor extends TestedProjectDescriptor {
val grammarCreator = new Ecore2XtextGrammarCreator
@ -229,8 +240,8 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
fragment = ecore2xtext.Ecore2XtextValueConverterServiceFragment2 auto-inject {}
fragment = org.eclipse.xtext.generator.adapter.FragmentAdapter {
fragment = org.eclipse.xtext.generator.ecore2xtext.FormatterFragment {}
formatter = {
generateStub = true
}
«ENDIF»

View file

@ -47,6 +47,17 @@ import org.eclipse.xtext.xtext.wizard.WebProjectDescriptor;
import org.eclipse.xtext.xtext.wizard.WizardConfiguration;
import org.eclipse.xtext.xtext.wizard.ecore2xtext.Ecore2XtextGrammarCreator;
/**
* @author Dennis Huebner - Initial contribution and API
* @author Sven Efftinge
* @author Miro Spoenemann
* @author Stefan Oehme
* @author Christian Schneider
* @author Moritz Eysholdt
* @author Lorenzo Bettini - bug#494176
* @author Karsten Thoms - bug#484500, issue#108
* @since 2.9
*/
@SuppressWarnings("all")
public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
private final Ecore2XtextGrammarCreator grammarCreator = new Ecore2XtextGrammarCreator();
@ -553,11 +564,11 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
_builder.newLine();
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("fragment = org.eclipse.xtext.generator.adapter.FragmentAdapter {");
_builder.append("formatter = {");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("fragment = org.eclipse.xtext.generator.ecore2xtext.FormatterFragment {}");
_builder.append("generateStub = true");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("}");