Tries to fix ui-test

fvclaus · Sep 28, 2023 · ead44c0 · ead44c0
1 parent 1938151
commit ead44c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageCommand.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageCommand.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.core.internal.utils.FileUtil;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -578,17 +579,20 @@ private static Object[] findJarDirectoryChildren(JarEntryDirectory directory, St
 
     public static IProject getProject(String projectUri) {
         IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IContainer[] containers = root.findContainersForLocationURI(JDTUtils.toURI(projectUri));
-
-        if (containers.length == 0) {
-            return null;
-        }
+        URI uri = JDTUtils.toURI(projectUri);
+        IContainer[] containers = root.findContainersForLocationURI(uri);
 
         Optional<IContainer> maybeProject = Arrays.stream(containers).filter(container -> container instanceof IProject).findFirst();
         if (maybeProject.isPresent()) {
         	return (IProject) maybeProject.get();
+        } else {
+            String invisibleProjectName = ProjectUtils.getWorkspaceInvisibleProjectName(FileUtil.toPath(uri).removeTrailingSeparator());
+            IProject invisibleProject = root.getProject(invisibleProjectName);
+            if (!invisibleProject.exists()) {
+                throw new IllegalArgumentException(projectUri + " is neither a Java nor an invisible project.");
+            }
+            return invisibleProject;
         }
-        return null;
     }
 
     public static IJavaProject getJavaProject(String projectUri) {

diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java
@@ -240,11 +240,9 @@ public static List<MainClassInfo> getMainClasses(List<Object> arguments, IProgre
         }
         for (PackageNode project : projectList) {
             IJavaProject javaProject = PackageCommand.getJavaProject(project.getUri());
-            if (javaProject != null) {
-            	for (IPackageFragmentRoot packageFragmentRoot : javaProject.getAllPackageFragmentRoots()) {
-                    if (!packageFragmentRoot.isArchive()) {
-                        searchRoots.add(packageFragmentRoot);
-                    }
+            for (IPackageFragmentRoot packageFragmentRoot : javaProject.getAllPackageFragmentRoots()) {
+                if (!packageFragmentRoot.isArchive()) {
+                    searchRoots.add(packageFragmentRoot);
                 }
             }
         }