19 files changed, 940 insertions, 149 deletions
diff --git a/Application/org.eclipse.viatra.solver.language.ui/META-INF/MANIFEST.MF b/Application/org.eclipse.viatra.solver.language.ui/META-INF/MANIFEST.MF
index 95a8bf0f..6c493315 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/META-INF/MANIFEST.MF
+++ b/Application/org.eclipse.viatra.solver.language.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.viatra.solver.language,
 org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.viatra.solver.language.ui.quickfix,
+Export-Package: org.eclipse.viatra.solver.language.ui.contentassist,
- org.eclipse.viatra.solver.language.ui.contentassist,
+ org.eclipse.viatra.solver.language.ui.internal,
- org.eclipse.viatra.solver.language.ui.internal
+ org.eclipse.viatra.solver.language.ui.quickfix,
+ org.eclipse.viatra.solver.language.validation
 Bundle-Activator: org.eclipse.viatra.solver.language.ui.internal.LanguageActivator
diff --git a/Application/org.eclipse.viatra.solver.language.ui/plugin.xml_gen b/Application/org.eclipse.viatra.solver.language.ui/plugin.xml_gen
new file mode 100644
index 00000000..cb670619
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/plugin.xml_gen
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+        <extension
+                point="org.eclipse.ui.editors">
+                <editor
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+                        contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+                        default="true"
+                        extensions="vsc"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage"
+                        name="SolverLanguage Editor">
+                </editor>
+        </extension>
+        <extension
+                point="org.eclipse.ui.handlers">
+                <handler
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+                        commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+                        <activeWhen>
+                                <reference
+                                        definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                </reference>
+                        </activeWhen>
+                </handler>
+                <handler
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+                        commandId="org.eclipse.viatra.solver.language.SolverLanguage.validate">
+                        <activeWhen>
+                                <reference
+                                        definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                </reference>
+                        </activeWhen>
+                </handler>
+                <!-- copy qualified name -->
+                <handler
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+                        commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+                        <activeWhen>
+                                <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened" />
+                        </activeWhen>
+                </handler>
+                <handler
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+                        commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+                        <activeWhen>
+                                <and>
+                                        <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.XtextEditor.opened" />
+                                        <iterate>
+                                                <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+                                        </iterate>
+                                </and>
+                        </activeWhen>
+                </handler>
+        </extension>
+        <extension point="org.eclipse.core.expressions.definitions">
+                <definition id="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                        <and>
+                                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+                                <with variable="activeEditor">
+                                        <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+                                                value="org.eclipse.viatra.solver.language.SolverLanguage"
+                                                forcePluginActivation="true"/>
+                                </with>
+                        </and>
+                </definition>
+                <definition id="org.eclipse.viatra.solver.language.SolverLanguage.XtextEditor.opened">
+                        <and>
+                                <reference definitionId="isXtextEditorActive"/>
+                                <with variable="activeEditor">
+                                        <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+                                                value="org.eclipse.viatra.solver.language.SolverLanguage"
+                                                forcePluginActivation="true"/>
+                                </with>
+                        </and>
+                </definition>
+        </extension>
+        <extension
+                        point="org.eclipse.ui.preferencePages">
+                <page
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage"
+                        name="SolverLanguage">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                </page>
+                <page
+                        category="org.eclipse.viatra.solver.language.SolverLanguage"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.coloring"
+                        name="Syntax Coloring">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                </page>
+                <page
+                        category="org.eclipse.viatra.solver.language.SolverLanguage"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.templates"
+                        name="Templates">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                </page>
+        </extension>
+        <extension
+                        point="org.eclipse.ui.propertyPages">
+                <page
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage"
+                        name="SolverLanguage">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                        <enabledWhen>
+                                <adapt type="org.eclipse.core.resources.IProject"/>
+                        </enabledWhen>
+                        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+                </page>
+        </extension>
+        <extension
+                point="org.eclipse.ui.keywords">
+                <keyword
+                        id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"
+                        label="SolverLanguage"/>
+        </extension>
+        <extension
+                point="org.eclipse.ui.commands">
+                <command
+                        description="Trigger expensive validation"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.validate"
+                        name="Validate">
+                </command>
+                <!-- copy qualified name -->
+                <command
+                        id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+                        categoryId="org.eclipse.ui.category.edit"
+                        description="Copy the qualified name for the selected element"
+                        name="Copy Qualified Name">
+                </command>
+                <command
+                        id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+                        categoryId="org.eclipse.ui.category.edit"
+                        description="Copy the qualified name for the selected element"
+                        name="Copy Qualified Name">
+                </command>
+        </extension>
+        <extension point="org.eclipse.ui.menus">
+                <menuContribution
+                        locationURI="popup:#TextEditorContext?after=group.edit">
+                        <command
+                                commandId="org.eclipse.viatra.solver.language.SolverLanguage.validate"
+                                style="push"
+                                tooltip="Trigger expensive validation">
+                                <visibleWhen checkEnabled="false">
+                                        <reference
+                                                definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                        </reference>
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+                <!-- copy qualified name -->
+                <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+                        <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+                                style="push" tooltip="Copy Qualified Name">
+                                <visibleWhen checkEnabled="false">
+                                        <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened" />
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+                <menuContribution locationURI="menu:edit?after=copy">
+                        <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+                                style="push" tooltip="Copy Qualified Name">
+                                <visibleWhen checkEnabled="false">
+                                        <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened" />
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+                <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+                        <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+                                style="push" tooltip="Copy Qualified Name">
+                                <visibleWhen checkEnabled="false">
+                                        <and>
+                                                <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.XtextEditor.opened" />
+                                                <iterate>
+                                                        <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+                                                </iterate>
+                                        </and>
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+        </extension>
+        <extension point="org.eclipse.ui.menus">
+                <menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+                        <command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+                                <visibleWhen checkEnabled="false">
+                                        <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                        </reference>
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+        </extension>
+        <extension point="org.eclipse.ui.handlers">
+                <handler
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+                        commandId="org.eclipse.xtext.ui.editor.FindReferences">
+                        <activeWhen>
+                                <reference
+                                        definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                </reference>
+                        </activeWhen>
+                </handler>
+        </extension>
+        <extension point="org.eclipse.core.contenttype.contentTypes">
+                <content-type
+                        base-type="org.eclipse.core.runtime.text"
+                        file-extensions="vsc"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.contenttype"
+                        name="SolverLanguage File"
+                        priority="normal">
+                </content-type>
+        </extension>
+        <!-- adding resource factories -->
+        <extension
+                point="org.eclipse.emf.ecore.extension_parser">
+                <parser
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+                        type="vsc">
+                </parser>
+        </extension>
+        <extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+                <resourceServiceProvider
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+                        uriExtension="vsc">
+                </resourceServiceProvider>
+        </extension>
+        <!-- marker definitions for org.eclipse.viatra.solver.language.SolverLanguage -->
+        <extension
+                        id="solverlanguage.check.fast"
+                        name="SolverLanguage Problem"
+                        point="org.eclipse.core.resources.markers">
+                <super type="org.eclipse.xtext.ui.check.fast"/>
+                <persistent value="true"/>
+        </extension>
+        <extension
+                        id="solverlanguage.check.normal"
+                        name="SolverLanguage Problem"
+                        point="org.eclipse.core.resources.markers">
+                <super type="org.eclipse.xtext.ui.check.normal"/>
+                <persistent value="true"/>
+        </extension>
+        <extension
+                        id="solverlanguage.check.expensive"
+                        name="SolverLanguage Problem"
+                        point="org.eclipse.core.resources.markers">
+                <super type="org.eclipse.xtext.ui.check.expensive"/>
+                <persistent value="true"/>
+        </extension>
+        <extension point="org.eclipse.ui.preferencePages">
+                <page
+                        category="org.eclipse.viatra.solver.language.SolverLanguage"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.validator.preferencePage"
+                        name="Errors/Warnings">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                </page>
+        </extension>
+        <extension point="org.eclipse.xtext.builder.participant">
+                <participant
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+                        fileExtensions="vsc"/>
+        </extension>
+        <extension point="org.eclipse.ui.preferencePages">
+                <page
+                        category="org.eclipse.viatra.solver.language.SolverLanguage"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.compiler.preferencePage"
+                        name="Compiler">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                </page>
+        </extension>
+        <extension point="org.eclipse.ui.propertyPages">
+                <page
+                        category="org.eclipse.viatra.solver.language.SolverLanguage"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.compiler.propertyPage"
+                        name="Compiler">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                        <enabledWhen>
+                                <adapt type="org.eclipse.core.resources.IProject"/>
+                        </enabledWhen>
+                        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+                </page>
+        </extension>
+        <extension point="org.eclipse.ui.menus">
+                <menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+                        <command
+                                commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+                                id="org.eclipse.viatra.solver.language.SolverLanguage.OpenGeneratedCode"
+                                style="push">
+                                <visibleWhen checkEnabled="false">
+                                        <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened" />
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+        </extension>
+        <extension point="org.eclipse.ui.handlers">
+                <handler
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+                        commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+                        <activeWhen>
+                                <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened" />
+                        </activeWhen>
+                </handler>
+        </extension>
+        <!-- Quick Outline -->
+        <extension
+                point="org.eclipse.ui.handlers">
+                <handler 
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+                        commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+                        <activeWhen>
+                                <reference
+                                        definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                </reference>
+                        </activeWhen>
+                </handler>
+        </extension>
+        <extension
+                point="org.eclipse.ui.commands">
+                <command
+                        description="Open the quick outline."
+                        id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+                        name="Quick Outline">
+                </command>
+        </extension>
+        <extension point="org.eclipse.ui.menus">
+                <menuContribution
+                        locationURI="popup:#TextEditorContext?after=group.open">
+                        <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+                                style="push"
+                                tooltip="Open Quick Outline">
+                                <visibleWhen checkEnabled="false">
+                                        <reference definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened"/>
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+        </extension>
+        <!-- quickfix marker resolution generator for org.eclipse.viatra.solver.language.SolverLanguage -->
+        <extension
+                        point="org.eclipse.ui.ide.markerResolution">
+                <markerResolutionGenerator
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+                        markerType="org.eclipse.viatra.solver.language.ui.solverlanguage.check.fast">
+                        <attribute
+                                name="FIXABLE_KEY"
+                                value="true">
+                        </attribute>
+                </markerResolutionGenerator>
+                <markerResolutionGenerator
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+                        markerType="org.eclipse.viatra.solver.language.ui.solverlanguage.check.normal">
+                        <attribute
+                                name="FIXABLE_KEY"
+                                value="true">
+                        </attribute>
+                </markerResolutionGenerator>
+                <markerResolutionGenerator
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+                        markerType="org.eclipse.viatra.solver.language.ui.solverlanguage.check.expensive">
+                        <attribute
+                                name="FIXABLE_KEY"
+                                value="true">
+                        </attribute>
+                </markerResolutionGenerator>
+        </extension>
+        <!-- Rename Refactoring -->
+        <extension point="org.eclipse.ui.handlers">
+                <handler 
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
+                        commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+                        <activeWhen>
+                                <reference
+                                        definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                </reference>
+                        </activeWhen>
+                </handler>
+        </extension>
+        <extension point="org.eclipse.ui.menus">
+                <menuContribution
+                        locationURI="popup:#TextEditorContext?after=group.edit">
+                        <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+                                style="push">
+                                <visibleWhen checkEnabled="false">
+                                        <reference
+                                                definitionId="org.eclipse.viatra.solver.language.SolverLanguage.Editor.opened">
+                                        </reference>
+                                </visibleWhen>
+                        </command>
+                </menuContribution>
+        </extension>
+        <extension point="org.eclipse.ui.preferencePages">
+                <page
+                        category="org.eclipse.viatra.solver.language.SolverLanguage"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
+                        id="org.eclipse.viatra.solver.language.SolverLanguage.refactoring"
+                        name="Refactoring">
+                        <keywordReference id="org.eclipse.viatra.solver.language.ui.keyword_SolverLanguage"/>
+                </page>
+        </extension>
+        <extension point="org.eclipse.compare.contentViewers">
+                <viewer id="org.eclipse.viatra.solver.language.SolverLanguage.compare.contentViewers"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+                        extensions="vsc">
+                </viewer>
+                <contentTypeBinding
+                        contentTypeId="org.eclipse.viatra.solver.language.SolverLanguage.contenttype"
+                        contentViewerId="org.eclipse.viatra.solver.language.SolverLanguage.compare.contentViewers" />
+        </extension>
+        <extension point="org.eclipse.compare.contentMergeViewers">
+                <viewer id="org.eclipse.viatra.solver.language.SolverLanguage.compare.contentMergeViewers"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+                        extensions="vsc" label="SolverLanguage Compare">
+                </viewer>
+                <contentTypeBinding
+                        contentTypeId="org.eclipse.viatra.solver.language.SolverLanguage.contenttype"
+                        contentMergeViewerId="org.eclipse.viatra.solver.language.SolverLanguage.compare.contentMergeViewers" />
+        </extension>
+        <extension point="org.eclipse.ui.editors.documentProviders">
+                <provider id="org.eclipse.viatra.solver.language.SolverLanguage.editors.documentProviders"
+                        class="org.eclipse.viatra.solver.language.ui.SolverLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
+                        extensions="vsc">
+                </provider>
+        </extension>
+        <extension point="org.eclipse.team.core.fileTypes">
+                <fileTypes
+                        extension="vsc"
+                        type="text">
+                </fileTypes>
+        </extension>
+</plugin>
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 cff29f76..e0206f6a 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
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.ui;
diff --git a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/SolverLanguageExecutableExtensionFactory.java b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/SolverLanguageExecutableExtensionFactory.java
index b86c5864..7d189d28 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/SolverLanguageExecutableExtensionFactory.java
+++ b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/SolverLanguageExecutableExtensionFactory.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.ui;
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 776817bc..fbf12ae8 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
@@ -1,10 +1,11 @@
 /*
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.ui.contentassist;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.Assignment;
+import org.eclipse.xtext.CrossReference;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider;
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
@@ -20,135 +21,237 @@ public abstract class AbstractSolverLanguageProposalProvider extends TerminalsPr
        public void completeProblem_Statements(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeBasicInterpretation_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAssertionOrDefinition_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeBasicInterpretation_Objects(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAssertionOrDefinition_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeBasicInterpretation_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completePredicateDefinition_Functional(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void completePredicateDefinition_Error(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void completePredicateDefinition_Head(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeModelSymbol_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completePredicateDefinition_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeNamedObject_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeUnnamedErrorPrediateDefinition_ArgumentList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeUnnamedObject_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeUnnamedErrorPrediateDefinition_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeBooleanObject_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeDefaultDefinition_Head(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeIntObject_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeDefaultDefinition_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeRealObject_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeExternPredicateDefinition_Head(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeStringObject_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeMetricDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completePredicate_IsError(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeMetricDefinition_Head(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-                // subclasses may override
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completePredicate_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeMetricDefinition_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completePredicate_Parameters(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeExternMetricDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completePredicate_Bodies(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeExternMetricDefinition_Head(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeParameter_Variable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeIfElse_Condition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeParameter_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeIfElse_Then(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completePatternBody_Constraints(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeIfElse_Else(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeConstraint_Polarity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeDisjunctiveExpression_Children(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeConstraint_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeDisjunctiveExpression_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeConstraint_Params(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeDisjunctiveExpression_Cases(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeConstraint_ClosureType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeCase_Condition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeVariable_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeCase_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeAllInstances_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeConjunctiveExpression_Children(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeDefaultInterpretation_Interpretation(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeComparisonExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeClassInterpretation_Abstract(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeComparisonExpression_Right(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-                // subclasses may override
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeClassInterpretation_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAdditiveExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeClassInterpretation_Supertypes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAdditiveExpression_Right(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeClassInterpretation_Fielt(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeMultiplicativeExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeEnumInterpretation_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeMultiplicativeExpression_Right(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeEnumInterpretation_Objects(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeExponentialExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeFieldRelationInterpretation_Containment(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeExponentialExpression_Right(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-                // subclasses may override
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeFieldRelationInterpretation_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeUnaryExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeFieldRelationInterpretation_Multiplicity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeUnaryExpression_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeFieldRelationInterpretation_Target(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeCount_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeGlobalRelationInterpretation_Containment(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAggregation_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-                // subclasses may override
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeGlobalRelationInterpretation_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAggregation_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeGlobalRelationInterpretation_SourceMultiplicity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAggregation_Condition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeGlobalRelationInterpretation_Source(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeAtomicExpression_ArgumentList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeGlobalRelationInterpretation_TargetMultiplicity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeCall_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeGlobalRelationInterpretation_Target(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeCall_TransitiveClosure(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeMultiplicityDefinition_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeCall_ReflexiveTransitiveClosure(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeMultiplicityDefinition_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeCall_ArgumentList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
        }
-        public void completeMultiplicityDefinition_UnlimitedUpper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeArgumentList_Arguments(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeExpressionArgument_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeTypedArgument_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeTypedArgument_Variable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeTypedStarArgument_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeReference_Referred(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeInterval_LowerBound(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeInterval_UpperBound(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeLogicLiteral_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeNumericLiteral_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeStringLiteral_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeClassDefinition_Abstract(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void completeClassDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeClassDefinition_Superclasses(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeClassDefinition_Members(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeMemberDefinition_Containment(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
+        public void completeMemberDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeMemberDefinition_Multiplicity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeMemberDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeMemberDefinition_Opposite(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeExactMultiplicity_Multiplicity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeBoundedMultiplicity_LowerBound(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeBoundedMultiplicity_UpperBound(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeExactScopeDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeExactScopeDefinition_ExactScope(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeBoundedScopeDefinition_LowerBound(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeBoundedScopeDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeBoundedScopeDefinition_UpperBound(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeLowerBoundedScopeDefinition_LowerBound(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeLowerBoundedScopeDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeObjectiveDefinition_Kind(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeObjectiveDefinition_Objective(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeNamedElement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
        public void complete_Problem(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
@@ -156,133 +259,202 @@ public abstract class AbstractSolverLanguageProposalProvider extends TerminalsPr
        public void complete_Statement(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_STRING(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AssertionOrDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_PredicateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_REALLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_UnnamedErrorPrediateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_INTLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_DefaultDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_BooleanValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ExternPredicateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_TruthValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_MetricType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Interpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_MetricDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_BasicInterpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ExternMetricDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Symbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_Expression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_ModelSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_IfElse(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_PartialitySymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_DisjunctiveExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_ExistSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_Case(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_EqualsSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ConjunctiveExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_DataSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_BinaryOperator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_BooleanSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ComparisonOperator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_IntegerSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ComparisonExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_RealSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AdditiveBinaryOperator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_StringSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AdditiveExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_ComplexObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_MultiplicativeBinaryOperator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Object(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_MultiplicativeExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_NamedObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ExponentialOp(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_UnnamedObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ExponentialExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_DataObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_UnaryOp(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_BooleanObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_UnaryExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_IntObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AggregationExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_RealObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_Count(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_StringObject(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AggregationOp(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Predicate(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_Aggregation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Parameter(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AtomicExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_PatternBody(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_Call(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Polarity(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ArgumentList(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Constraint(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_Argument(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_ClosureType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ExpressionArgument(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_StarArgument(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_TypedArgument(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_TypedStarArgument(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_Reference(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_Interval(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
        public void complete_Literal(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_Variable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_LogicValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_AllInstances(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_LogicLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_AllObjects(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_NumericLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_DefaultInterpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_InfinityLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_CDInterpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_EmptyIntervalLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_StringLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ClassDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_MemberDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_Multiplicity(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ManyMultiplicity(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ExactMultiplicity(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_BoundedMultiplicity(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ScopeDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ExactScopeDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_BoundedScopeDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_LowerBoundedScopeDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ObjectiveKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ObjectiveDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_UpperMultiplicty(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_Real(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_QualifiedName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_STRING(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_ClassInterpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_QUOTED_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_EnumInterpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_PLUS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_FieldRelationInterpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_STAR(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_GlobalRelationInterpretation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_DOT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
-        public void complete_MultiplicityDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_NamedElement(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                // subclasses may override
        }
 }
diff --git a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/internal/LanguageActivator.java b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/internal/LanguageActivator.java
index 327cfff1..22259126 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/internal/LanguageActivator.java
+++ b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/ui/internal/LanguageActivator.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.ui.internal;
diff --git a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidatorConfigurationBlock.java b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidatorConfigurationBlock.java
index ad6c3a18..a603d3d2 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidatorConfigurationBlock.java
+++ b/Application/org.eclipse.viatra.solver.language.ui/src-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidatorConfigurationBlock.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.validation;
diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend
index 1c165a0a..602646aa 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend
@@ -4,21 +4,17 @@
 package org.eclipse.viatra.solver.language.ui
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
-import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator
-import org.eclipse.xtext.ui.editor.syntaxcoloring.ITextAttributeProvider
-import org.eclipse.viatra.solver.language.ui.highlight.SolverSemanticHighlightCalculator
-import org.eclipse.viatra.solver.language.ui.highlight.SolverSemanticTextAttributeProvider
 /**
 * Use this class to register components to be used within the Eclipse IDE.
 */
 @FinalFieldsConstructor
 class SolverLanguageUiModule extends AbstractSolverLanguageUiModule {
-        def Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+//      def Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
-                SolverSemanticHighlightCalculator
+//              SolverSemanticHighlightCalculator
-        }
+//      }
-        
+//      
-        def Class<? extends ITextAttributeProvider> bindITextAttributeProvider() {
+//      def Class<? extends ITextAttributeProvider> bindITextAttributeProvider() {
-                SolverSemanticTextAttributeProvider
+//              SolverSemanticTextAttributeProvider
-        }
+//      }
 }
diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticHighlightCalculator.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.xtend
index cb10ebf4..5242a82e 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticHighlightCalculator.xtend
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.xtend
@@ -1,8 +1,8 @@
-package org.eclipse.viatra.solver.language.ui.highlight
+package org.eclipse.viatra.solver.language.ui.syntaxcoloring
 import java.util.Random
 import java.util.WeakHashMap
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol
+import org.eclipse.viatra.solver.language.solverLanguage.Reference
 import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator
 import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils
@@ -10,49 +10,50 @@ import org.eclipse.xtext.resource.XtextResource
 import org.eclipse.xtext.util.CancelIndicator
 class SolverSemanticHighlightCalculator extends DefaultSemanticHighlightingCalculator {
-        public static val SmybolCode = "SymbolCode"
+        public static val SYMBOL_CODE = "SymbolCode::"
-        
-        val symbolName2ID = new WeakHashMap<String,String>
+        val symbolName2ID = new WeakHashMap<String, String>
-        
-        override provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor, CancelIndicator cancelIndicator) {
+        override provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor,
+                CancelIndicator cancelIndicator) {
                if (resource === null || resource.getParseResult() === null) {
                        return
                } else {
-                        val modelSymbols = resource.allContents.filter(ModelSymbol)
+                        val modelSymbols = resource.allContents.filter(Reference)
-                        while(modelSymbols.hasNext) {
+                        while (modelSymbols.hasNext) {
                                val symbolElement = modelSymbols.next
-                                val node = NodeModelUtils::getNode(symbolElement)
+                                val node = NodeModelUtils.getNode(symbolElement)
                                acceptor.addPosition(
                                        node.getOffset(),
                                        node.getLength(),
-                                        getSymbolCode(symbolElement.name)
+                                        getSymbolCode(node.text)
                                )
                        }
                }
        }
-        
        def getSymbolCode(String name) {
-                if(symbolName2ID.containsKey(name)) {
+                if (symbolName2ID.containsKey(name)) {
                        return symbolName2ID.get(name)
                } else {
                        val id = calculateSymbolCode(name)
-                        symbolName2ID.put(name,id)
+                        symbolName2ID.put(name, id)
                        return id
                }
        }
-        
        def String calculateSymbolCode(String name) {
                val Random random = new Random(name.hashCode)
                val hue = huePick(random.nextFloat)
-                val saturation = 0.2+random.nextFloat*0.3
+                val saturation = 0.2 + random.nextFloat * 0.3
-                val brightness = random.nextFloat*0.2+0.7f
+                val brightness = random.nextFloat * 0.2 + 0.7f
-                return '''«SmybolCode» «hue» «saturation» «brightness»'''
+                return '''«SYMBOL_CODE» «hue» «saturation» «brightness»'''
        }
        private def huePick(float random) {
                val pink = 300
                val tolerance = 10
-                val degree = random*(360-2*tolerance)
+                val degree = random * (360 - 2 * tolerance)
-                if(degree<pink-tolerance) return degree
+                if(degree < pink - tolerance) return degree else return degree + 2 * tolerance
-                else return degree+2*tolerance
        }
-}
-\ No newline at end of file
+}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticTextAttributeProvider.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.xtend
index 4eed59ce..ca74a9a2 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticTextAttributeProvider.xtend
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.xtend
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.ui.highlight
+package org.eclipse.viatra.solver.language.ui.syntaxcoloring
 import com.google.inject.Inject
 import java.util.WeakHashMap
