fix(language): documentation for non-imported libraries

graphs4value · Dec 16, 2024 · 7b6cf6e · 7b6cf6e
1 parent 7159795
commit 7b6cf6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.../main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java b/.../main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
@@ -348,6 +348,8 @@ protected void postProcessImportProposals(List<IEObjectDescription> descriptions
 			var proxy = ProblemFactory.eINSTANCE.createProblem();
 			((InternalEObject) proxy).eSetProxyURI(uri);
 			var description = new EObjectDescription(suggestedName, proxy, Map.of(
+					ProblemResourceDescriptionStrategy.SHADOWING_KEY,
+					ProblemResourceDescriptionStrategy.SHADOWING_KEY_PROBLEM,
 					ProblemResourceDescriptionStrategy.MODULE_KIND, ModuleKind.MODULE.getName()
 			));
 			descriptions.add(description);

diff --git a/...age-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemProposalUtils.java b/...age-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemProposalUtils.java
@@ -171,14 +171,14 @@ private static boolean isShadow(IEObjectDescription candidate, EObject eObject)
 
 	@Nullable
 	public String getDocumentation(IEObjectDescription candidate, ContentAssistContext context) {
-		if (candidate.getUserData(ProblemResourceDescriptionStrategy.SHADOWING_KEY) == null) {
-			// Description was not generated by our ResourceDescriptionStrategy, so we must trigger proxy resolution.
-			return getDocumentation(candidate.getEObjectOrProxy());
-		}
 		if (ProblemPackage.Literals.PROBLEM.isSuperTypeOf(candidate.getEClass())) {
 			var name = NamingUtil.stripRootPrefix(candidate.getQualifiedName());
 			return getProblemDocumentation(context.getResource(), name);
 		}
+		if (candidate.getUserData(ProblemResourceDescriptionStrategy.SHADOWING_KEY) == null) {
+			// Description was not generated by our ResourceDescriptionStrategy, so we must trigger proxy resolution.
+			return getDocumentation(candidate.getEObjectOrProxy());
+		}
 		return candidate.getUserData(DocumentationCommentParser.DOCUMENTATION);
 	}