From 432ff3aaee8d45025f309436db541d0ec1b76485 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 4 Nov 2021 17:41:52 +0100 Subject: fix(language): hide current implicit proposal Content assist proposals should not display the object that is only added to the model because the current context assist input refers to it (e.g., an implicit node or variable that is only referenced in the currently edited context). --- .../tools/refinery/language/model/ProblemUtil.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'language-model') diff --git a/language-model/src/main/java/tools/refinery/language/model/ProblemUtil.java b/language-model/src/main/java/tools/refinery/language/model/ProblemUtil.java index b6b199f8..5f8641bf 100644 --- a/language-model/src/main/java/tools/refinery/language/model/ProblemUtil.java +++ b/language-model/src/main/java/tools/refinery/language/model/ProblemUtil.java @@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import tools.refinery.language.model.problem.ClassDeclaration; +import tools.refinery.language.model.problem.ImplicitVariable; import tools.refinery.language.model.problem.Node; import tools.refinery.language.model.problem.Problem; import tools.refinery.language.model.problem.ProblemPackage; @@ -33,6 +34,24 @@ public final class ProblemUtil { public static boolean isSingletonVariable(Variable variable) { return variable.eContainingFeature() == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE; } + + public static boolean isImplicitVariable(Variable variable) { + return variable instanceof ImplicitVariable; + } + + public static boolean isImplicitNode(Node node) { + return node.eContainingFeature() == ProblemPackage.Literals.PROBLEM__NODES; + } + + public static boolean isImplicit(EObject eObject) { + if (eObject instanceof Node node) { + return isImplicitNode(node); + } else if (eObject instanceof Variable variable) { + return isImplicitVariable(variable); + } else { + return false; + } + } public static boolean isUniqueNode(Node node) { var containingFeature = node.eContainingFeature(); -- cgit v1.2.3-70-g09d2