diff options
author | Kristóf Marussy <kristof@marussy.com> | 2023-08-26 21:44:58 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2023-08-26 22:01:33 +0200 |
commit | a49083f31679c47e1685e0cedbc9a40cc8f48fd8 (patch) | |
tree | d0702f26342297f54124900ecfc52e04c3e16d6f /subprojects/language-ide/src | |
parent | feat(frontend): automatic fit zoom (diff) | |
download | refinery-a49083f31679c47e1685e0cedbc9a40cc8f48fd8.tar.gz refinery-a49083f31679c47e1685e0cedbc9a40cc8f48fd8.tar.zst refinery-a49083f31679c47e1685e0cedbc9a40cc8f48fd8.zip |
refactor(frontent): improve graph drawing
Diffstat (limited to 'subprojects/language-ide/src')
2 files changed, 5 insertions, 2 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 ce5e7dad..ea90a82e 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 | |||
@@ -36,7 +36,10 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider | |||
36 | var eObjectDescriptionsByName = new HashMap<QualifiedName, List<IEObjectDescription>>(); | 36 | var eObjectDescriptionsByName = new HashMap<QualifiedName, List<IEObjectDescription>>(); |
37 | for (var candidate : super.queryScope(scope, crossReference, context)) { | 37 | for (var candidate : super.queryScope(scope, crossReference, context)) { |
38 | if (isExistingObject(candidate, crossReference, context)) { | 38 | if (isExistingObject(candidate, crossReference, context)) { |
39 | var qualifiedName = candidate.getQualifiedName(); | 39 | // {@code getQualifiedName()} will refer to the full name for objects that are loaded from the global |
40 | // scope, but {@code getName()} returns the qualified name that we set in | ||
41 | // {@code ProblemResourceDescriptionStrategy}. | ||
42 | var qualifiedName = candidate.getName(); | ||
40 | var candidateList = eObjectDescriptionsByName.computeIfAbsent(qualifiedName, | 43 | var candidateList = eObjectDescriptionsByName.computeIfAbsent(qualifiedName, |
41 | ignored -> new ArrayList<>()); | 44 | ignored -> new ArrayList<>()); |
42 | candidateList.add(candidate); | 45 | candidateList.add(candidate); |
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 08747ec5..ae8c70e0 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 | |||
@@ -95,7 +95,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli | |||
95 | } | 95 | } |
96 | 96 | ||
97 | protected String[] getHighlightClass(EObject eObject, EReference reference) { | 97 | protected String[] getHighlightClass(EObject eObject, EReference reference) { |
98 | boolean isError = eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError(); | 98 | boolean isError = ProblemUtil.isError(eObject); |
99 | if (ProblemUtil.isBuiltIn(eObject)) { | 99 | if (ProblemUtil.isBuiltIn(eObject)) { |
100 | var className = isError ? ERROR_CLASS : BUILTIN_CLASS; | 100 | var className = isError ? ERROR_CLASS : BUILTIN_CLASS; |
101 | return new String[] { className }; | 101 | return new String[] { className }; |