Merge branch 'main' into wenyt/cache

Author: wenytang-ms

jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java

@@ -506,7 +506,7 @@ private static String getSeverityString(int severity) {
     /**
      * Get project dependencies information including JDK version.
      * 
-     * @param arguments List containing the project URI as the first element
+     * @param arguments List containing the file URI as the first element
      * @param monitor Progress monitor for cancellation support
      * @return List of DependencyInfo containing key-value pairs of project information
      */
@@ -515,8 +515,8 @@ public static List<DependencyInfo> getProjectDependencies(List<Object> arguments
             return new ArrayList<>();
         }
 
-        String projectUri = (String) arguments.get(0);
-        List<ProjectResolver.DependencyInfo> resolverResult = ProjectResolver.resolveProjectDependencies(projectUri, monitor);
+        String fileUri = (String) arguments.get(0);
+        List<ProjectResolver.DependencyInfo> resolverResult = ProjectResolver.resolveProjectDependencies(fileUri, monitor);
 
         // Convert ProjectResolver.DependencyInfo to ProjectCommand.DependencyInfo
         List<DependencyInfo> result = new ArrayList<>();

jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/parser/ProjectResolver.java

@@ -229,8 +229,9 @@ public DependencyInfo(String key, String value) {
 
     /**
      * Resolve project dependencies information including JDK version.
+     * Supports both single projects and multi-module aggregator projects.
      * 
-     * @param projectUri The project URI
+     * @param fileUri The file URI
      * @param monitor Progress monitor for cancellation support
      * @return List of DependencyInfo containing key-value pairs of project information
      */
@@ -241,11 +242,11 @@ public static List<DependencyInfo> resolveProjectDependencies(String projectUri,
         List<DependencyInfo> result = new ArrayList<>();
 
         try {
-            IPath projectPath = ResourceUtils.canonicalFilePathFromURI(projectUri);
+            IPath fileIPath = ResourceUtils.canonicalFilePathFromURI(fileUri);
 
             // Find the project
             IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-            IProject project = findProjectByPath(root, projectPath);
+            IProject project = findProjectByPath(root, fileIPath);
 
             if (project == null || !project.isAccessible()) {
                 return result;
@@ -291,14 +292,31 @@ public static List<DependencyInfo> resolveProjectDependencies(String projectUri,
 
     /**
      * Find project by path from all projects in workspace.
+     * The path can be either a project root path or a file/folder path within a project.
+     * This method will find the project that contains the given path.
+     * 
+     * @param root The workspace root
+     * @param filePath The path to search for (can be project root or file within project)
+     * @return The project that contains the path, or null if not found
      */
-    private static IProject findProjectByPath(IWorkspaceRoot root, IPath projectPath) {
+    private static IProject findProjectByPath(IWorkspaceRoot root, IPath filePath) {
         IProject[] allProjects = root.getProjects();
+        
+        // First pass: check for exact project location match (most efficient)
+        for (IProject p : allProjects) {
+            if (p.getLocation() != null && p.getLocation().equals(filePath)) {
+                return p;
+            }
+        }
+        
+        // Second pass: check if the file path is within any project directory
+        // This handles cases where filePath points to a file or folder inside a project
         for (IProject p : allProjects) {
-            if (p.getLocation() != null && p.getLocation().equals(projectPath)) {
+            if (p.getLocation() != null && p.getLocation().isPrefixOf(filePath)) {
                 return p;
             }
         }
+        
         return null;
     }
 
@@ -363,17 +381,19 @@ private static void processClasspathEntries(List<DependencyInfo> result, IJavaPr
 
     /**
      * Process a library classpath entry.
+     * Only returns the library file name without full path to reduce data size.
      */
     private static void processLibraryEntry(List<DependencyInfo> result, IClasspathEntry entry, int libCount) {
         IPath libPath = entry.getPath();
         if (libPath != null) {
-            result.add(new DependencyInfo("library_" + libCount, 
-                libPath.lastSegment() + " (" + libPath.toOSString() + ")"));
+            // Only keep the file name, remove the full path
+            result.add(new DependencyInfo("library_" + libCount, libPath.lastSegment()));
         }
     }
 
     /**
      * Process a project reference classpath entry.
+     * Simplified to only extract essential information.
      */
     private static void processProjectEntry(List<DependencyInfo> result, IClasspathEntry entry, int projectRefCount) {
         IPath projectRefPath = entry.getPath();
@@ -390,12 +410,21 @@ private static void processContainerEntry(List<DependencyInfo> result, IClasspat
         String containerPath = entry.getPath().toString();
 
         if (containerPath.contains("JRE_CONTAINER")) {
-            result.add(new DependencyInfo(KEY_JRE_CONTAINER_PATH, containerPath));
+            // Only extract the JRE version, not the full container path
             try {
                 String vmInstallName = JavaRuntime.getVMInstallName(entry.getPath());
                 addIfNotNull(result, KEY_JRE_CONTAINER, vmInstallName);
             } catch (Exception e) {
-                // Ignore if unable to get VM install name
+                // Fallback: try to extract version from path
+                if (containerPath.contains("JavaSE-")) {
+                    int startIdx = containerPath.lastIndexOf("JavaSE-");
+                    String version = containerPath.substring(startIdx);
+                    // Clean up any trailing characters
+                    if (version.contains("/")) {
+                        version = version.substring(0, version.indexOf("/"));
+                    }
+                    result.add(new DependencyInfo(KEY_JRE_CONTAINER, version));
+                }
             }
         } else if (containerPath.contains("MAVEN")) {
             result.add(new DependencyInfo(KEY_BUILD_TOOL, "Maven"));