fix: don't leak deployment jar classes

Signed-off-by: Fred Bricon <[email protected]>
redhat-developer · Aug 4, 2023 · 5bd8a83 · 5bd8a83
1 parent cfa3f27
commit 5bd8a83
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/com/redhat/devtools/intellij/lsp4mp4ij/psi/core/PropertiesManager.java b/src/main/java/com/redhat/devtools/intellij/lsp4mp4ij/psi/core/PropertiesManager.java
@@ -104,7 +104,6 @@ public MicroProfileProjectInfo getMicroProfileProjectInfo(Module module,
                 .collect(Collectors.joining("+")) //
                 + "'");
         long startTime = System.currentTimeMillis();
-        boolean excludeTestCode = classpathKind == ClasspathKind.SRC;
         PropertiesCollector collector = new PropertiesCollector(info, scopes);
         if (module != null) {
             SearchScope scope = createSearchScope(module, scopes, classpathKind == ClasspathKind.TEST);
@@ -153,17 +152,17 @@ private static MicroProfileProjectInfo createInfo(Module module, ClasspathKind c
         return info;
     }
 
-    private SearchScope createSearchScope(Module module, List<MicroProfilePropertiesScope> scopes,
+    private SearchScope createSearchScope(@NotNull Module module, List<MicroProfilePropertiesScope> scopes,
                                           boolean excludeTestCode) {
-        SearchScope searchScope = GlobalSearchScope.EMPTY_SCOPE;
+        SearchScope searchScope = GlobalSearchScope.moduleRuntimeScope(module, !excludeTestCode);
 
         for (MicroProfilePropertiesScope scope : scopes) {
             switch (scope) {
                 case sources:
-                    searchScope = module != null ? searchScope.union(module.getModuleScope(!excludeTestCode)) : searchScope;
+                    searchScope = searchScope.union(module.getModuleScope(!excludeTestCode));
                     break;
                 case dependencies:
-                    searchScope = module != null ? searchScope.union(module.getModuleWithLibrariesScope()) : searchScope;
+                    searchScope = searchScope.union(module.getModuleWithLibrariesScope());
                     break;
                 /*added missing default case */
                 default:

diff --git a/.../java/com/redhat/devtools/intellij/lsp4mp4ij/psi/core/project/PsiMicroProfileProject.java b/.../java/com/redhat/devtools/intellij/lsp4mp4ij/psi/core/project/PsiMicroProfileProject.java
@@ -118,8 +118,7 @@ public Integer getPropertyAsInteger(String key, Integer defaultValue) {
 			return defaultValue;
 		}
 		try {
-			int intValue = Integer.parseInt(value);
-			return intValue;
+            return Integer.parseInt(value);
 		} catch (NumberFormatException nfe) {
 			return defaultValue;
 		}

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusModuleUtil.java b/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusModuleUtil.java
@@ -126,7 +126,7 @@ private static void addLibrary(ModifiableRootModel model, List<VirtualFile>[] fi
 
         LibraryOrderEntry entry = model.findLibraryOrderEntry(library);
         assert entry != null : library;
-        entry.setScope(DependencyScope.PROVIDED);
+        entry.setScope(DependencyScope.RUNTIME);
         entry.setExported(false);
         ApplicationManager.getApplication().invokeAndWait(() -> {
             WriteAction.run(libraryModel::commit);

diff --git a/.../java/com/redhat/devtools/intellij/quarkus/lang/QuarkusImplicitPropertyUsageProvider.java b/.../java/com/redhat/devtools/intellij/quarkus/lang/QuarkusImplicitPropertyUsageProvider.java
@@ -10,11 +10,11 @@
  ******************************************************************************/
 package com.redhat.devtools.intellij.quarkus.lang;
 
-import com.intellij.codeInspection.unused.ImplicitPropertyUsageProvider;
+import com.intellij.lang.properties.codeInspection.unused.ImplicitPropertyUsageProvider;
 import com.intellij.lang.properties.psi.Property;
 import com.redhat.devtools.intellij.quarkus.QuarkusModuleUtil;
 
-public class QuarkusImplicitPropertyUsageProvider extends ImplicitPropertyUsageProvider {
+public class QuarkusImplicitPropertyUsageProvider implements ImplicitPropertyUsageProvider {
     @Override
     public boolean isUsed(Property property) {
         return QuarkusModuleUtil.isQuarkusPropertiesFile(property.getContainingFile().getVirtualFile(), property.getProject());

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/maven/MavenToolDelegate.java b/src/main/java/com/redhat/devtools/intellij/quarkus/maven/MavenToolDelegate.java
@@ -162,17 +162,22 @@ private List<MavenArtifact> ensureDownloaded(Module module, MavenProject mavenPr
         long start = System.currentTimeMillis();
         try {
             MavenEmbedderWrapper serverWrapper = createEmbedderWrapper(module.getProject(), mavenProject.getDirectory());
+            if (serverWrapper == null) {
+                return Collections.emptyList();
+            }
             if (classifier != null) {
                 for(MavenId id : deploymentIds) {
                     result.add(serverWrapper.resolve(new MavenArtifactInfo(id, "jar", classifier), mavenProject.getRemoteRepositories()));
                 }
             } else {
                 List<MavenArtifactInfo> infos = deploymentIds.stream().map(id -> new MavenArtifactInfo(id, "jar", classifier)).collect(Collectors.toList());
-                result = serverWrapper.resolveTransitively(infos, mavenProject.getRemoteRepositories());
+                result = serverWrapper.resolveArtifactTransitively(infos, mavenProject.getRemoteRepositories()).mavenResolvedArtifacts;
             }
         } catch (MavenProcessCanceledException | RuntimeException e) {
             LOGGER.warn(e.getLocalizedMessage(), e);
         }
+        long elapsed = System.currentTimeMillis() - start;
+        System.out.println("ensureDownloaded took "+elapsed+ "ms");
         return result;
     }