fix: Java file diagnostics is not refreshed when properties file is

saved Fixes #860 Signed-off-by: azerr <[email protected]>
redhat-developer · Sep 10, 2023 · 4b61a21 · 4b61a21
1 parent 5d3b511
commit 4b61a21
Show file tree

Hide file tree

Showing 14 changed files with 506 additions and 447 deletions.
diff --git a/...om/redhat/devtools/intellij/lsp4ij/operations/documentation/LSPDocumentationProvider.java b/...om/redhat/devtools/intellij/lsp4ij/operations/documentation/LSPDocumentationProvider.java
@@ -99,10 +99,8 @@ public List<MarkupContent> getMarkupContents(PsiElement element, @Nullable PsiEl
             // (LSP textDocument/completion request)
             return ((LSPPsiElementForLookupItem) element).getDocumentation();
         }
-        if (originalElement == null || !Objects.equals(element.getContainingFile(), originalElement.getContainingFile())) {
-            return null;
-        }
-        Editor editor = LSPIJUtils.editorForElement(element);
+
+        Editor editor = LSPIJUtils.editorForElement(originalElement);
         if (editor == null) {
             return null;
         }
@@ -111,7 +109,7 @@ public List<MarkupContent> getMarkupContents(PsiElement element, @Nullable PsiEl
         VirtualFile file = originalElement.getContainingFile().getVirtualFile();
         if (LSPVirtualFileWrapper.hasWrapper(file)) {
             int targetOffset = getTargetOffset(originalElement);
-            return LSPVirtualFileWrapper.getLSPVirtualFileWrapper(file).getHoverContent(element, targetOffset, editor);
+            return LSPVirtualFileWrapper.getLSPVirtualFileWrapper(file).getHoverContent(originalElement, targetOffset, editor);
         }
         return null;
     }

diff --git a/...devtools/intellij/lsp4mp4ij/psi/core/java/definition/PropertiesDefinitionParticipant.java b/...devtools/intellij/lsp4mp4ij/psi/core/java/definition/PropertiesDefinitionParticipant.java
@@ -57,7 +57,7 @@ protected List<MicroProfileDefinition> collectDefinitions(String propertyKey, Ra
 		// Collect all properties files (properties, yaml files) where the given
 		// property key is configured
 		List<MicroProfileConfigPropertyInformation> infos = PsiMicroProfileProjectManager.getInstance(context.getJavaProject().getProject())
-				.getJDTMicroProfileProject(javaProject).getPropertyInformations(propertyKey);
+				.getMicroProfileProject(javaProject).getPropertyInformations(propertyKey);
 		if (!infos.isEmpty()) {
 			return infos.stream().map(info -> {
 				MicroProfileDefinition definition = new MicroProfileDefinition();

diff --git a/...om/redhat/devtools/intellij/lsp4mp4ij/psi/core/java/hover/PropertiesHoverParticipant.java b/...om/redhat/devtools/intellij/lsp4mp4ij/psi/core/java/hover/PropertiesHoverParticipant.java
@@ -181,7 +181,7 @@ public Hover collectHover(JavaHoverContext context) {
 			propertyKey = propertyReplacer.apply(propertyKey);
 		}
 		PsiMicroProfileProject mpProject = PsiMicroProfileProjectManager.getInstance(javaProject.getProject())
-				.getJDTMicroProfileProject(javaProject);
+				.getMicroProfileProject(javaProject);
 		List<MicroProfileConfigPropertyInformation> propertyInformation = getConfigPropertyInformation(propertyKey,
 				annotation, defaultValueAnnotationMemberName, typeRoot, mpProject, utils);
 		return new Hover(getDocumentation(propertyInformation, context.getDocumentFormat(),