@@ -12,34 +12,34 @@ import org.eclipse.xtext.ui.editor.utils.EditorUtils
 import org.eclipse.xtext.ui.editor.utils.TextStyle
 class SolverSemanticTextAttributeProvider extends TextAttributeProvider {
-        
        val defaultTextStyle = new TextStyle
-        val colorID2TextAttribute = new WeakHashMap<String,TextAttribute>
+        val colorID2TextAttribute = new WeakHashMap<String, TextAttribute>
-        
        @Inject
-        new(IHighlightingConfiguration highlightingConfig, IPreferenceStoreAccess preferenceStoreAccess, PreferenceStoreAccessor prefStoreAccessor) {
+        new(IHighlightingConfiguration highlightingConfig, IPreferenceStoreAccess preferenceStoreAccess,
+                PreferenceStoreAccessor prefStoreAccessor) {
                super(highlightingConfig, preferenceStoreAccess, prefStoreAccessor)
        }
-        
-        
        override getAttribute(String id) {
-                if(isMetamodelElementColorID(id)) {
+                if (isMetamodelElementColorID(id)) {
-                        if(colorID2TextAttribute.containsKey(id)) {
+                        if (colorID2TextAttribute.containsKey(id)) {
                                return colorID2TextAttribute.get(id)
                        } else {
                                val style = metamodelElementTextStyle(id)
-                                colorID2TextAttribute.put(id,style)
+                                colorID2TextAttribute.put(id, style)
                                return style
                        }
                } else {
                        super.getAttribute(id)
                }
        }
-        
        private def isMetamodelElementColorID(String id) {
-                id.startsWith(SolverSemanticHighlightCalculator::SmybolCode)
+                id.startsWith(SolverSemanticHighlightCalculator.SYMBOL_CODE)
        }
-        
        private def TextAttribute metamodelElementTextStyle(String id) {
                val texts = id.split(' ')
                val backgroundColor = new RGB(
@@ -47,11 +47,9 @@ class SolverSemanticTextAttributeProvider extends TextAttributeProvider {
                        Float.parseFloat(texts.get(2)),
                        Float.parseFloat(texts.get(3))
                )
-                return new TextAttribute(
+                return new TextAttribute(EditorUtils.colorFromRGB(defaultTextStyle.color),
-                        EditorUtils.colorFromRGB(defaultTextStyle.color),
+                        EditorUtils.colorFromRGB(backgroundColor), defaultTextStyle.style,
-                        EditorUtils.colorFromRGB(backgroundColor),
-                        defaultTextStyle.style,
                        EditorUtils.fontFromFontData(defaultTextStyle.getFontData()));
        }
-        
-}
-\ No newline at end of file
+}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.xtend
new file mode 100644
index 00000000..a7ff7252
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.xtend
@@ -0,0 +1,25 @@
+/*
+ * generated by Xtext 2.18.0.M3
+ */
+package org.eclipse.viatra.solver.language.validation
+/**
+ * This class contains custom validation rules. 
+ *
+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
+ */
+class SolverLanguageValidator extends AbstractSolverLanguageValidator {
+        
+//      public static val INVALID_NAME = 'invalidName'
+//
+//      @Check
+//      def checkGreetingStartsWithCapital(Greeting greeting) {
+//              if (!Character.isUpperCase(greeting.name.charAt(0))) {
+//                      warning('Name should start with a capital', 
+//                                      SolverLanguagePackage.Literals.GREETING__NAME,
+//                                      INVALID_NAME)
+//              }
+//      }
+        
+}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
new file mode 100644
index 00000000..30fff96c
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
Binary files differ
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
new file mode 100644
index 00000000..846152db
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
Binary files differ
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore
new file mode 100644
index 00000000..1764b462
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore
@@ -0,0 +1,2 @@
+/.SolverSemanticHighlightCalculator.java._trace
+/.SolverSemanticTextAttributeProvider.java._trace
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.java b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.java
new file mode 100644
index 00000000..2935dfd7
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.java
@@ -0,0 +1,83 @@
+package org.eclipse.viatra.solver.language.ui.syntaxcoloring;
+import com.google.common.collect.Iterators;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.WeakHashMap;
+import org.eclipse.viatra.solver.language.solverLanguage.Reference;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
+import org.eclipse.xtext.nodemodel.ICompositeNode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.util.CancelIndicator;
+@SuppressWarnings("all")
+public class SolverSemanticHighlightCalculator extends DefaultSemanticHighlightingCalculator {
+  public static final String SYMBOL_CODE = "SymbolCode::";
+  
+  private final WeakHashMap<String, String> symbolName2ID = new WeakHashMap<String, String>();
+  
+  @Override
+  public void provideHighlightingFor(final XtextResource resource, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
+    if (((resource == null) || (resource.getParseResult() == null))) {
+      return;
+    } else {
+      final Iterator<Reference> modelSymbols = Iterators.<Reference>filter(resource.getAllContents(), Reference.class);
+      while (modelSymbols.hasNext()) {
+        {
+          final Reference symbolElement = modelSymbols.next();
+          final ICompositeNode node = NodeModelUtils.getNode(symbolElement);
+          acceptor.addPosition(
+            node.getOffset(), 
+            node.getLength(), 
+            this.getSymbolCode(node.getText()));
+        }
+      }
+    }
+  }
+  
+  public String getSymbolCode(final String name) {
+    boolean _containsKey = this.symbolName2ID.containsKey(name);
+    if (_containsKey) {
+      return this.symbolName2ID.get(name);
+    } else {
+      final String id = this.calculateSymbolCode(name);
+      this.symbolName2ID.put(name, id);
+      return id;
+    }
+  }
+  
+  public String calculateSymbolCode(final String name) {
+    int _hashCode = name.hashCode();
+    final Random random = new Random(_hashCode);
+    final float hue = this.huePick(random.nextFloat());
+    float _nextFloat = random.nextFloat();
+    double _multiply = (_nextFloat * 0.3);
+    final double saturation = (0.2 + _multiply);
+    float _nextFloat_1 = random.nextFloat();
+    double _multiply_1 = (_nextFloat_1 * 0.2);
+    final double brightness = (_multiply_1 + 0.7f);
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append(SolverSemanticHighlightCalculator.SYMBOL_CODE);
+    _builder.append(" ");
+    _builder.append(hue);
+    _builder.append(" ");
+    _builder.append(saturation);
+    _builder.append(" ");
+    _builder.append(brightness);
+    return _builder.toString();
+  }
+  
+  private float huePick(final float random) {
+    final int pink = 300;
+    final int tolerance = 10;
+    final float degree = (random * (360 - (2 * tolerance)));
+    if ((degree < (pink - tolerance))) {
+      return degree;
+    } else {
+      return (degree + (2 * tolerance));
+    }
+  }
+}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.java b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.java
new file mode 100644
index 00000000..04824ad1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.java
@@ -0,0 +1,63 @@
+package org.eclipse.viatra.solver.language.ui.syntaxcoloring;
+import com.google.inject.Inject;
+import java.util.WeakHashMap;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.viatra.solver.language.ui.syntaxcoloring.SolverSemanticHighlightCalculator;
+import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfiguration;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.PreferenceStoreAccessor;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.TextAttributeProvider;
+import org.eclipse.xtext.ui.editor.utils.EditorUtils;
+import org.eclipse.xtext.ui.editor.utils.TextStyle;
+@SuppressWarnings("all")
+public class SolverSemanticTextAttributeProvider extends TextAttributeProvider {
+  private final TextStyle defaultTextStyle = new TextStyle();
+  
+  private final WeakHashMap<String, TextAttribute> colorID2TextAttribute = new WeakHashMap<String, TextAttribute>();
+  
+  @Inject
+  public SolverSemanticTextAttributeProvider(final IHighlightingConfiguration highlightingConfig, final IPreferenceStoreAccess preferenceStoreAccess, final PreferenceStoreAccessor prefStoreAccessor) {
+    super(highlightingConfig, preferenceStoreAccess, prefStoreAccessor);
+  }
+  
+  @Override
+  public TextAttribute getAttribute(final String id) {
+    TextAttribute _xifexpression = null;
+    boolean _isMetamodelElementColorID = this.isMetamodelElementColorID(id);
+    if (_isMetamodelElementColorID) {
+      boolean _containsKey = this.colorID2TextAttribute.containsKey(id);
+      if (_containsKey) {
+        return this.colorID2TextAttribute.get(id);
+      } else {
+        final TextAttribute style = this.metamodelElementTextStyle(id);
+        this.colorID2TextAttribute.put(id, style);
+        return style;
+      }
+    } else {
+      _xifexpression = super.getAttribute(id);
+    }
+    return _xifexpression;
+  }
+  
+  private boolean isMetamodelElementColorID(final String id) {
+    return id.startsWith(SolverSemanticHighlightCalculator.SYMBOL_CODE);
+  }
+  
+  private TextAttribute metamodelElementTextStyle(final String id) {
+    final String[] texts = id.split(" ");
+    float _parseFloat = Float.parseFloat(texts[1]);
+    float _parseFloat_1 = Float.parseFloat(texts[2]);
+    float _parseFloat_2 = Float.parseFloat(texts[3]);
+    final RGB backgroundColor = new RGB(_parseFloat, _parseFloat_1, _parseFloat_2);
+    Color _colorFromRGB = EditorUtils.colorFromRGB(this.defaultTextStyle.getColor());
+    Color _colorFromRGB_1 = EditorUtils.colorFromRGB(backgroundColor);
+    int _style = this.defaultTextStyle.getStyle();
+    Font _fontFromFontData = EditorUtils.fontFromFontData(this.defaultTextStyle.getFontData());
+    return new TextAttribute(_colorFromRGB, _colorFromRGB_1, _style, _fontFromFontData);
+  }
+}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
new file mode 100644
index 00000000..6d6995bd
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
Binary files differ
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
new file mode 100644
index 00000000..f1cb387a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
@@ -0,0 +1 @@
+/.SolverLanguageValidator.java._trace
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.java b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.java
new file mode 100644
index 00000000..2b8f158a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.java
@@ -0,0 +1,15 @@
+/**
+ * generated by Xtext 2.18.0.M3
+ */
+package org.eclipse.viatra.solver.language.validation;
+import org.eclipse.viatra.solver.language.validation.AbstractSolverLanguageValidator;
+/**
+ * This class contains custom validation rules.
+ * 
+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
+ */
+@SuppressWarnings("all")
+public class SolverLanguageValidator extends AbstractSolverLanguageValidator {
+}