aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-04-28 10:09:33 (EDT)
committersefftinge2009-04-28 10:09:33 (EDT)
commit7437216e34afd276ebb0519f85ae547448e27588 (patch)
treebcabaf1a032674676fe3d33aacc7b5b1889a4ec8
parente7361c5963759690b9657e7233dd19a0adbc6465 (diff)
downloadorg.eclipse.xtext-7437216e34afd276ebb0519f85ae547448e27588.zip
org.eclipse.xtext-7437216e34afd276ebb0519f85ae547448e27588.tar.gz
org.eclipse.xtext-7437216e34afd276ebb0519f85ae547448e27588.tar.bz2
* Fixes for computation of follow-elements
* Fixes for ProposalConflictHelper in connection with data-type rules
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelper.java10
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/antlr/AntlrProposalConflictHelper.java86
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF18
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/plugin.xml35
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen34
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageProposalProvider.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageProposalProvider.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageRuntimeModule.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageRuntimeModule.java)22
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageUiModule.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java)6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.ecore (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.ecore)0
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.genmodel (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.xmi (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageCheckValidator.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageCheckValidator.java)6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageExecutableExtensionFactory.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageExecutableExtensionFactory.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageStandaloneSetup.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageStandaloneSetup.java)6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parseTreeConstruction/TwoContextsTestLanguageParsetreeConstructor.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parseTreeConstruction/TwoContextsTestLanguageParsetreeConstructor.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/TwoContextsTestLanguageAntlrTokenFileProvider.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/TwoContextsTestLanguageAntlrTokenFileProvider.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/TwoContextsTestLanguageParser.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/TwoContextsTestLanguageParser.java)12
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g)8
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens)0
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java)110
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguageParser.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageParser.java)52
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage__.g (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage__.g)16
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguageDelimiters.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageDelimiters.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguagePackratParser.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguagePackratParser.java)8
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguageParserConfiguration.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageParserConfiguration.java)16
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/consumers/TwoContextsTestLanguageAnElementConsumer.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/consumers/TwoContextsTestLanguageAnElementConsumer.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/consumers/TwoContextsTestLanguageMainModelConsumer.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/consumers/TwoContextsTestLanguageMainModelConsumer.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/services/TwoContextsTestLanguageGrammarAccess.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/AnElement.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/AnElement.java)16
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/MainModel.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/MainModel.java)10
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/TwoContextsFactory.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/TwoContextsFactory.java)6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/TwoContextsPackage.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/TwoContextsPackage.java)50
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/AnElementImpl.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/AnElementImpl.java)10
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/MainModelImpl.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/MainModelImpl.java)10
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/TwoContextsFactoryImpl.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsFactoryImpl.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/TwoContextsPackageImpl.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsPackageImpl.java)12
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/util/TwoContextsAdapterFactory.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/util/TwoContextsAdapterFactory.java)14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/util/TwoContextsSwitch.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/util/TwoContextsSwitch.java)6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/tests/Activator.java6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/GenerateTestLanguages.mwe2
-rwxr-xr-xtests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/AbstractContentAssistProcessorTest.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractContentAssistProcessorTest.java)36
-rwxr-xr-x[-rw-r--r--]tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/ContentAssistProcessorTestBuilder.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/ContentAssistProcessorTestBuilder.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/IContentAssistProcessorTestSetup.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/IContentAssistProcessorTestSetup.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/JavaContentAssistProcessorTest.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaContentAssistProcessorTest.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/JavaContentAssistProcessorTestSetup.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaContentAssistProcessorTestSetup.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/MockableSelectionProvider.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/MockableSelectionProvider.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/MockableTextViewer.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/MockableTextViewer.java)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelperTest.java134
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsContentAssistTest.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsContentAssistTest.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.xtext (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xtext)2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageChecks.chk (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageChecks.chk)0
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageProposalProvider.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageProposalProvider.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageRuntimeModule.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageRuntimeModule.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageUiModule.java (renamed from tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageUiModule.java)4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/tests/AllTests.java3
-rwxr-xr-xtests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTest.java6
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTestSetup.java2
57 files changed, 520 insertions, 312 deletions
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelper.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelper.java
index 18aca56..962eb1b 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelper.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelper.java
@@ -25,23 +25,23 @@ public abstract class ProposalConflictHelper implements IProposalConflictHelper
if (nodeEnd < replaceRegion.getOffset())
return false;
- return existsConflict(proposal, lastCompleteNode, replaceRegion.getOffset());
+ return existsConflict(lastCompleteNode, replaceRegion.getOffset(), proposal);
}
- public abstract boolean existsConflict(String proposal, String lastCompleteText);
+ public abstract boolean existsConflict(String lastCompleteText, String proposal);
- public boolean existsConflict(String proposal, AbstractNode lastCompleteNode, int offset) {
+ public boolean existsConflict(AbstractNode lastCompleteNode, int offset, String proposal) {
String lastCompleteText = lastCompleteNode.serialize();
lastCompleteText = lastCompleteText.substring(0, offset - lastCompleteNode.getTotalOffset());
if (Strings.isEmpty(lastCompleteText))
return false;
- return existsConflict(proposal, lastCompleteText);
+ return existsConflict(lastCompleteText, proposal);
}
public static class NullHelper extends ProposalConflictHelper {
@Override
- public boolean existsConflict(String proposal, String lastCompleteText) {
+ public boolean existsConflict(String lastCompleteText, String proposal) {
return false;
}
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/antlr/AntlrProposalConflictHelper.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/antlr/AntlrProposalConflictHelper.java
index 5034d32..f57cdcb 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/antlr/AntlrProposalConflictHelper.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/antlr/AntlrProposalConflictHelper.java
@@ -21,35 +21,75 @@ import com.google.inject.Inject;
public class AntlrProposalConflictHelper extends ProposalConflictHelper {
@Inject
- private Lexer lexer;
-
- public void setLexer(Lexer lexer) {
- this.lexer = lexer;
- }
+ private Lexer proposalLexer;
- public Lexer getLexer() {
- return lexer;
- }
+ @Inject
+ private Lexer lastCompleteLexer;
+
+ @Inject
+ private Lexer combinedLexer;
@Override
- public boolean existsConflict(String proposal, String lastCompleteText) {
- String combinedText = lastCompleteText.concat(proposal);
- CharStream stream = new ANTLRStringStream(combinedText);
- lexer.setCharStream(stream);
-
- String[] expectedTexts = new String[] { lastCompleteText, proposal };
- for(String expected: expectedTexts) {
- Token nextToken = lexer.nextToken();
- if (nextToken.equals(Token.EOF_TOKEN))
- return true;
- String tokenText = nextToken.getText();
- if (!expected.equals(tokenText))
- return true;
- }
- Token lastToken = lexer.nextToken();
+ public boolean existsConflict(String lastCompleteText, String proposal) {
+ initLexer(lastCompleteText, proposal);
+ if (!equalTokenSequence(lastCompleteLexer, combinedLexer))
+ return true;
+ if (!equalTokenSequence(proposalLexer, combinedLexer))
+ return true;
+ Token lastToken = proposalLexer.nextToken();
if (!lastToken.equals(Token.EOF_TOKEN))
return true;
return false;
}
+
+ protected boolean equalTokenSequence(Lexer first, Lexer second) {
+ Token token = null;
+ while(!(token = first.nextToken()).equals(Token.EOF_TOKEN)) {
+ Token otherToken = second.nextToken();
+ if (otherToken.equals(Token.EOF_TOKEN)) {
+ return false;
+ }
+ if (!token.getText().equals(otherToken.getText())) {
+ return false;
+ }
+ }
+ return true;
+ }
+ protected void initLexer(String lastCompleteText, String proposal) {
+ String combinedText = lastCompleteText.concat(proposal);
+ initLexer(combinedText, combinedLexer);
+ initLexer(lastCompleteText, lastCompleteLexer);
+ initLexer(proposal, proposalLexer);
+ }
+
+ protected void initLexer(String text, Lexer lexer) {
+ CharStream stream = new ANTLRStringStream(text);
+ lexer.setCharStream(stream);
+ }
+
+ public Lexer getProposalLexer() {
+ return proposalLexer;
+ }
+
+ public void setProposalLexer(Lexer proposalLexer) {
+ this.proposalLexer = proposalLexer;
+ }
+
+ public Lexer getCombinedLexer() {
+ return combinedLexer;
+ }
+
+ public void setCombinedLexer(Lexer combinedLexer) {
+ this.combinedLexer = combinedLexer;
+ }
+
+ public void setLastCompleteLexer(Lexer lastCompleteLexer) {
+ this.lastCompleteLexer = lastCompleteLexer;
+ }
+
+ public Lexer getLastCompleteLexer() {
+ return lastCompleteLexer;
+ }
+
}
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 7fe4379..91aac80 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
@@ -36,18 +36,12 @@ Require-Bundle: org.eclipse.ui,
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xtext.ui.common,
- org.eclipse.xtext.ui.common.editor.contentassist.impl,
org.eclipse.xtext.xtextTest,
org.eclipse.xtext,
org.eclipse.xtext.parser.packrat,
org.eclipse.xtext.parser.packrat.consumers,
org.eclipse.xtext.parseTreeConstruction,
org.eclipse.xtext.parser.antlr,
- org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts,
- org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat,
- org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.consumers,
- org.eclipse.xtext.ui.common.editor.contentassist.impl.parseTreeConstruction,
- org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr,
org.eclipse.xtext.grammarinheritance,
org.eclipse.xtext.grammarinheritance.parser.packrat,
org.eclipse.xtext.grammarinheritance.parser.packrat.consumers,
@@ -74,8 +68,6 @@ Export-Package: org.eclipse.xtext.ui.common,
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,
@@ -85,5 +77,13 @@ Export-Package: org.eclipse.xtext.ui.common,
org.eclipse.xtext.testlanguages.treeTestLanguage.impl,
org.eclipse.xtext.testlanguages.treeTestLanguage.util,
org.eclipse.xtext.enumrules.enumRulesTestLanguage.impl,
- org.eclipse.xtext.enumrules.enumRulesTestLanguage.util
+ org.eclipse.xtext.enumrules.enumRulesTestLanguage.util,
+ org.eclipse.xtext.ui.common.editor.contentassist.twoContexts,
+ org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl,
+ org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.util,
+ org.eclipse.xtext.ui.common.editor.contentassist,
+ org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat,
+ org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.consumers,
+ org.eclipse.xtext.ui.common.editor.contentassist.parseTreeConstruction,
+ org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr
diff --git a/tests/org.eclipse.xtext.ui.common.tests/plugin.xml b/tests/org.eclipse.xtext.ui.common.tests/plugin.xml
index 678b3b4..74d831c 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/plugin.xml
+++ b/tests/org.eclipse.xtext.ui.common.tests/plugin.xml
@@ -94,8 +94,8 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/tmf/tests/2009/twoContexts"
- class = "org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage"
- genModel = "org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel" />
+ class = "org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage"
+ genModel = "org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.genmodel" />
</extension>
@@ -105,7 +105,7 @@
<extension
point="org.eclipse.emf.ecore.extension_parser">
<parser
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.XtextResourceFactory"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.XtextResourceFactory"
type="twocontextstestlanguage">
</parser>
</extension>
@@ -114,33 +114,33 @@
<extension
point="org.eclipse.ui.editors">
<editor
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.XtextEditor"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.XtextEditor"
contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
default="true"
extensions="twocontextstestlanguage"
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
name="TwoContextsTestLanguage Editor">
</editor>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
<activeWhen>
<reference
- definitionId="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.Editor.opened">
+ definitionId="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.Editor.opened">
</reference>
</activeWhen>
</handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
- <definition id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.Editor.opened">
+ <definition id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.Editor.opened">
<and>
<reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
<with variable="activeEditor">
<test property="org.eclipse.xtext.ui.core.editor.XtextEditor.languageName"
- value="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
+ value="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
forcePluginActivation="true"/>
</with>
</and>
@@ -149,17 +149,17 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
name="TwoContextsTestLanguage">
<keywordReference
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.ui.keyword_TwoContextsTestLanguage">
+ id="org.eclipse.xtext.ui.common.editor.contentassist.ui.keyword_TwoContextsTestLanguage">
</keywordReference>
</page>
<page
- category="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.EditorPreferencePage"
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.editor"
+ category="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.EditorPreferencePage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.editor"
name="Editor">
<keywordReference
id="org.eclipse.xtext.keyword.editor">
@@ -169,17 +169,16 @@
<extension
point="org.eclipse.ui.keywords">
<keyword
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.ui.keyword_TwoContextsTestLanguage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.ui.keyword_TwoContextsTestLanguage"
label="TwoContextsTestLanguage">
</keyword>
<keyword
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.tasktags"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.tasktags"
label="Task Tags">
</keyword>
</extension>
-
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/2009/tmf/xtext/KeywordsTestLanguage"
diff --git a/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen b/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen
index 678b3b4..e1870ef 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen
+++ b/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen
@@ -94,8 +94,8 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/tmf/tests/2009/twoContexts"
- class = "org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage"
- genModel = "org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel" />
+ class = "org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage"
+ genModel = "org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.genmodel" />
</extension>
@@ -105,7 +105,7 @@
<extension
point="org.eclipse.emf.ecore.extension_parser">
<parser
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.XtextResourceFactory"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.XtextResourceFactory"
type="twocontextstestlanguage">
</parser>
</extension>
@@ -114,33 +114,33 @@
<extension
point="org.eclipse.ui.editors">
<editor
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.XtextEditor"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.XtextEditor"
contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
default="true"
extensions="twocontextstestlanguage"
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
name="TwoContextsTestLanguage Editor">
</editor>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
<activeWhen>
<reference
- definitionId="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.Editor.opened">
+ definitionId="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.Editor.opened">
</reference>
</activeWhen>
</handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
- <definition id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.Editor.opened">
+ <definition id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.Editor.opened">
<and>
<reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
<with variable="activeEditor">
<test property="org.eclipse.xtext.ui.core.editor.XtextEditor.languageName"
- value="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
+ value="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
forcePluginActivation="true"/>
</with>
</and>
@@ -149,17 +149,17 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
name="TwoContextsTestLanguage">
<keywordReference
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.ui.keyword_TwoContextsTestLanguage">
+ id="org.eclipse.xtext.ui.common.editor.contentassist.ui.keyword_TwoContextsTestLanguage">
</keywordReference>
</page>
<page
- category="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage"
- class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.EditorPreferencePage"
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.editor"
+ category="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage"
+ class="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.EditorPreferencePage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.editor"
name="Editor">
<keywordReference
id="org.eclipse.xtext.keyword.editor">
@@ -169,11 +169,11 @@
<extension
point="org.eclipse.ui.keywords">
<keyword
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.ui.keyword_TwoContextsTestLanguage"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.ui.keyword_TwoContextsTestLanguage"
label="TwoContextsTestLanguage">
</keyword>
<keyword
- id="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage.tasktags"
+ id="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage.tasktags"
label="Task Tags">
</keyword>
</extension>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageProposalProvider.java
index f89fb69..3ae82dd 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageProposalProvider.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageRuntimeModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageRuntimeModule.java
index f15e5e1..b512978 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageRuntimeModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageRuntimeModule.java
@@ -2,7 +2,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.xtext.Constants;
import org.eclipse.xtext.service.DefaultRuntimeModule;
@@ -11,7 +11,7 @@ import com.google.inject.Binder;
import com.google.inject.name.Names;
/**
- * Manual modifications go to {org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageRuntimeModule}
+ * Manual modifications go to {org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageRuntimeModule}
*/
public abstract class AbstractTwoContextsTestLanguageRuntimeModule extends DefaultRuntimeModule {
@@ -19,23 +19,23 @@ public abstract class AbstractTwoContextsTestLanguageRuntimeModule extends Defau
public void configure(Binder binder) {
super.configure(binder);
binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance(
- "org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage");
+ "org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage");
}
public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess.class;
+ return org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess.class;
}
public Class<? extends org.eclipse.xtext.parser.packrat.IPackratParser> bindIPackratParser() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.TwoContextsTestLanguagePackratParser.class;
+ return org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.TwoContextsTestLanguagePackratParser.class;
}
public Class<? extends org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor> bindIParseTreeConstructor() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.parseTreeConstruction.TwoContextsTestLanguageParsetreeConstructor.class;
+ return org.eclipse.xtext.ui.common.editor.contentassist.parseTreeConstruction.TwoContextsTestLanguageParsetreeConstructor.class;
}
@@ -54,13 +54,13 @@ public abstract class AbstractTwoContextsTestLanguageRuntimeModule extends Defau
}
@org.eclipse.xtext.service.SingletonBinding(eager=true)
- public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageCheckValidator> bindTwoContextsTestLanguageCheckValidator() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageCheckValidator.class;
+ public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageCheckValidator> bindTwoContextsTestLanguageCheckValidator() {
+ return org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageCheckValidator.class;
}
public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.TwoContextsTestLanguageParser.class;
+ return org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.TwoContextsTestLanguageParser.class;
}
@@ -70,12 +70,12 @@ public abstract class AbstractTwoContextsTestLanguageRuntimeModule extends Defau
public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.TwoContextsTestLanguageAntlrTokenFileProvider.class;
+ return org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.TwoContextsTestLanguageAntlrTokenFileProvider.class;
}
public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal.InternalTwoContextsTestLanguageLexer.class;
+ return org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal.InternalTwoContextsTestLanguageLexer.class;
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageUiModule.java
index 4b9d110..37b2ecc 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/AbstractTwoContextsTestLanguageUiModule.java
@@ -2,12 +2,12 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.xtext.ui.common.service.DefaultUIModule;
/**
- * Manual modifications go to {org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageUiModule}
+ * Manual modifications go to {org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageUiModule}
*/
public abstract class AbstractTwoContextsTestLanguageUiModule extends DefaultUIModule {
@@ -34,7 +34,7 @@ public abstract class AbstractTwoContextsTestLanguageUiModule extends DefaultUIM
public Class<? extends org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
- return org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageProposalProvider.class;
+ return org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageProposalProvider.class;
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.ecore b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.ecore
index 6b7ab08..6b7ab08 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.ecore
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.ecore
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.genmodel
index eba950e..577d80e 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.genmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="TwoContextsTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
- <genPackages prefix="TwoContexts" basePackage="org.eclipse.xtext.ui.common.editor.contentassist.impl" disposableProviderFactory="true">
+ <genPackages prefix="TwoContexts" basePackage="org.eclipse.xtext.ui.common.editor.contentassist" disposableProviderFactory="true">
<ecorePackage href="TwoContextsTestLanguage.ecore#/"/>
<genClasses>
<ecoreClass href="TwoContextsTestLanguage.ecore#//MainModel"/>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.xmi
index f80504e..e9fd2ba 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.xmi
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext">
- <xtext:Grammar name="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage" usedGrammars="/1">
+ <xtext:Grammar name="org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="twoContexts">
<ePackage href="http://www.eclipse.org/tmf/tests/2009/twoContexts#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageCheckValidator.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageCheckValidator.java
index f834838..676fcc6 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageCheckValidator.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageCheckValidator.java
@@ -1,5 +1,5 @@
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import java.util.ArrayList;
import java.util.List;
@@ -9,14 +9,14 @@ import org.eclipse.xtext.validator.CheckType;
public class TwoContextsTestLanguageCheckValidator extends org.eclipse.xtext.check.AbstractCheckValidator {
public TwoContextsTestLanguageCheckValidator() {
- addCheckFile("org::eclipse::xtext::ui::common::editor::contentassist::impl::TwoContextsTestLanguageChecks", CheckType.FAST);
+ addCheckFile("org::eclipse::xtext::ui::common::editor::contentassist::TwoContextsTestLanguageChecks", CheckType.FAST);
}
@Override
protected List<? extends EPackage> getEPackages() {
List<EPackage> result = new ArrayList<EPackage>();
- result.add(org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage.eINSTANCE);
+ result.add(org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage.eINSTANCE);
return result;
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageExecutableExtensionFactory.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageExecutableExtensionFactory.java
index dfccdf4..57f6116 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageExecutableExtensionFactory.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageExecutableExtensionFactory.java
@@ -3,7 +3,7 @@
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.CoreException;
@@ -35,7 +35,7 @@ public class TwoContextsTestLanguageExecutableExtensionFactory implements IExecu
Bundle bundle = org.eclipse.xtext.ui.common.tests.Activator.getInstance().getBundle();
try {
Class<?> class1 = bundle.loadClass(clazzName);
- return org.eclipse.xtext.ui.common.tests.Activator.getInstance().getInjector("org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage").getInstance(class1);
+ return org.eclipse.xtext.ui.common.tests.Activator.getInstance().getInjector("org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage").getInstance(class1);
}
catch (Exception e) {
log.error(e);
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageStandaloneSetup.java
index 858cf53..fcf206f 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageStandaloneSetup.java
@@ -1,4 +1,4 @@
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.xtext.EcoreUtil2;
@@ -27,12 +27,12 @@ public class TwoContextsTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjector() {
- return Guice.createInjector(new org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageRuntimeModule());
+ return Guice.createInjector(new org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageRuntimeModule());
}
public void register(Injector injector) {
if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/tmf/tests/2009/twoContexts")) {
- EPackage.Registry.INSTANCE.put("http://www.eclipse.org/tmf/tests/2009/twoContexts", org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage.eINSTANCE);
+ EPackage.Registry.INSTANCE.put("http://www.eclipse.org/tmf/tests/2009/twoContexts", org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage.eINSTANCE);
}
org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parseTreeConstruction/TwoContextsTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parseTreeConstruction/TwoContextsTestLanguageParsetreeConstructor.java
index 4c588fe..c1d6cb2 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parseTreeConstruction/TwoContextsTestLanguageParsetreeConstructor.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parseTreeConstruction/TwoContextsTestLanguageParsetreeConstructor.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parseTreeConstruction;
+package org.eclipse.xtext.ui.common.editor.contentassist.parseTreeConstruction;
//import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
@@ -9,7 +9,7 @@ import org.eclipse.xtext.*;
import org.eclipse.xtext.parsetree.reconstr.IInstanceDescription;
import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor.AbstractToken.Solution;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess;
import com.google.inject.Inject;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/TwoContextsTestLanguageAntlrTokenFileProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/TwoContextsTestLanguageAntlrTokenFileProvider.java
index f3cd99b..0132c53 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/TwoContextsTestLanguageAntlrTokenFileProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/TwoContextsTestLanguageAntlrTokenFileProvider.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr;
import java.io.InputStream;
import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
@@ -10,6 +10,6 @@ public class TwoContextsTestLanguageAntlrTokenFileProvider implements IAntlrToke
public InputStream getAntlrTokenFile() {
ClassLoader classLoader = getClass().getClassLoader();
- return classLoader.getResourceAsStream("org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens");
+ return classLoader.getResourceAsStream("org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens");
}
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/TwoContextsTestLanguageParser.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/TwoContextsTestLanguageParser.java
index 579655d..a9d1d23 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/TwoContextsTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/TwoContextsTestLanguageParser.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr;
import org.antlr.runtime.ANTLRInputStream;
import org.eclipse.xtext.parser.antlr.ITokenDefProvider;
@@ -11,10 +11,10 @@ import org.eclipse.xtext.parser.antlr.XtextTokenStream;
import com.google.inject.Inject;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal.InternalTwoContextsTestLanguageLexer;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal.InternalTwoContextsTestLanguageParser;
+import org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal.InternalTwoContextsTestLanguageLexer;
+import org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal.InternalTwoContextsTestLanguageParser;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess;
public class TwoContextsTestLanguageParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
@@ -26,10 +26,10 @@ public class TwoContextsTestLanguageParser extends org.eclipse.xtext.parser.antl
@Override
protected IParseResult parse(String ruleName, ANTLRInputStream in) {
- org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal.InternalTwoContextsTestLanguageLexer lexer = new org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal.InternalTwoContextsTestLanguageLexer(in);
+ org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal.InternalTwoContextsTestLanguageLexer lexer = new org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal.InternalTwoContextsTestLanguageLexer(in);
XtextTokenStream stream = new XtextTokenStream(lexer, antlrTokenDefProvider);
stream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
- org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal.InternalTwoContextsTestLanguageParser parser = new org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal.InternalTwoContextsTestLanguageParser(
+ org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal.InternalTwoContextsTestLanguageParser parser = new org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal.InternalTwoContextsTestLanguageParser(
stream, getElementFactory(), grammarAccess);
parser.setTokenTypeMap(antlrTokenDefProvider.getTokenDefMap());
try {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g
index d16de12..b27c9ce 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g
@@ -8,7 +8,7 @@ options {
}
@lexer::header {
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal;
// Hack: Use our own Lexer superclass by means of import.
// Currently there is no other way to specify the superclass for the lexer.
@@ -16,7 +16,7 @@ import org.eclipse.xtext.parser.antlr.Lexer;
}
@parser::header {
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal;
import java.io.InputStream;
import org.eclipse.xtext.*;
@@ -30,7 +30,7 @@ import org.eclipse.xtext.parser.antlr.XtextTokenStream;
import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
import org.eclipse.xtext.conversion.ValueConverterException;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess;
}
@@ -46,7 +46,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContext
@Override
protected InputStream getTokenFile() {
ClassLoader classLoader = getClass().getClassLoader();
- return classLoader.getResourceAsStream("org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens");
+ return classLoader.getResourceAsStream("org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens");
}
@Override
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens
index f1a0cf8..f1a0cf8 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java
index 80f9b52..42b6225 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java
@@ -1,4 +1,4 @@
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal;
// Hack: Use our own Lexer superclass by means of import.
// Currently there is no other way to specify the superclass for the lexer.
@@ -26,14 +26,14 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public InternalTwoContextsTestLanguageLexer(CharStream input) {
super(input);
}
- public String getGrammarFileName() { return "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g"; }
// $ANTLR start T11
public final void mT11() throws RecognitionException {
try {
int _type = T11;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:10:5: ( 'refersTo' )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:10:7: 'refersTo'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:10:5: ( 'refersTo' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:10:7: 'refersTo'
{
match("refersTo");
@@ -51,8 +51,8 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mT12() throws RecognitionException {
try {
int _type = T12;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:11:5: ( ';' )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:11:7: ';'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:11:5: ( ';' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:11:7: ';'
{
match(';');
@@ -69,10 +69,10 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:11: ( '^' )?
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -81,7 +81,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:11: '^'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:11: '^'
{
match('^');
@@ -100,7 +100,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:175:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -113,7 +113,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
switch (alt2) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
input.consume();
@@ -148,10 +148,10 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -165,7 +165,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:13: '0' .. '9'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:177:13: '0' .. '9'
{
matchRange('0','9');
@@ -195,10 +195,10 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -216,10 +216,10 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -235,7 +235,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -252,7 +252,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:62: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:62: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -278,10 +278,10 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -297,7 +297,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -314,7 +314,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:129: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:179:129: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -356,12 +356,12 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -386,7 +386,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:52: .
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:181:52: .
{
matchAny();
@@ -414,12 +414,12 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -432,7 +432,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -453,7 +453,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -462,9 +462,9 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:41: ( '\\r' )?
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -473,7 +473,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:41: '\\r'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:183:41: '\\r'
{
match('\r');
@@ -503,10 +503,10 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:185:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:185:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:185:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:185:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:185:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:185:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -520,7 +520,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
switch (alt11) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
input.consume();
@@ -559,8 +559,8 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:187:16: ( . )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:187:18: .
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:187:16: ( . )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:187:18: .
{
matchAny();
@@ -574,7 +574,7 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
// $ANTLR end RULE_ANY_OTHER
public void mTokens() throws RecognitionException {
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:8: ( T11 | T12 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:8: ( T11 | T12 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=9;
int LA12_0 = input.LA(1);
@@ -695,63 +695,63 @@ public class InternalTwoContextsTestLanguageLexer extends Lexer {
}
switch (alt12) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:10: T11
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:10: T11
{
mT11();
}
break;
case 2 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:14: T12
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:14: T12
{
mT12();
}
break;
case 3 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:18: RULE_ID
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:18: RULE_ID
{
mRULE_ID();
}
break;
case 4 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:26: RULE_INT
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:26: RULE_INT
{
mRULE_INT();
}
break;
case 5 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:35: RULE_STRING
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:35: RULE_STRING
{
mRULE_STRING();
}
break;
case 6 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:47: RULE_ML_COMMENT
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:47: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
case 7 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:63: RULE_SL_COMMENT
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:63: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
case 8 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:79: RULE_WS
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:79: RULE_WS
{
mRULE_WS();
}
break;
case 9 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:87: RULE_ANY_OTHER
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:1:87: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageParser.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguageParser.java
index 85717fb..4172b56 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguageParser.java
@@ -1,4 +1,4 @@
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal;
import java.io.InputStream;
import org.eclipse.xtext.*;
@@ -12,7 +12,7 @@ import org.eclipse.xtext.parser.antlr.XtextTokenStream;
import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
import org.eclipse.xtext.conversion.ValueConverterException;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess;
@@ -40,7 +40,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
public String[] getTokenNames() { return tokenNames; }
- public String getGrammarFileName() { return "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g"; }
@@ -54,7 +54,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
@Override
protected InputStream getTokenFile() {
ClassLoader classLoader = getClass().getClassLoader();
- return classLoader.getResourceAsStream("org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens");
+ return classLoader.getResourceAsStream("org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.tokens");
}
@Override
@@ -65,7 +65,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
// $ANTLR start entryRuleMainModel
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:69:1: entryRuleMainModel returns [EObject current=null] : iv_ruleMainModel= ruleMainModel EOF ;
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:69:1: entryRuleMainModel returns [EObject current=null] : iv_ruleMainModel= ruleMainModel EOF ;
public final EObject entryRuleMainModel() throws RecognitionException {
EObject current = null;
@@ -73,8 +73,8 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
try {
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:69:51: (iv_ruleMainModel= ruleMainModel EOF )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:70:2: iv_ruleMainModel= ruleMainModel EOF
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:69:51: (iv_ruleMainModel= ruleMainModel EOF )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:70:2: iv_ruleMainModel= ruleMainModel EOF
{
currentNode = createCompositeNode(grammarAccess.getMainModelRule(), currentNode);
pushFollow(FOLLOW_ruleMainModel_in_entryRuleMainModel71);
@@ -100,7 +100,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
// $ANTLR start ruleMainModel
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:77:1: ruleMainModel returns [EObject current=null] : (lv_elements_0= ruleAnElement )* ;
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:77:1: ruleMainModel returns [EObject current=null] : (lv_elements_0= ruleAnElement )* ;
public final EObject ruleMainModel() throws RecognitionException {
EObject current = null;
@@ -110,10 +110,10 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:82:6: ( (lv_elements_0= ruleAnElement )* )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:83:1: (lv_elements_0= ruleAnElement )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:82:6: ( (lv_elements_0= ruleAnElement )* )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:83:1: (lv_elements_0= ruleAnElement )*
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:83:1: (lv_elements_0= ruleAnElement )*
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:83:1: (lv_elements_0= ruleAnElement )*
loop1:
do {
int alt1=2;
@@ -126,7 +126,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:86:6: lv_elements_0= ruleAnElement
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:86:6: lv_elements_0= ruleAnElement
{
currentNode=createCompositeNode(grammarAccess.getMainModelAccess().getElementsAnElementParserRuleCall_0(), currentNode);
@@ -177,7 +177,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
// $ANTLR start entryRuleAnElement
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:111:1: entryRuleAnElement returns [EObject current=null] : iv_ruleAnElement= ruleAnElement EOF ;
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:111:1: entryRuleAnElement returns [EObject current=null] : iv_ruleAnElement= ruleAnElement EOF ;
public final EObject entryRuleAnElement() throws RecognitionException {
EObject current = null;
@@ -185,8 +185,8 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
try {
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:111:51: (iv_ruleAnElement= ruleAnElement EOF )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:112:2: iv_ruleAnElement= ruleAnElement EOF
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:111:51: (iv_ruleAnElement= ruleAnElement EOF )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:112:2: iv_ruleAnElement= ruleAnElement EOF
{
currentNode = createCompositeNode(grammarAccess.getAnElementRule(), currentNode);
pushFollow(FOLLOW_ruleAnElement_in_entryRuleAnElement176);
@@ -212,7 +212,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
// $ANTLR start ruleAnElement
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:119:1: ruleAnElement returns [EObject current=null] : ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' ) ;
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:119:1: ruleAnElement returns [EObject current=null] : ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' ) ;
public final EObject ruleAnElement() throws RecognitionException {
EObject current = null;
@@ -221,14 +221,14 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:124:6: ( ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' ) )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:1: ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:124:6: ( ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' ) )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:1: ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' )
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:1: ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:2: (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';'
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:1: ( (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';' )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:2: (lv_name_0= RULE_ID ) ( 'refersTo' ( RULE_ID ) )? ';'
{
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:2: (lv_name_0= RULE_ID )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:127:6: lv_name_0= RULE_ID
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:125:2: (lv_name_0= RULE_ID )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:127:6: lv_name_0= RULE_ID
{
lv_name_0=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnElement233);
@@ -250,7 +250,7 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
}
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:145:2: ( 'refersTo' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:145:2: ( 'refersTo' ( RULE_ID ) )?
int alt2=2;
int LA2_0 = input.LA(1);
@@ -259,14 +259,14 @@ public class InternalTwoContextsTestLanguageParser extends AbstractInternalAntlr
}
switch (alt2) {
case 1 :
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:145:3: 'refersTo' ( RULE_ID )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:145:3: 'refersTo' ( RULE_ID )
{
match(input,11,FOLLOW_11_in_ruleAnElement251);
createLeafNode(grammarAccess.getAnElementAccess().getRefersToKeyword_1_0(), null);
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:149:1: ( RULE_ID )
- // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g:152:3: RULE_ID
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:149:1: ( RULE_ID )
+ // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g:152:3: RULE_ID
{
if (current==null) {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage__.g b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage__.g
index 3da3430..d7e50b2 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage__.g
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage__.g
@@ -1,6 +1,6 @@
lexer grammar InternalTwoContextsTestLanguage;
@header {
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr.internal;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.antlr.internal;
// Hack: Use our own Lexer superclass by means of import.
// Currently there is no other way to specify the superclass for the lexer.
@@ -10,25 +10,25 @@ import org.eclipse.xtext.parser.antlr.Lexer;
T11 : 'refersTo' ;
T12 : ';' ;
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 175
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 175
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 177
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 177
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 179
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 179
RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 181
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 181
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 183
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 183
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 185
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 185
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 187
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/antlr/internal/InternalTwoContextsTestLanguage.g" 187
RULE_ANY_OTHER : .;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageDelimiters.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguageDelimiters.java
index 23f5388..03ab6d1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageDelimiters.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguageDelimiters.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguagePackratParser.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguagePackratParser.java
index 691b156..8665479 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguagePackratParser.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguagePackratParser.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat;
import com.google.inject.Inject;
@@ -9,7 +9,7 @@ import org.eclipse.xtext.parser.packrat.AbstractPackratParser;
import org.eclipse.xtext.parser.packrat.IParseResultFactory;
import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess;
public class TwoContextsTestLanguagePackratParser extends AbstractPackratParser {
@@ -19,8 +19,8 @@ public class TwoContextsTestLanguagePackratParser extends AbstractPackratParser
}
@Override
- protected org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.TwoContextsTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) {
- return new org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.TwoContextsTestLanguageParserConfiguration(configuration, getGrammarAccess());
+ protected org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.TwoContextsTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) {
+ return new org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.TwoContextsTestLanguageParserConfiguration(configuration, getGrammarAccess());
}
@Override
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguageParserConfiguration.java
index e0ff2fb..070870d 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/TwoContextsTestLanguageParserConfiguration.java
@@ -1,16 +1,16 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat;
import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.consumers.TwoContextsTestLanguageMainModelConsumer;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.consumers.TwoContextsTestLanguageAnElementConsumer;
+import org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.consumers.TwoContextsTestLanguageMainModelConsumer;
+import org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.consumers.TwoContextsTestLanguageAnElementConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsINTConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsSTRINGConsumer;
@@ -69,10 +69,10 @@ public class TwoContextsTestLanguageParserConfiguration extends AbstractParserCo
getAnElementConsumer().setIdConsumer(getIdConsumer());
- getAnElementConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.TwoContextsTestLanguageDelimiters.keyword$11$Delimiter);
- getAnElementConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.TwoContextsTestLanguageDelimiters.keyword$16$Delimiter);
- getAnElementConsumer().setRuleCall$9$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.TwoContextsTestLanguageDelimiters.ruleCall$9$Delimiter);
- getAnElementConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.TwoContextsTestLanguageDelimiters.ruleCall$9$Delimiter);
+ getAnElementConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.TwoContextsTestLanguageDelimiters.keyword$11$Delimiter);
+ getAnElementConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.TwoContextsTestLanguageDelimiters.keyword$16$Delimiter);
+ getAnElementConsumer().setRuleCall$9$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.TwoContextsTestLanguageDelimiters.ruleCall$9$Delimiter);
+ getAnElementConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.TwoContextsTestLanguageDelimiters.ruleCall$9$Delimiter);
}
public TerminalsParserConfiguration getTerminalsConfiguration() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/consumers/TwoContextsTestLanguageAnElementConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/consumers/TwoContextsTestLanguageAnElementConsumer.java
index 91b7a4a..7f61d63 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/consumers/TwoContextsTestLanguageAnElementConsumer.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/consumers/TwoContextsTestLanguageAnElementConsumer.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.consumers;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.consumers;
import org.eclipse.emf.ecore.EClassifier;
@@ -19,7 +19,7 @@ import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess.AnElementElements;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess.AnElementElements;
public final class TwoContextsTestLanguageAnElementConsumer extends NonTerminalConsumer {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/consumers/TwoContextsTestLanguageMainModelConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/consumers/TwoContextsTestLanguageMainModelConsumer.java
index 5a260fc..58c5e76 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/consumers/TwoContextsTestLanguageMainModelConsumer.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/parser/packrat/consumers/TwoContextsTestLanguageMainModelConsumer.java
@@ -1,7 +1,7 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.consumers;
+package org.eclipse.xtext.ui.common.editor.contentassist.parser.packrat.consumers;
import org.eclipse.emf.ecore.EClassifier;
@@ -15,7 +15,7 @@ import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumerConfigurat
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.services.TwoContextsTestLanguageGrammarAccess.MainModelElements;
+import org.eclipse.xtext.ui.common.editor.contentassist.services.TwoContextsTestLanguageGrammarAccess.MainModelElements;
public final class TwoContextsTestLanguageMainModelConsumer extends NonTerminalConsumer {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/services/TwoContextsTestLanguageGrammarAccess.java
index e77f460..df755f9 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/services/TwoContextsTestLanguageGrammarAccess.java
@@ -2,7 +2,7 @@
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.services;
+package org.eclipse.xtext.ui.common.editor.contentassist.services;
import com.google.inject.Singleton;
import com.google.inject.Inject;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/AnElement.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/AnElement.java
index e435028..7a0c512 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/AnElement.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/AnElement.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts;
import org.eclipse.emf.ecore.EObject;
@@ -15,12 +15,12 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getReferred <em>Referred</em>}</li>
+ * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getReferred <em>Referred</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage#getAnElement()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage#getAnElement()
* @model
* @generated
*/
@@ -36,14 +36,14 @@ public interface AnElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage#getAnElement_Name()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage#getAnElement_Name()
* @model
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -62,14 +62,14 @@ public interface AnElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Referred</em>' reference.
* @see #setReferred(AnElement)
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage#getAnElement_Referred()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage#getAnElement_Referred()
* @model
* @generated
*/
AnElement getReferred();
/**
- * Sets the value of the '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getReferred <em>Referred</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getReferred <em>Referred</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Referred</em>' reference.
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/MainModel.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/MainModel.java
index 16d09dd..bbffd6e 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/MainModel.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/MainModel.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts;
import org.eclipse.emf.common.util.EList;
@@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel#getElements <em>Elements</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage#getMainModel()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage#getMainModel()
* @model
* @generated
*/
@@ -29,7 +29,7 @@ public interface MainModel extends EObject
{
/**
* Returns the value of the '<em><b>Elements</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement}.
+ * The list contents are of type {@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
@@ -37,7 +37,7 @@ public interface MainModel extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' containment reference list.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage#getMainModel_Elements()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage#getMainModel_Elements()
* @model containment="true"
* @generated
*/
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/TwoContextsFactory.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/TwoContextsFactory.java
index 94ef00c..e952c0e 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/TwoContextsFactory.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/TwoContextsFactory.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts;
import org.eclipse.emf.ecore.EFactory;
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage
* @generated
*/
public interface TwoContextsFactory extends EFactory
@@ -23,7 +23,7 @@ public interface TwoContextsFactory extends EFactory
* <!-- end-user-doc -->
* @generated
*/
- TwoContextsFactory eINSTANCE = org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.TwoContextsFactoryImpl.init();
+ TwoContextsFactory eINSTANCE = org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.TwoContextsFactoryImpl.init();
/**
* Returns a new object of class '<em>Main Model</em>'.
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/TwoContextsPackage.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/TwoContextsPackage.java
index 362ea0a..94a7658 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/TwoContextsPackage.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/TwoContextsPackage.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsFactory
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsFactory
* @model kind="package"
* @generated
*/
@@ -57,14 +57,14 @@ public interface TwoContextsPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- TwoContextsPackage eINSTANCE = org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.TwoContextsPackageImpl.init();
+ TwoContextsPackage eINSTANCE = org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.TwoContextsPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.MainModelImpl <em>Main Model</em>}' class.
+ * The meta object id for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.MainModelImpl <em>Main Model</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.MainModelImpl
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.TwoContextsPackageImpl#getMainModel()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.MainModelImpl
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.TwoContextsPackageImpl#getMainModel()
* @generated
*/
int MAIN_MODEL = 0;
@@ -88,11 +88,11 @@ public interface TwoContextsPackage extends EPackage
int MAIN_MODEL_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.AnElementImpl <em>An Element</em>}' class.
+ * The meta object id for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.AnElementImpl <em>An Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.AnElementImpl
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.TwoContextsPackageImpl#getAnElement()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.AnElementImpl
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.TwoContextsPackageImpl#getAnElement()
* @generated
*/
int AN_ELEMENT = 1;
@@ -126,53 +126,53 @@ public interface TwoContextsPackage extends EPackage
/**
- * Returns the meta object for class '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel <em>Main Model</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel <em>Main Model</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Main Model</em>'.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel
* @generated
*/
EClass getMainModel();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel#getElements <em>Elements</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel#getElements <em>Elements</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Elements</em>'.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel#getElements()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel#getElements()
* @see #getMainModel()
* @generated
*/
EReference getMainModel_Elements();
/**
- * Returns the meta object for class '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement <em>An Element</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement <em>An Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>An Element</em>'.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement
* @generated
*/
EClass getAnElement();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getName()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getName()
* @see #getAnElement()
* @generated
*/
EAttribute getAnElement_Name();
/**
- * Returns the meta object for the reference '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getReferred <em>Referred</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getReferred <em>Referred</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Referred</em>'.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement#getReferred()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement#getReferred()
* @see #getAnElement()
* @generated
*/
@@ -202,11 +202,11 @@ public interface TwoContextsPackage extends EPackage
interface Literals
{
/**
- * The meta object literal for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.MainModelImpl <em>Main Model</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.MainModelImpl <em>Main Model</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.MainModelImpl
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.TwoContextsPackageImpl#getMainModel()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.MainModelImpl
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.TwoContextsPackageImpl#getMainModel()
* @generated
*/
EClass MAIN_MODEL = eINSTANCE.getMainModel();
@@ -220,11 +220,11 @@ public interface TwoContextsPackage extends EPackage
EReference MAIN_MODEL__ELEMENTS = eINSTANCE.getMainModel_Elements();
/**
- * The meta object literal for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.AnElementImpl <em>An Element</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.AnElementImpl <em>An Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.AnElementImpl
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.TwoContextsPackageImpl#getAnElement()
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.AnElementImpl
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.TwoContextsPackageImpl#getAnElement()
* @generated
*/
EClass AN_ELEMENT = eINSTANCE.getAnElement();
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/AnElementImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/AnElementImpl.java
index 01ecb08..9545622 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/AnElementImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/AnElementImpl.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage;
/**
* <!-- begin-user-doc -->
@@ -23,8 +23,8 @@ import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoCont
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.AnElementImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.AnElementImpl#getReferred <em>Referred</em>}</li>
+ * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.AnElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.AnElementImpl#getReferred <em>Referred</em>}</li>
* </ul>
* </p>
*
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/MainModelImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/MainModelImpl.java
index 631f3fd..5b71f10 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/MainModelImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/MainModelImpl.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl;
import java.util.Collection;
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage;
/**
* <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoCont
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl.MainModelImpl#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl.MainModelImpl#getElements <em>Elements</em>}</li>
* </ul>
* </p>
*
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsFactoryImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/TwoContextsFactoryImpl.java
index 3d81c25..2c13467 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsFactoryImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/TwoContextsFactoryImpl.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.*;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.*;
/**
* <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsPackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/TwoContextsPackageImpl.java
index 065d636..347214c 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsPackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/impl/TwoContextsPackageImpl.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -12,10 +12,10 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsFactory;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsFactory;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage;
/**
* <!-- begin-user-doc -->
@@ -50,7 +50,7 @@ public class TwoContextsPackageImpl extends EPackageImpl implements TwoContextsP
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage#eNS_URI
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage#eNS_URI
* @see #init()
* @generated
*/
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/util/TwoContextsAdapterFactory.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/util/TwoContextsAdapterFactory.java
index ea72a7d..928bcb1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/util/TwoContextsAdapterFactory.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/util/TwoContextsAdapterFactory.java
@@ -3,7 +3,7 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.util;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -12,14 +12,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.*;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.*;
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage
* @generated
*/
public class TwoContextsAdapterFactory extends AdapterFactoryImpl
@@ -110,13 +110,13 @@ public class TwoContextsAdapterFactory extends AdapterFactoryImpl
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel <em>Main Model</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel <em>Main Model</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.MainModel
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.MainModel
* @generated
*/
public Adapter createMainModelAdapter()
@@ -125,13 +125,13 @@ public class TwoContextsAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement <em>An Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement <em>An Element</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.AnElement
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.AnElement
* @generated
*/
public Adapter createAnElementAdapter()
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/util/TwoContextsSwitch.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/util/TwoContextsSwitch.java
index e4dbabc..d4989f7 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/util/TwoContextsSwitch.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/twoContexts/util/TwoContextsSwitch.java
@@ -3,14 +3,14 @@
* </copyright>
*
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.util;
+package org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.util;
import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.*;
+import org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.*;
/**
* <!-- begin-user-doc -->
@@ -22,7 +22,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.*;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts.TwoContextsPackage
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.twoContexts.TwoContextsPackage
* @generated
*/
public class TwoContextsSwitch<T>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/tests/Activator.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/tests/Activator.java
index 27e598a..2f13b17 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/tests/Activator.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/tests/Activator.java
@@ -38,9 +38,9 @@ public class Activator extends AbstractUIPlugin {
createUIPluginModule()
));
- injectors.put("org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage", Guice.createInjector(
- new org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageRuntimeModule(),
- new org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageUiModule(),
+ injectors.put("org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage", Guice.createInjector(
+ new org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageRuntimeModule(),
+ new org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguageUiModule(),
createUIPluginModule()
));
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/GenerateTestLanguages.mwe b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/GenerateTestLanguages.mwe
index 6ca26b3..2247cb1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/GenerateTestLanguages.mwe
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/GenerateTestLanguages.mwe
@@ -16,7 +16,7 @@
<language uri="classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xtext">
<fragment file="org/eclipse/xtext/ui/common/TestLanguageSetup.mwe"/>
</language>
- <language uri="classpath:/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xtext">
+ <language uri="classpath:/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.xtext">
<fragment file="org/eclipse/xtext/ui/common/TestLanguageSetup.mwe"/>
</language>
<language uri="classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext">
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractContentAssistProcessorTest.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/AbstractContentAssistProcessorTest.java
index 1aede24..7be0a02 100755
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractContentAssistProcessorTest.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/AbstractContentAssistProcessorTest.java
@@ -5,8 +5,9 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.xtext.ISetup;
import org.eclipse.xtext.junit.AbstractXtextTests;
@@ -361,6 +362,39 @@ public abstract class AbstractContentAssistProcessorTest extends AbstractXtextTe
.append("terminal Other_Id").assertText(":");
}
+
+ public void testCompleteGrammarName_01() throws Exception {
+ newBuilder(setup.getXtextSetup())
+ .append("grammar ")
+ .assertCount(0);
+ }
+
+ public void testCompleteAfterGrammarName_01() throws Exception {
+ newBuilder(setup.getXtextSetup())
+ .append("grammar org.foo.bar")
+ .assertCount(0);
+ }
+
+ public void testCompleteAfterGrammarName_02() throws Exception {
+ newBuilder(setup.getXtextSetup())
+ .append("grammar org.foo.bar ")
+ .assertText("with", "Name", "enum", "terminal", "hidden", "generate", "import");
+ }
+
+ public void testCompleteAfterGenerateName_01() throws Exception {
+ newBuilder(setup.getXtextSetup())
+ .appendNl("grammar org.foo.bar with org.eclipse.common.Terminals")
+ .append("generate name ")
+ .assertCount(EPackage.Registry.INSTANCE.size());
+ }
+
+ public void testCompleteAfterGenerateName_02() throws Exception {
+ newBuilder(setup.getXtextSetup())
+ .appendNl("grammar org.foo.bar with org.eclipse.common.Terminals")
+ .append("generate name \"")
+ .assertCount(EPackage.Registry.INSTANCE.size());
+ }
+
/**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=270116
* @throws Exception
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/ContentAssistProcessorTestBuilder.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/ContentAssistProcessorTestBuilder.java
index 4fdebba..6821864 100644..100755
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/ContentAssistProcessorTestBuilder.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/ContentAssistProcessorTestBuilder.java
@@ -11,7 +11,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/IContentAssistProcessorTestSetup.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/IContentAssistProcessorTestSetup.java
index 874c646..c077108 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/IContentAssistProcessorTestSetup.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/IContentAssistProcessorTestSetup.java
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.xtext.ISetup;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaContentAssistProcessorTest.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/JavaContentAssistProcessorTest.java
index 3bb9c2c..253064a 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaContentAssistProcessorTest.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/JavaContentAssistProcessorTest.java
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
/**
* @author Sebastian Zarnekow - Initial contribution and API
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaContentAssistProcessorTestSetup.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/JavaContentAssistProcessorTestSetup.java
index d41c129..4b8cd8b 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaContentAssistProcessorTestSetup.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/JavaContentAssistProcessorTestSetup.java
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.xtext.ISetup;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/MockableSelectionProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/MockableSelectionProvider.java
index af7a0b8..a1066af 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/MockableSelectionProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/MockableSelectionProvider.java
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/MockableTextViewer.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/MockableTextViewer.java
index d3e6eea..5bf74a8 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/MockableTextViewer.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/MockableTextViewer.java
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.jface.text.IAutoIndentStrategy;
import org.eclipse.jface.text.IDocument;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelperTest.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelperTest.java
new file mode 100644
index 0000000..49dd300
--- /dev/null
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/ProposalConflictHelperTest.java
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.xtext.ui.common.editor.contentassist;
+
+import org.eclipse.xtext.junit.AbstractXtextTests;
+import org.eclipse.xtext.ui.common.editor.contentassist.antlr.AntlrProposalConflictHelper;
+
+/**
+ * @author Sebastian Zarnekow - Initial contribution and API
+ */
+public abstract class ProposalConflictHelperTest extends AbstractXtextTests {
+
+ private IContentAssistProcessorTestSetup setup;
+ private ProposalConflictHelper helper;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ setup = new JavaContentAssistProcessorTestSetup();
+ with(setup.getXtextGrammarTestSetup());
+ helper = createProposalConflictHelper();
+ }
+
+ protected abstract ProposalConflictHelper createProposalConflictHelper();
+
+ @Override
+ protected void tearDown() throws Exception {
+ setup = null;
+ helper = null;
+ super.tearDown();
+ }
+
+ public void testID_ID_01() {
+ assertTrue(helper.existsConflict("foo", "bar"));
+ }
+
+ public void testID_ID_02() {
+ assertTrue(helper.existsConflict("^foo", "bar"));
+ }
+
+ public void testID_ID_03() {
+ assertFalse(helper.existsConflict("foo", "^bar"));
+ }
+
+ public void testID_ID_04() {
+ assertFalse(helper.existsConflict("^foo", "^bar"));
+ }
+
+ public void testAlphaKeyword_ID_01() {
+ assertTrue(helper.existsConflict("grammar", "foo"));
+ }
+
+ public void testAlphaKeyword_ID_02() {
+ assertFalse(helper.existsConflict("grammar", "^foo"));
+ }
+
+ public void testID_AlphaKeyword() {
+ assertTrue(helper.existsConflict("foo", "enum"));
+ }
+
+ public void testAlphaKeyword_AlphaKeyword() {
+ assertTrue(helper.existsConflict("enum", "terminal"));
+ }
+
+ public void testBraceKeyword_ID() {
+ assertFalse(helper.existsConflict("{", "foo"));
+ }
+
+ public void testID_BraceKeyword() {
+ assertFalse(helper.existsConflict("foo", "{"));
+ }
+
+ public void testBraceKeyword_BraceKeyword() {
+ assertFalse(helper.existsConflict("{", "{"));
+ }
+
+ public void testSTRING_STRING() {
+ assertFalse(helper.existsConflict("'String'", "'String'"));
+ }
+
+ public void testSTRING_ID() {
+ assertFalse(helper.existsConflict("'String'", "foo"));
+ }
+
+ public void testID_STRING() {
+ assertFalse(helper.existsConflict("foo", "'String'"));
+ }
+
+ public void testID_INT() {
+ assertTrue(helper.existsConflict("foo", "12"));
+ }
+
+ public void testINT_ID() {
+ assertFalse(helper.existsConflict("11", "foo"));
+ }
+
+ public void testINT_INT() {
+ assertTrue(helper.existsConflict("11", "13"));
+ }
+
+ public void testID_GrammarID() {
+ assertTrue(helper.existsConflict("foo", "bar.zonk"));
+ }
+
+ public void testAlphaKeyword_GrammarID() {
+ assertTrue(helper.existsConflict("grammar", "bar.zonk"));
+ }
+
+ public void testBraceKeyword_GrammarID() {
+ assertFalse(helper.existsConflict("{", "bar.zonk"));
+ }
+
+ public void testGrammarID_ID() {
+ assertTrue(helper.existsConflict("foo.bar", "zonk"));
+ }
+
+ public void testGrammarID_GrammarID() {
+ assertTrue(helper.existsConflict("foo.bar", "zonk.stuff"));
+ }
+
+ public static class Antlr extends ProposalConflictHelperTest {
+
+ @Override
+ protected ProposalConflictHelper createProposalConflictHelper() {
+ return get(AntlrProposalConflictHelper.class);
+ }
+
+ }
+}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsContentAssistTest.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsContentAssistTest.java
index 61f99a9..8a341ab 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsContentAssistTest.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsContentAssistTest.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
*******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.ISetup;
@@ -53,7 +53,7 @@ public class TwoContextsContentAssistTest extends AbstractXtextTests {
return new ContentAssistProcessorTestBuilder(standAloneSetup, this);
}
- public static class TwoContextsTestLanguageTestProposals extends org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractTwoContextsTestLanguageProposalProvider {
+ public static class TwoContextsTestLanguageTestProposals extends org.eclipse.xtext.ui.common.editor.contentassist.AbstractTwoContextsTestLanguageProposalProvider {
@Override
public void completeKeyword(Keyword keyword, final ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
super.completeKeyword(keyword, context, filter(acceptor, new Predicate<ICompletionProposal>() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xtext b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.xtext
index 812eb4e..324d76a 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xtext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguage.xtext
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-grammar org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguage
+grammar org.eclipse.xtext.ui.common.editor.contentassist.TwoContextsTestLanguage
with org.eclipse.xtext.common.Terminals
generate twoContexts "http://www.eclipse.org/tmf/tests/2009/twoContexts"
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageChecks.chk b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageChecks.chk
index 6aff49f..6aff49f 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageChecks.chk
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageChecks.chk
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageProposalProvider.java
index 63f8296..3c3923d 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageProposalProvider.java
@@ -1,5 +1,5 @@
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Keyword;
@@ -9,7 +9,7 @@ import org.eclipse.xtext.ui.core.editor.contentassist.ICompletionProposalAccepto
import com.google.common.base.Predicate;
-public class TwoContextsTestLanguageProposalProvider extends org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractTwoContextsTestLanguageProposalProvider {
+public class TwoContextsTestLanguageProposalProvider extends org.eclipse.xtext.ui.common.editor.contentassist.AbstractTwoContextsTestLanguageProposalProvider {
@Override
public void completeKeyword(Keyword keyword, final ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageRuntimeModule.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageRuntimeModule.java
index 19cd457..0eaabb3 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageRuntimeModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageRuntimeModule.java
@@ -1,11 +1,11 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
/**
* Use this class to register components to be used within the IDE.
*/
-public class TwoContextsTestLanguageRuntimeModule extends org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractTwoContextsTestLanguageRuntimeModule {
+public class TwoContextsTestLanguageRuntimeModule extends org.eclipse.xtext.ui.common.editor.contentassist.AbstractTwoContextsTestLanguageRuntimeModule {
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageUiModule.java
index ff56254..a3879c0 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/TwoContextsTestLanguageUiModule.java
@@ -1,11 +1,11 @@
/*
* generated by Xtext
*/
-package org.eclipse.xtext.ui.common.editor.contentassist.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist;
/**
* Use this class to register components to be used within the IDE.
*/
-public class TwoContextsTestLanguageUiModule extends org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractTwoContextsTestLanguageUiModule {
+public class TwoContextsTestLanguageUiModule extends org.eclipse.xtext.ui.common.editor.contentassist.AbstractTwoContextsTestLanguageUiModule {
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/tests/AllTests.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/tests/AllTests.java
index b834b1e..390333c 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/tests/AllTests.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/tests/AllTests.java
@@ -11,7 +11,7 @@ package org.eclipse.xtext.ui.common.tests;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.JavaContentAssistProcessorTest;
+import org.eclipse.xtext.ui.common.editor.contentassist.JavaContentAssistProcessorTest;
import org.eclipse.xtext.ui.common.editor.hyperlinking.HyperlinkHelperTest;
import org.eclipse.xtext.ui.common.editor.outline.impl.DefaultSemanticModelTransformerTest;
@@ -27,6 +27,7 @@ public class AllTests {
suite.addTestSuite(JavaContentAssistProcessorTest.class);
suite.addTestSuite(DefaultSemanticModelTransformerTest.class);
suite.addTestSuite(HyperlinkHelperTest.class);
+ suite.addTestSuite(org.eclipse.xtext.ui.common.editor.contentassist.ProposalConflictHelperTest.Antlr.class);
// $JUnit-END$
return suite;
}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTest.java b/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTest.java
index dfa6cdf..49e922c 100755
--- a/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTest.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTest.java
@@ -8,9 +8,9 @@
package org.eclipse.xtext.xtend.contentassist;
import org.eclipse.xtext.ISetup;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.ContentAssistProcessorTestBuilder;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractContentAssistProcessorTest;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.IContentAssistProcessorTestSetup;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractContentAssistProcessorTest;
+import org.eclipse.xtext.ui.common.editor.contentassist.ContentAssistProcessorTestBuilder;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistProcessorTestSetup;
import org.eclipse.xtext.ui.core.editor.contentassist.IContentProposalProvider;
/**
diff --git a/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTestSetup.java b/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTestSetup.java
index e06cd68..2e7ead8 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTestSetup.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src/org/eclipse/xtext/xtend/contentassist/XtendContentAssistProcessorTestSetup.java
@@ -26,7 +26,7 @@ import org.eclipse.xtext.testlanguages.ContentAssistTestLanguageUiModule;
import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageRuntimeModule;
import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup;
import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageUiModule;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.IContentAssistProcessorTestSetup;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistProcessorTestSetup;
import com.google.inject.Guice;
import com.google.inject.Injector;