fix: Display compilation units which does not have a primary type (#752)

jdneo · CsCherrYY · web-flow · commit 100b67772eb9 · 2023-04-14T14:24:26.000+08:00
Co-authored-by: Shi Chen &lt;chenshi@microsoft.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 - Apply `files.exclude` to Java Projects explorer. [#214](https://github.com/microsoft/vscode-java-dependency/issues/214)
 - Empty packages will not appear sometimes. [#600](https://github.com/microsoft/vscode-java-dependency/issues/600)
-- Show `module-info.java` at source roots. [698](https://github.com/microsoft/vscode-java-dependency/issues/698)
+- Show `module-info.java` at source roots. [#698](https://github.com/microsoft/vscode-java-dependency/issues/698)
+- Show Java files which does not have a primary type in the Java Projects explorer. [#748](https://github.com/microsoft/vscode-java-dependency/issues/748)
 
 ## 0.21.2
 ### Fixed
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
@@ -43,7 +43,6 @@
 import org.eclipse.jdt.core.IJarEntryResource;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IModuleDescription;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.IType;
@@ -230,12 +229,7 @@ private static List<PackageNode> getParentAncestorNodes(IResource element) throw
         List<PackageNode> nodeList = new LinkedList<>();
         while (element != null && !(element instanceof IWorkspaceRoot)) {
             IJavaElement javaElement = JavaCore.create(element);
-            if (javaElement == null) {
-                PackageNode entry = PackageNode.createNodeForResource(element);
-                if (entry != null) {
-                    nodeList.add(0, entry);
-                }
-            } else if (javaElement instanceof IJavaProject) {
+            if (javaElement instanceof IJavaProject) {
                 nodeList.add(0, PackageNode.createNodeForProject(javaElement));
             } else if (javaElement instanceof IPackageFragmentRoot) {
                 IPackageFragmentRoot pkgRoot = (IPackageFragmentRoot) javaElement;
@@ -248,6 +242,11 @@ private static List<PackageNode> getParentAncestorNodes(IResource element) throw
                 if (packageFragment.containsJavaResources() || packageFragment.getNonJavaResources().length > 0) {
                     nodeList.add(0, PackageNode.createNodeForPackageFragment(packageFragment));
                 }
+            } else if (javaElement == null) {
+                PackageNode entry = PackageNode.createNodeForResource(element);
+                if (entry != null) {
+                    nodeList.add(0, entry);
+                }
             }
             element = element.getParent();
         }
@@ -431,6 +430,8 @@ public static List<Object> getChildrenForPackage(IPackageFragment packageFragmen
                     IType primaryType = ((ITypeRoot) element).findPrimaryType();
                     if (primaryType != null) {
                         children.add(primaryType);
+                    } else {
+                        children.add(element);
                     }
                 }
             }
@@ -538,14 +539,6 @@ public static List<Object> getPackageFragmentRootContent(IPackageFragmentRoot ro
         Object[] nonJavaResources = root.getNonJavaResources();
         Collections.addAll(result, nonJavaResources);
 
-        IModuleDescription moduleDescription = root.getModuleDescription();
-        if (moduleDescription != null) {
-            if (moduleDescription.getClassFile() != null) {
-                result.add(moduleDescription.getClassFile());
-            } else if (moduleDescription.getCompilationUnit() != null) {
-                result.add(moduleDescription.getCompilationUnit());
-            }
-        }
         return result;
     }
 
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/NodeKind.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/NodeKind.java
@@ -22,11 +22,15 @@ public enum NodeKind {
 
     PRIMARYTYPE(5),
 
-    CONTAINER(6),
+    COMPILATIONUNIT(6),
 
-    FOLDER(7),
+    CLASSFILE(7),
 
-    FILE(8);
+    CONTAINER(8),
+
+    FOLDER(9),
+
+    FILE(10);
 
     private final int value;
 
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java
@@ -363,6 +363,10 @@ public String getPath() {
         return path;
     }
 
+    public void setPath(String path) {
+        this.path = path;
+    }
+
     public NodeKind getKind() {
         return kind;
     }
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/parser/JavaResourceVisitor.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/parser/JavaResourceVisitor.java
@@ -16,6 +16,7 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.jdt.core.IClassFile;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.ICompilationUnit;
@@ -54,15 +55,23 @@ public void visit(IType type) {
 
     @Override
     public void visit(IClassFile classFile) {
-        PackageNode node = new PackageNode(classFile.getElementName(), null, NodeKind.FILE);
+        PackageNode node = new PackageNode(classFile.getElementName(), null, NodeKind.CLASSFILE);
         node.setUri(JDTUtils.toUri(classFile));
+        IResource resource = classFile.getResource();
+        if (resource != null) {
+            node.setPath(resource.getFullPath().toPortableString());
+        }
         this.nodes.add(node);
     }
 
     @Override
     public void visit(ICompilationUnit compilationUnit) {
-        PackageNode node = new PackageNode(compilationUnit.getElementName(), null, NodeKind.FILE);
+        PackageNode node = new PackageNode(compilationUnit.getElementName(), null, NodeKind.COMPILATIONUNIT);
         node.setUri(JDTUtils.toUri(compilationUnit));
+        IResource resource = compilationUnit.getResource();
+        if (resource != null) {
+            node.setPath(resource.getFullPath().toPortableString());
+        }
         this.nodes.add(node);
     }
 
diff --git a/src/java/nodeData.ts b/src/java/nodeData.ts
@@ -7,9 +7,11 @@ export enum NodeKind {
     PackageRoot = 3,
     Package = 4,
     PrimaryType = 5,
-    Container = 6,
-    Folder = 7,
-    File = 8,
+    CompilationUnit = 6,
+    ClassFile = 7,
+    Container = 8,
+    Folder = 9,
+    File = 10,
 }
 
 export enum TypeKind {
diff --git a/src/views/dataNode.ts b/src/views/dataNode.ts
@@ -30,6 +30,8 @@ export abstract class DataNode extends ExplorerNode {
                 case NodeKind.PackageRoot:
                 case NodeKind.Package:
                 case NodeKind.PrimaryType:
+                case NodeKind.CompilationUnit:
+                case NodeKind.ClassFile:
                 case NodeKind.Folder:
                 case NodeKind.File:
                     item.resourceUri = Uri.parse(this.uri);
diff --git a/src/views/nodeFactory.ts b/src/views/nodeFactory.ts
@@ -73,6 +73,8 @@ export class NodeFactory {
                     }
 
                     return new FolderNode(nodeData, parent, project, rootNode);
+                case NodeKind.CompilationUnit:
+                case NodeKind.ClassFile:
                 case NodeKind.File:
                     if (!parent) {
                         throw new Error("Folder node must have parent.");
diff --git a/test/maven-suite/projectView.test.ts b/test/maven-suite/projectView.test.ts
@@ -50,13 +50,14 @@ suite("Maven Project View Tests", () => {
 
         // validate innermost layer nodes
         const classes = await firstSecondarySubPackage.getChildren();
-        assert.equal(classes.length, 3, "Number of main classes of first package should be 3");
+        assert.equal(classes.length, 4, "Number of main classes of first package should be 4");
         const firstClass = classes[0] as PrimaryTypeNode;
         const secondClass = classes[1] as PrimaryTypeNode;
         const thirdClass = classes[2] as PrimaryTypeNode;
         assert.equal(firstClass.name, "App", "Name of first class should be \"App\"");
         assert.equal(secondClass.name, "AppToDelete", "Name of second class should be \"AppToDelete\"");
         assert.equal(thirdClass.name, "AppToRename", "Name of third class should be \"AppToRename\"");
+        assert.equal((classes[3] as DataNode).name, "package-info.java");
     });
 
     test("Can node render correctly in flat view", async function() {
@@ -110,7 +111,7 @@ suite("Maven Project View Tests", () => {
         // validate innermost layer nodes
         const mainClasses = await firstMainSubPackage.getChildren();
         const testClasses = await testSubPackage.getChildren();
-        assert.equal(mainClasses.length, 3, "Number of main classes of first package should be 3");
+        assert.equal(mainClasses.length, 4, "Number of main classes of first package should be 4");
         assert.equal(testClasses.length, 1, "Number of test classes should be 1");
         const firstMainClass = mainClasses[0] as PrimaryTypeNode;
         const secondMainClass = mainClasses[1] as PrimaryTypeNode;
@@ -119,6 +120,7 @@ suite("Maven Project View Tests", () => {
         assert.equal(firstMainClass.name, "App", "Name of first class should be \"App\"");
         assert.equal(secondMainClass.name, "AppToDelete", "Name of second class should be \"AppToDelete\"");
         assert.equal(thirdMainClass.name, "AppToRename", "Name of third class should be \"AppToRename\"");
+        assert.equal((mainClasses[3] as DataNode).name, "package-info.java");
         assert.equal(testClass.name, "AppTest", "Name of test class should be \"AppTest\"");
     });
 
@@ -205,11 +207,11 @@ suite("Maven Project View Tests", () => {
             projectUri: workspaceFolders![0].uri.toString(),
             path: mainPackage.nodeData.name,
             handlerIdentifier: mainPackage.nodeData.handlerIdentifier,
-        });
-        assert.equal(packages?.length, 3, "packages' length should be 3");
-        assert.equal(packages![0].name, "com.mycompany.app");
-        assert.equal(packages![1].name, "com.mycompany.app1");
-        assert.equal(packages![2].name, "module-info.java");
+        }) || [];
+        assert.equal(packages.length, 3, "packages' length should be 3");
+        assert.ok(packages.filter((p) => {
+            return !["com.mycompany.app", "com.mycompany.app1", "module-info.java"].includes(p.name);
+        }).length === 0);
     });
 
     test("Can execute command java.resolvePath correctly", async function() {
diff --git a/test/maven/src/main/java/com/mycompany/app/package-info.java b/test/maven/src/main/java/com/mycompany/app/package-info.java
@@ -0,0 +1 @@
+package com.mycompany.app;

Original file line number	Diff line number	Diff line change
`@@ -363,6 +363,10 @@ public String getPath() {`
`363`	`363`	`return path;`
`364`	`364`	`}`
`365`	`365`
	`366`	`+ public void setPath(String path) {`
	`367`	`+ this.path = path;`
	`368`	`+ }`
	`369`	`+`
`366`	`370`	`public NodeKind getKind() {`
`367`	`371`	`return kind;`
`368`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ export class NodeFactory {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`return new FolderNode(nodeData, parent, project, rootNode);`
	`76`	`+ case NodeKind.CompilationUnit:`
	`77`	`+ case NodeKind.ClassFile:`
`76`	`78`	`case NodeKind.File:`
`77`	`79`	`if (!parent) {`
`78`	`80`	`throw new Error("Folder node must have parent.");`