aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java')
-rw-r--r--subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index 477940aa..6a05005d 100644
--- a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -15,7 +15,6 @@ import org.eclipse.xtext.util.CancelIndicator;
15import com.google.common.collect.ImmutableList; 15import com.google.common.collect.ImmutableList;
16import com.google.inject.Inject; 16import com.google.inject.Inject;
17 17
18import tools.refinery.language.ProblemUtil;
19import tools.refinery.language.model.problem.ClassDeclaration; 18import tools.refinery.language.model.problem.ClassDeclaration;
20import tools.refinery.language.model.problem.NamedElement; 19import tools.refinery.language.model.problem.NamedElement;
21import tools.refinery.language.model.problem.Node; 20import tools.refinery.language.model.problem.Node;
@@ -23,6 +22,8 @@ import tools.refinery.language.model.problem.PredicateDefinition;
23import tools.refinery.language.model.problem.PredicateKind; 22import tools.refinery.language.model.problem.PredicateKind;
24import tools.refinery.language.model.problem.ProblemPackage; 23import tools.refinery.language.model.problem.ProblemPackage;
25import tools.refinery.language.model.problem.ReferenceDeclaration; 24import tools.refinery.language.model.problem.ReferenceDeclaration;
25import tools.refinery.language.utils.ProblemDesugarer;
26import tools.refinery.language.utils.ProblemUtil;
26 27
27public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator { 28public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
28 private static final String BUILTIN_CLASS = "builtin"; 29 private static final String BUILTIN_CLASS = "builtin";
@@ -36,6 +37,9 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
36 @Inject 37 @Inject
37 private OperationCanceledManager operationCanceledManager; 38 private OperationCanceledManager operationCanceledManager;
38 39
40 @Inject
41 private ProblemDesugarer desugarer;
42
39 @Override 43 @Override
40 protected boolean highlightElement(EObject object, IHighlightedPositionAcceptor acceptor, 44 protected boolean highlightElement(EObject object, IHighlightedPositionAcceptor acceptor,
41 CancelIndicator cancelIndicator) { 45 CancelIndicator cancelIndicator) {
@@ -101,7 +105,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
101 classesBuilder.add(ABSTRACT_CLASS); 105 classesBuilder.add(ABSTRACT_CLASS);
102 } 106 }
103 if (eObject instanceof ReferenceDeclaration referenceDeclaration 107 if (eObject instanceof ReferenceDeclaration referenceDeclaration
104 && ProblemUtil.isContainmentReference(referenceDeclaration)) { 108 && desugarer.isContainmentReference(referenceDeclaration)) {
105 classesBuilder.add(CONTAINMENT_CLASS); 109 classesBuilder.add(CONTAINMENT_CLASS);
106 } 110 }
107 if (eObject instanceof PredicateDefinition predicateDefinition 111 if (eObject instanceof PredicateDefinition predicateDefinition