fix: Cannot new classes/packages for unmanaged folders (#415)

Author: jdneo

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

@@ -582,9 +582,6 @@ public static IJavaProject getJavaProject(String projectUri) {
         }
 
         for (IContainer container : containers) {
-            if (!(container instanceof IProject)) {
-                continue;
-            }
             IProject project = container.getProject();
             if (!project.exists()) {
                 return null;

jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java

@@ -151,7 +151,7 @@ public void setMetaDataValue(String key, Object value) {
     public static PackageNode createNodeForProject(IJavaElement javaElement) {
         IProject proj = javaElement.getJavaProject().getProject();
         PackageNode projectNode = new PackageNode(proj.getName(), proj.getFullPath().toPortableString(), NodeKind.PROJECT);
-        projectNode.setUri(proj.getLocationURI().toString());
+        projectNode.setUri(ProjectUtils.getProjectRealFolder(proj).toFile().toURI().toString());
         try {
             projectNode.setMetaDataValue(NATURE_ID, proj.getDescription().getNatureIds());
         } catch (CoreException e) {

src/explorerCommands/new.ts

@@ -54,7 +54,10 @@ async function getPackageFsPath(node: DataNode): Promise<string> {
             const packageNode: DataNode | undefined = childrenNodes.find((child) => {
                 return child.nodeData.kind === NodeKind.Package;
             });
-            if (packageNode?.uri) {
+            if (!packageNode && node.uri) {
+                // This means the .java files are in the default package.
+                return Uri.parse(node.uri).fsPath;
+            } else if (packageNode?.uri) {
                 return getPackageRootPath(Uri.parse(packageNode.uri).fsPath, packageNode.name);
             }
             return "";

test/shared.ts

@@ -30,12 +30,12 @@ export function fsPath(node: DataNode): string {
     if (!node.uri) {
         return "";
     }
-    return Uri.parse(node.uri).fsPath;
+    return path.resolve(Uri.parse(node.uri).fsPath);
 }
 
 export function truePath(...paths: string[]) {
     const basePath = path.join(__dirname, "..", "..", "test");
-    return path.join(basePath, ...paths);
+    return path.resolve(path.join(basePath, ...paths));
 }
 
 export async function setupTestEnv() {