Refactoring based on Sonar reports

2 files changed, 42 insertions, 45 deletions

diff --git a/language-ide/build.gradle b/language-ide/build.gradle
index 396f63bd..1731cc59 100644
--- a/language-ide/build.gradle
+++ b/language-ide/build.gradle
@@ -1,3 +1,5 @@
+apply from: "${rootDir}/gradle/xtext-common.gradle"
+
 dependencies {
         compile project(':language')
         compile "org.eclipse.xtext:org.eclipse.xtext.ide:${xtextVersion}"
diff --git a/language-ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/language-ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index eee5070b..b1a69e9d 100644
--- a/language-ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/language-ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -3,26 +3,24 @@ package org.eclipse.viatra.solver.language.ide.syntaxcoloring;
 import java.util.List;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.viatra.solver.language.ProblemUtil;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.EnumDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.NamedElement;
 import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.Parameter;
 import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
-import org.eclipse.viatra.solver.language.scoping.ProblemGlobalScopeProvider;
 import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator;
 import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.service.OperationCanceledManager;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.eclipse.xtext.util.SimpleAttributeResolver;
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
@@ -49,19 +47,18 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         @Override
         protected boolean highlightElement(EObject object, IHighlightedPositionAcceptor acceptor,
                         CancelIndicator cancelIndicator) {
-                highlightName(object, acceptor, cancelIndicator);
+                highlightName(object, acceptor);
                 highlightCrossReferences(object, acceptor, cancelIndicator);
                 return false;
         }
-        
-        protected void highlightName(EObject object, IHighlightedPositionAcceptor acceptor,
-                        CancelIndicator cancelIndicator) {
+
+        protected void highlightName(EObject object, IHighlightedPositionAcceptor acceptor) {
+                if (!(object instanceof NamedElement)) {
+                        return;
+                }
                 String[] highlightClass = getHighlightClass(object);
                 if (highlightClass.length > 0) {
-                        EAttribute nameAttribute = SimpleAttributeResolver.NAME_RESOLVER.getAttribute(object);
-                        if (nameAttribute != null) {
-                                highlightFeature(acceptor, object, nameAttribute, highlightClass);
-                        }
+                        highlightFeature(acceptor, object, ProblemPackage.Literals.NAMED_ELEMENT__NAME, highlightClass);
                 }
         }
 
@@ -73,36 +70,44 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                         }
                         operationCanceledManager.checkCanceled(cancelIndicator);
                         if (reference.isMany()) {
-                                @SuppressWarnings("unchecked")
-                                EList<? extends EObject> values = (EList<? extends EObject>) object.eGet(reference);
-                                List<INode> nodes = NodeModelUtils.findNodesForFeature(object, reference);
-                                int size = Math.min(values.size(), nodes.size());
-                                for (int i = 0; i < size; i++) {
-                                        EObject valueInList = values.get(i);
-                                        INode node = nodes.get(i);
-                                        String[] highlightClass = getHighlightClass(valueInList);
-                                        if (highlightClass.length > 0) {
-                                                highlightNode(acceptor, node, highlightClass);
-                                        }
-                                }
+                                highlightManyValues(object, reference, acceptor);
                         } else {
-                                EObject valueObj = (EObject) object.eGet(reference);
-                                String[] highlightClass = getHighlightClass(valueObj);
-                                if (highlightClass.length > 0) {
-                                        highlightFeature(acceptor, object, reference, highlightClass);
-                                }
+                                highlightSingleValue(object, reference, acceptor);
+                        }
+                }
+        }
+
+        protected void highlightSingleValue(EObject object, EReference reference, IHighlightedPositionAcceptor acceptor) {
+                EObject valueObj = (EObject) object.eGet(reference);
+                String[] highlightClass = getHighlightClass(valueObj);
+                if (highlightClass.length > 0) {
+                        highlightFeature(acceptor, object, reference, highlightClass);
+                }
+        }
+
+        protected void highlightManyValues(EObject object, EReference reference, IHighlightedPositionAcceptor acceptor) {
+                @SuppressWarnings("unchecked")
+                EList<? extends EObject> values = (EList<? extends EObject>) object.eGet(reference);
+                List<INode> nodes = NodeModelUtils.findNodesForFeature(object, reference);
+                int size = Math.min(values.size(), nodes.size());
+                for (var i = 0; i < size; i++) {
+                        EObject valueInList = values.get(i);
+                        INode node = nodes.get(i);
+                        String[] highlightClass = getHighlightClass(valueInList);
+                        if (highlightClass.length > 0) {
+                                highlightNode(acceptor, node, highlightClass);
                         }
                 }
         }
 
         protected String[] getHighlightClass(EObject eObject) {
-                if (isBuiltIn(eObject)) {
+                if (ProblemUtil.isBuiltIn(eObject)) {
                         return new String[] { BUILTIN_CLASS };
                 }
                 ImmutableList.Builder<String> classesBuilder = ImmutableList.builder();
                 if (eObject instanceof ClassDeclaration) {
                         classesBuilder.add(CLASS_CLASS);
-                        ClassDeclaration classDeclaration = (ClassDeclaration) eObject;
+                        var classDeclaration = (ClassDeclaration) eObject;
                         if (classDeclaration.isAbstract()) {
                                 classesBuilder.add(ABSTRACT_CLASS);
                         }
@@ -112,21 +117,21 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                 }
                 if (eObject instanceof ReferenceDeclaration) {
                         classesBuilder.add(REFERENCE_CLASS);
-                        ReferenceDeclaration referenceDeclaration = (ReferenceDeclaration) eObject;
+                        var referenceDeclaration = (ReferenceDeclaration) eObject;
                         if (referenceDeclaration.isContainment()) {
                                 classesBuilder.add(CONTAINMENT_CLASS);
                         }
                 }
                 if (eObject instanceof PredicateDefinition) {
                         classesBuilder.add(PREDICATE_CLASS);
-                        PredicateDefinition predicateDefinition = (PredicateDefinition) eObject;
+                        var predicateDefinition = (PredicateDefinition) eObject;
                         if (predicateDefinition.isError()) {
                                 classesBuilder.add(ERROR_CLASS);
                         }
                 }
                 if (eObject instanceof Node) {
                         classesBuilder.add(NODE_CLASS);
-                        Node node = (Node) eObject;
+                        var node = (Node) eObject;
                         if (ProblemUtil.isEnumNode(node)) {
                                 classesBuilder.add(ENUM_NODE_CLASS);
                         }
@@ -139,7 +144,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                 }
                 if (eObject instanceof Variable) {
                         classesBuilder.add(VARIABLE_CLASS);
-                        Variable variable = (Variable) eObject;
+                        var variable = (Variable) eObject;
                         if (ProblemUtil.isSingletonVariable(variable)) {
                                 classesBuilder.add(SINGLETON_VARIABLE_CLASS);
                         }
@@ -147,14 +152,4 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                 List<String> classes = classesBuilder.build();
                 return classes.toArray(new String[0]);
         }
-
-        protected boolean isBuiltIn(EObject eObject) {
-                if (eObject != null) {
-                        Resource eResource = eObject.eResource();
-                        if (eResource != null) {
-                                return ProblemGlobalScopeProvider.BULTIN_LIBRARY_URI.equals(eResource.getURI());
-                        }
-                }
-                return false;
-        }
 }