feat(language): problem desugaring

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;
 
 import com.google.inject.Inject;
 
-import tools.refinery.language.ProblemUtil;
 import tools.refinery.language.model.problem.Problem;
 import tools.refinery.language.resource.ReferenceCounter;
+import tools.refinery.language.utils.ProblemUtil;
 
 public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider {
         @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;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
 
-import tools.refinery.language.ProblemUtil;
 import tools.refinery.language.model.problem.ClassDeclaration;
 import tools.refinery.language.model.problem.NamedElement;
 import tools.refinery.language.model.problem.Node;
@@ -23,6 +22,8 @@ import tools.refinery.language.model.problem.PredicateDefinition;
 import tools.refinery.language.model.problem.PredicateKind;
 import tools.refinery.language.model.problem.ProblemPackage;
 import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.utils.ProblemDesugarer;
+import tools.refinery.language.utils.ProblemUtil;
 
 public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
         private static final String BUILTIN_CLASS = "builtin";
@@ -36,6 +37,9 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         @Inject
         private OperationCanceledManager operationCanceledManager;
 
+        @Inject
+        private ProblemDesugarer desugarer;
+
         @Override
         protected boolean highlightElement(EObject object, IHighlightedPositionAcceptor acceptor,
                         CancelIndicator cancelIndicator) {
@@ -101,7 +105,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                         classesBuilder.add(ABSTRACT_CLASS);
                 }
                 if (eObject instanceof ReferenceDeclaration referenceDeclaration
-                                && ProblemUtil.isContainmentReference(referenceDeclaration)) {
+                                && desugarer.isContainmentReference(referenceDeclaration)) {
                         classesBuilder.add(CONTAINMENT_CLASS);
                 }
                 if (eObject instanceof PredicateDefinition predicateDefinition