Add enum support

1 files changed, 3 insertions, 86 deletions

diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
index d3976ec5..94dbdfee 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
@@ -1,21 +1,9 @@
 package org.eclipse.viatra.solver.language.resource;
 
-import java.util.Iterator;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.viatra.solver.language.ProblemUtil;
-import org.eclipse.viatra.solver.language.model.problem.Argument;
-import org.eclipse.viatra.solver.language.model.problem.Assertion;
-import org.eclipse.viatra.solver.language.model.problem.Atom;
-import org.eclipse.viatra.solver.language.model.problem.Conjunction;
 import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
-import org.eclipse.viatra.solver.language.model.problem.Literal;
-import org.eclipse.viatra.solver.language.model.problem.NegativeLiteral;
 import org.eclipse.viatra.solver.language.model.problem.Node;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.Statement;
-import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.resource.DefaultLocationInFileProvider;
 import org.eclipse.xtext.util.ITextRegion;
 
@@ -26,90 +14,19 @@ public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider
                         return getNodeTextRegion((Node) obj, query);
                 }
                 if (obj instanceof ImplicitVariable) {
-                        return getVariableTextRegion((ImplicitVariable) obj, query);
+                        return ITextRegion.EMPTY_REGION;
                 }
                 return super.doGetTextRegion(obj, query);
         }
 
         protected ITextRegion getNodeTextRegion(Node node, RegionDescription query) {
-                ITextRegion newNodeRegion = getNewNodeTextRegion(node, query);
-                if (newNodeRegion != null) {
-                        return newNodeRegion;
+                if (ProblemUtil.isEnumLiteral(node)) {
+                        return super.doGetTextRegion(node, query);
                 }
-                return getNodeFirstReferenceTextRegion(node, query);
-        }
-        
-        protected ITextRegion getNewNodeTextRegion(Node node, RegionDescription query) {
                 if (ProblemUtil.isNewNode(node)) {
                         EObject container = node.eContainer();
                         return doGetTextRegion(container, query);
                 }
-                return null;
-        }
-
-        protected ITextRegion getNodeFirstReferenceTextRegion(Node node, RegionDescription query) {
-                Problem problem = EcoreUtil2.getContainerOfType(node, Problem.class);
-                if (problem == null) {
-                        return ITextRegion.EMPTY_REGION;
-                }
-                for (Statement statement : problem.getStatements()) {
-                        if (statement instanceof Assertion) {
-                                Assertion assertion = (Assertion) statement;
-                                int index = assertion.getArguments().indexOf(node);
-                                if (index >= 0) {
-                                        return doGetLocationOfFeature(assertion, ProblemPackage.Literals.ASSERTION__ARGUMENTS, index,
-                                                        query);
-                                }
-                        }
-                }
-                return ITextRegion.EMPTY_REGION;
-        }
-
-        protected ITextRegion getVariableTextRegion(ImplicitVariable variable, RegionDescription query) {
-                EObject container = variable.eContainer();
-                if (container instanceof Argument) {
-                        return getArgumentTextRegion((Argument) container, query);
-                }
-                if (container instanceof Conjunction) {
-                        return getFirstReferenceToVariableInConjunction(variable, (Conjunction) container, query);
-                }
-                if (container instanceof NegativeLiteral) {
-                        return getFirstReferenceToVariableInNegativeLiteral(variable, (NegativeLiteral) container, query);
-                }
-                return ITextRegion.EMPTY_REGION;
-        }
-
-        protected ITextRegion getFirstReferenceToVariableInConjunction(ImplicitVariable variable, Conjunction conjunction,
-                        RegionDescription query) {
-                Iterator<Literal> iterator = conjunction.getLiterals().iterator();
-                ITextRegion found = ITextRegion.EMPTY_REGION;
-                while (found == ITextRegion.EMPTY_REGION && iterator.hasNext()) {
-                        Literal literal = iterator.next();
-                        if (literal instanceof Atom) {
-                                found = getFirstReferenceToVariableInAtom(variable, (Atom) literal, query);
-                        } else if (literal instanceof NegativeLiteral) {
-                                found = getFirstReferenceToVariableInNegativeLiteral(variable, (NegativeLiteral) literal, query);
-                        }
-                }
-                return found;
-        }
-
-        protected ITextRegion getFirstReferenceToVariableInNegativeLiteral(ImplicitVariable variable,
-                        NegativeLiteral literal, RegionDescription query) {
-                return getFirstReferenceToVariableInAtom(variable, literal.getAtom(), query);
-        }
-
-        protected ITextRegion getFirstReferenceToVariableInAtom(ImplicitVariable variable, Atom atom,
-                        RegionDescription query) {
-                for (Argument argument : atom.getArguments()) {
-                        if (argument.getVariable().equals(variable)) {
-                                return getArgumentTextRegion(argument, query);
-                        }
-                }
                 return ITextRegion.EMPTY_REGION;
         }
-        
-        protected ITextRegion getArgumentTextRegion(Argument argument, RegionDescription query) {
-                return doGetLocationOfFeature(argument, ProblemPackage.Literals.ARGUMENT__VARIABLE, 0, query);
-        }
 }