Synthetic tokens for solver language

2 files changed, 15 insertions, 8 deletions

diff --git a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/AbstractSolverLanguageUiModule.java b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/AbstractSolverLanguageUiModule.java
index e0206f6a..2df9b674 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/AbstractSolverLanguageUiModule.java
+++ b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/AbstractSolverLanguageUiModule.java
@@ -13,7 +13,7 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.eclipse.viatra.solver.language.ide.contentassist.antlr.PartialSolverLanguageContentAssistParser;

 import org.eclipse.viatra.solver.language.ide.contentassist.antlr.SolverLanguageParser;

-import org.eclipse.viatra.solver.language.ide.contentassist.antlr.internal.InternalSolverLanguageLexer;

+import org.eclipse.viatra.solver.language.ide.contentassist.antlr.lexer.InternalSolverLanguageLexer;

 import org.eclipse.viatra.solver.language.ui.contentassist.SolverLanguageProposalProvider;

 import org.eclipse.viatra.solver.language.ui.labeling.SolverLanguageDescriptionLabelProvider;

 import org.eclipse.viatra.solver.language.ui.labeling.SolverLanguageLabelProvider;

@@ -30,6 +30,8 @@ import org.eclipse.xtext.builder.nature.NatureAddingEditorCallback;
 import org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess;

 import org.eclipse.xtext.generator.IContextualOutputConfigurationProvider;

 import org.eclipse.xtext.ide.LexerIdeBindings;

+import org.eclipse.xtext.ide.editor.contentassist.CompletionPrefixProvider;

+import org.eclipse.xtext.ide.editor.contentassist.IndentationAwareCompletionPrefixProvider;

 import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser;

 import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;

 import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;

@@ -110,7 +112,7 @@ public abstract class AbstractSolverLanguageUiModule extends DefaultUiModule {
         public void configureHighlightingLexer(Binder binder) {

                 binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class)

                         .annotatedWith(Names.named(LexerIdeBindings.HIGHLIGHTING))

-                        .to(org.eclipse.viatra.solver.language.parser.antlr.internal.InternalSolverLanguageLexer.class);

+                        .to(org.eclipse.viatra.solver.language.parser.antlr.lexer.InternalSolverLanguageLexer.class);

         }

         

         // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2

@@ -135,6 +137,11 @@ public abstract class AbstractSolverLanguageUiModule extends DefaultUiModule {
                 binder.bind(InternalSolverLanguageLexer.class).toProvider(LexerProvider.create(InternalSolverLanguageLexer.class));

         }

         

+        // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2

+        public Class<? extends CompletionPrefixProvider> bindCompletionPrefixProvider() {

+                return IndentationAwareCompletionPrefixProvider.class;

+        }

+        

         // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2

         public Class<? extends AbstractValidatorConfigurationBlock> bindAbstractValidatorConfigurationBlock() {

                 return SolverLanguageValidatorConfigurationBlock.class;

diff --git a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/contentassist/AbstractSolverLanguageProposalProvider.java b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/contentassist/AbstractSolverLanguageProposalProvider.java
index fbf12ae8..4beca20e 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/contentassist/AbstractSolverLanguageProposalProvider.java
+++ b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/contentassist/AbstractSolverLanguageProposalProvider.java
@@ -138,9 +138,6 @@ public abstract class AbstractSolverLanguageProposalProvider extends TerminalsPr
         public void completeAggregation_Condition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

-        public void completeAtomicExpression_ArgumentList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

-                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

-        }

         public void completeCall_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

@@ -445,13 +442,16 @@ public abstract class AbstractSolverLanguageProposalProvider extends TerminalsPr
         public void complete_QUOTED_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

-        public void complete_PLUS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void complete_SL_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+                // subclasses may override

+        }

+        public void complete_TRANSITIVE_CLOSURE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

-        public void complete_STAR(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void complete_REFLEXIVE_TRANSITIVE_CLOSURE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

-        public void complete_DOT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void complete_FULL_STOP(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

         public void complete_NamedElement(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {