Fix: https://bugs.eclipse.org/bugs/show_bug.cgi?id=273571

12 files changed, 143 insertions, 6 deletions

diff --git a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
index 975d18f..28962c4 100644
--- a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
+++ b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Export-Package: ReferenceModel,
  org.eclipse.xtext.reference.referenceGrammar,

  org.eclipse.xtext.reference.referenceGrammar.util,

  org.eclipse.xtext.reference.services,

- org.eclipse.xtext.reference.parser.antlr

+ org.eclipse.xtext.reference.parser.antlr,

+ org.eclipse.xtext.reference.referenceGrammar.impl

 Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15",

  org.eclipse.xtext,

  org.eclipse.xtext.generator,

diff --git a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
index 2aafa9b..e46ead0 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
@@ -26,4 +26,6 @@ Export-Package: org.eclipse.xtext.example,
  org.eclipse.xtext.example.parser.antlr,

  org.eclipse.xtext.example.parser.packrat,

  org.eclipse.xtext.example.services,

- org.eclipse.xtext.example.parser.packrat.consumers

+ org.eclipse.xtext.example.parser.packrat.consumers,

+ org.eclipse.xtext.example.ecoredsl.impl,

+ org.eclipse.xtext.example.ecoredsl.util

diff --git a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
index 7ba2235..4fb73db 100644
--- a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
@@ -151,5 +151,81 @@ Export-Package: org.eclipse.xtext,
  org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers,

  org.eclipse.xtext.xtext.ecoreInference.parseTreeConstruction,

  org.eclipse.xtext.xtext.ecoreInference.parser.antlr,

- org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage

+ org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage,

+ org.eclipse.xtext.xtextTest.impl,

+ org.eclipse.xtext.xtextTest.util,

+ org.eclipse.xtext.crossrefs.lazy.lazyLinking.impl,

+ org.eclipse.xtext.crossrefs.lazy.lazyLinking.util,

+ org.eclipse.xtext.crossrefs.importedURI.impl,

+ org.eclipse.xtext.crossrefs.importedURI.util,

+ org.eclipse.xtext.crossrefs.langATestLanguage.impl,

+ org.eclipse.xtext.crossrefs.langATestLanguage.util,

+ org.eclipse.xtext.dummy.dummyLang.impl,

+ org.eclipse.xtext.dummy.dummyLang.util,

+ org.eclipse.xtext.enumrules.enumRulesTestLanguage.impl,

+ org.eclipse.xtext.enumrules.enumRulesTestLanguage.util,

+ org.eclipse.xtext.generator.lowerCaseNamedTestLanguage.impl,

+ org.eclipse.xtext.generator.lowerCaseNamedTestLanguage.util,

+ org.eclipse.xtext.grammarinheritance.baseInheritanceTest.impl,

+ org.eclipse.xtext.grammarinheritance.baseInheritanceTest.util,

+ org.eclipse.xtext.grammarinheritance.foo.impl,

+ org.eclipse.xtext.grammarinheritance.foo.util,

+ org.eclipse.xtext.grammarinheritance.inheritanceTest.impl,

+ org.eclipse.xtext.grammarinheritance.inheritanceTest.util,

+ org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.impl,

+ org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.util,

+ org.eclipse.xtext.metamodelreferencing.tests.simpleTest.impl,

+ org.eclipse.xtext.metamodelreferencing.tests.simpleTest.util,

+ org.eclipse.xtext.metamodelreferencing.tests.otherTest.impl,

+ org.eclipse.xtext.metamodelreferencing.tests.otherTest.util,

+ org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.impl,

+ org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.util,

+ org.eclipse.xtext.parser.epatch.epatchTestLanguage.impl,

+ org.eclipse.xtext.parser.epatch.epatchTestLanguage.util,

+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage.impl,

+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage.util,

+ org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.impl,

+ org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.util,

+ org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage.impl,

+ org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage.util,

+ org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl,

