fix: Cannot show the content of a referenced jar (#376)

Signed-off-by: Sheng Chen <[email protected]>
microsoft · Nov 17, 2020 · ab59282 · ab59282
1 parent 7021f1c
commit ab59282
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
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
@@ -341,7 +341,7 @@ private static List<PackageNode> getPackageFragmentRoots(PackageParams query, IP
 
     private static List<PackageNode> getPackages(PackageParams query, IProgressMonitor pm) {
         try {
-            IPackageFragmentRoot packageRoot = (IPackageFragmentRoot) JavaCore.create(query.getHandlerIdentifier());
+            IPackageFragmentRoot packageRoot = getPackageFragmentRootFromQuery(query);
             if (packageRoot == null) {
                 throw new CoreException(
                         new Status(IStatus.ERROR, JdtlsExtActivator.PLUGIN_ID, String.format("No package root found for %s", query.getPath())));
@@ -354,6 +354,25 @@ private static List<PackageNode> getPackages(PackageParams query, IProgressMonit
         return Collections.emptyList();
     }
 
+    private static IPackageFragmentRoot getPackageFragmentRootFromQuery(PackageParams query) {
+        IPackageFragmentRoot packageRoot = (IPackageFragmentRoot) JavaCore.create(query.getHandlerIdentifier());
+        if (packageRoot != null) {
+            return packageRoot;
+        }
+
+        // jar in Referenced Libraries must be constructed from path
+        IJavaProject javaProject = getJavaProject(query.getProjectUri());
+        if (javaProject != null) {
+            try {
+                packageRoot = javaProject.findPackageFragmentRoot(Path.fromPortableString(query.getRootPath()));
+            } catch (JavaModelException e) {
+                return null;
+            }
+        }
+
+        return packageRoot;
+    }
+
     private static List<PackageNode> getRootTypes(PackageParams query, IProgressMonitor pm) {
         try {
             IPackageFragment packageFragment = (IPackageFragment) JavaCore.create(query.getHandlerIdentifier());

diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageParams.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageParams.java
@@ -27,6 +27,8 @@ public class PackageParams {
 
     private String handlerIdentifier;
 
+    private String rootPath;
+
     public PackageParams() {
     }
 
@@ -77,4 +79,12 @@ public void setHandlerIdentifier(String handlerIdentifier) {
         this.handlerIdentifier = handlerIdentifier;
     }
 
+    public String getRootPath() {
+        return rootPath;
+    }
+
+    public void setRootPath(String rootPath) {
+        this.rootPath = rootPath;
+    }
+
 }
diff --git a/src/views/packageRootNode.ts b/src/views/packageRootNode.ts
@@ -25,6 +25,7 @@ export class PackageRootNode extends DataNode {
         return Jdtls.getPackageData({
             kind: NodeKind.PackageRoot,
             projectUri: this._project.nodeData.uri,
+            rootPath: this.nodeData.path,
             handlerIdentifier: this.nodeData.handlerIdentifier,
         });
     }