diff options
Diffstat (limited to 'subprojects/language-ide/src/main/java/tools')
2 files changed, 7 insertions, 3 deletions
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java index 3650561a..8f04ed00 100644 --- a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java +++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java | |||
@@ -14,9 +14,9 @@ import org.eclipse.xtext.resource.IEObjectDescription; | |||
14 | 14 | ||
15 | import com.google.inject.Inject; | 15 | import com.google.inject.Inject; |
16 | 16 | ||
17 | import tools.refinery.language.ProblemUtil; | ||
18 | import tools.refinery.language.model.problem.Problem; | 17 | import tools.refinery.language.model.problem.Problem; |
19 | import tools.refinery.language.resource.ReferenceCounter; | 18 | import tools.refinery.language.resource.ReferenceCounter; |
19 | import tools.refinery.language.utils.ProblemUtil; | ||
20 | 20 | ||
21 | public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider { | 21 | public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider { |
22 | @Inject | 22 | @Inject |
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; | |||
15 | import com.google.common.collect.ImmutableList; | 15 | import com.google.common.collect.ImmutableList; |
16 | import com.google.inject.Inject; | 16 | import com.google.inject.Inject; |
17 | 17 | ||
18 | import tools.refinery.language.ProblemUtil; | ||
19 | import tools.refinery.language.model.problem.ClassDeclaration; | 18 | import tools.refinery.language.model.problem.ClassDeclaration; |
20 | import tools.refinery.language.model.problem.NamedElement; | 19 | import tools.refinery.language.model.problem.NamedElement; |
21 | import tools.refinery.language.model.problem.Node; | 20 | import tools.refinery.language.model.problem.Node; |
@@ -23,6 +22,8 @@ import tools.refinery.language.model.problem.PredicateDefinition; | |||
23 | import tools.refinery.language.model.problem.PredicateKind; | 22 | import tools.refinery.language.model.problem.PredicateKind; |
24 | import tools.refinery.language.model.problem.ProblemPackage; | 23 | import tools.refinery.language.model.problem.ProblemPackage; |
25 | import tools.refinery.language.model.problem.ReferenceDeclaration; | 24 | import tools.refinery.language.model.problem.ReferenceDeclaration; |
25 | import tools.refinery.language.utils.ProblemDesugarer; | ||
26 | import tools.refinery.language.utils.ProblemUtil; | ||
26 | 27 | ||
27 | public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator { | 28 | public 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 |