+ org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.util,

+ org.eclipse.xtext.parsetree.formatter.formattertestlanguage.impl,

+ org.eclipse.xtext.parsetree.formatter.formattertestlanguage.util,

+ org.eclipse.xtext.parsetree.reconstr.complexrewritetest.impl,

+ org.eclipse.xtext.parsetree.reconstr.complexrewritetest.util,

+ org.eclipse.xtext.parsetree.reconstr.simplerewritetest.impl,

+ org.eclipse.xtext.parsetree.reconstr.simplerewritetest.util,

+ org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.impl,

+ org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.util,

+ org.eclipse.xtext.parsetree.transientvalues.transientvaluestest.impl,

+ org.eclipse.xtext.parsetree.transientvalues.transientvaluestest.util,

+ org.eclipse.xtext.testlanguages.actionLang.impl,

+ org.eclipse.xtext.testlanguages.actionLang.util,

+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage.impl,

+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage.util,

+ org.eclipse.xtext.testlanguages.fowlerdsl.impl,

+ org.eclipse.xtext.testlanguages.fowlerdsl.util,

+ org.eclipse.xtext.testlanguages.lexerLang.impl,

+ org.eclipse.xtext.testlanguages.lexerLang.util,

+ org.eclipse.xtext.testlanguages.lookaheadLang.impl,

+ org.eclipse.xtext.testlanguages.lookaheadLang.util,

+ org.eclipse.xtext.testlanguages.optionalEmpty.impl,

+ org.eclipse.xtext.testlanguages.optionalEmpty.util,

+ org.eclipse.xtext.testlanguages.partialParserTestLanguage.impl,

+ org.eclipse.xtext.testlanguages.partialParserTestLanguage.util,

+ org.eclipse.xtext.testlanguages.referenceGrammar.impl,

+ org.eclipse.xtext.testlanguages.referenceGrammar.util,

+ org.eclipse.xtext.testlanguages.simpleExpressions.impl,

+ org.eclipse.xtext.testlanguages.simpleExpressions.util,

+ org.eclipse.xtext.testlanguages.testLang.impl,

+ org.eclipse.xtext.testlanguages.testLang.util,

+ org.eclipse.xtext.testlanguages.treeTestLanguage.impl,

+ org.eclipse.xtext.testlanguages.treeTestLanguage.util,

+ org.eclipse.xtext.valueconverter.bug250313.impl,

+ org.eclipse.xtext.valueconverter.bug250313.util,

+ org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.impl,

+ org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.util,

+ org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl,

+ org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.util

 

diff --git a/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF
index 3b8810d..58280ae 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF
@@ -70,5 +70,19 @@ Export-Package: org.eclipse.xtext.ui.common,
  org.eclipse.xtext.enumrules.parser.packrat,

  org.eclipse.xtext.enumrules.parser.packrat.consumers,

  org.eclipse.xtext.enumrules.parseTreeConstruction,

- org.eclipse.xtext.enumrules.parser.antlr

+ org.eclipse.xtext.enumrules.parser.antlr,

+ org.eclipse.xtext.xtextTest.impl,

+ org.eclipse.xtext.xtextTest.util,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.util,

+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage.impl,

+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage.util,

+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage.impl,

+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage.util,

+ org.eclipse.xtext.testlanguages.referenceGrammar.impl,

+ org.eclipse.xtext.testlanguages.referenceGrammar.util,

+ org.eclipse.xtext.testlanguages.treeTestLanguage.impl,

+ org.eclipse.xtext.testlanguages.treeTestLanguage.util,

+ org.eclipse.xtext.enumrules.enumRulesTestLanguage.impl,

+ org.eclipse.xtext.enumrules.enumRulesTestLanguage.util

 

diff --git a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
index 34ad4a5..1716186 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,9 @@ Export-Package: org.eclipse.xtext.ui.core.util,
  org.eclipse.xtext.ui.integration.parser.packrat,

  org.eclipse.xtext.ui.integration.parser.packrat.consumers,

  org.eclipse.xtext.ui.integration.parseTreeConstruction,

- org.eclipse.xtext.ui.integration.parser.antlr

+ org.eclipse.xtext.ui.integration.parser.antlr,

+ org.eclipse.xtext.ui.integration.foo.impl,

+ org.eclipse.xtext.ui.integration.foo.util

 Require-Bundle: org.eclipse.xtext.generator;bundle-version="0.7.0",

  org.eclipse.xtext.log4j;bundle-version="1.2.15",

  org.eclipse.xtext;bundle-version="0.7.0",

diff --git a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
index f3ce3a3..dae31b6 100644
--- a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
@@ -52,5 +52,17 @@ Export-Package: org.eclipse.xtext,
  org.eclipse.xtext.enumrules.parser.packrat,

  org.eclipse.xtext.enumrules.parser.packrat.consumers,

  org.eclipse.xtext.enumrules.parseTreeConstruction,

- org.eclipse.xtext.enumrules.parser.antlr

+ org.eclipse.xtext.enumrules.parser.antlr,

+ org.eclipse.xtext.xtextTest.impl,

+ org.eclipse.xtext.xtextTest.util,

+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage.impl,

+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage.util,

+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage.impl,

+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage.util,

+ org.eclipse.xtext.testlanguages.referenceGrammar.impl,

+ org.eclipse.xtext.testlanguages.referenceGrammar.util,

+ org.eclipse.xtext.testlanguages.treeTestLanguage.impl,

+ org.eclipse.xtext.testlanguages.treeTestLanguage.util,

+ org.eclipse.xtext.enumrules.enumRulesTestLanguage.impl,

+ org.eclipse.xtext.enumrules.enumRulesTestLanguage.util

 Bundle-Activator: org.eclipse.xtext.xtend.XtendTestsActivator

diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
index 254ece7..2493f7d 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
@@ -27,4 +27,9 @@ public abstract class AbstractXtextGrammarTestLanguageUiModule extends DefaultUI
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
 	}
 
+	
+	public Class<? extends org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+		return org.eclipse.xtext.XtextGrammarTestLanguageProposalProvider.class;
+	}
+
 }
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java
index a4794ac..e875a72 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java
@@ -27,4 +27,9 @@ public abstract class AbstractEnumRulesTestLanguageUiModule extends DefaultUIMod
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
 	}
 
+	
+	public Class<? extends org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+		return org.eclipse.xtext.enumrules.EnumRulesTestLanguageProposalProvider.class;
+	}
+
 }
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
index 40639c5..3d8d9d9 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
@@ -27,4 +27,9 @@ public abstract class AbstractKeywordsTestLanguageUiModule extends DefaultUIModu
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
 	}
 
+	
+	public Class<? extends org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+		return org.eclipse.xtext.parser.keywords.KeywordsTestLanguageProposalProvider.class;
+	}
+
 }
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
index 7e519b9..4764e87 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
@@ -27,4 +27,9 @@ public abstract class AbstractContentAssistTestLanguageUiModule extends DefaultU
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
 	}
 
+	
+	public Class<? extends org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+		return org.eclipse.xtext.testlanguages.ContentAssistTestLanguageProposalProvider.class;
+	}
+
 }
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
index ee7434a..93829c1 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
@@ -27,4 +27,9 @@ public abstract class AbstractReferenceGrammarTestLanguageUiModule extends Defau
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
 	}
 
+	
+	public Class<? extends org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+		return org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageProposalProvider.class;
+	}
+
 }
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
index 83aea64..fb5fcb4 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
@@ -27,4 +27,9 @@ public abstract class AbstractTreeTestLanguageUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
 	}
 
+	
+	public Class<? extends org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+		return org.eclipse.xtext.testlanguages.TreeTestLanguageProposalProvider.class;
+	}
+
 }