fix: Add libraries dialog not working on Linux (#434)

Co-authored-by: Sheng Chen <[email protected]>

Author: 0dinD

package.json

@@ -46,6 +46,12 @@
         "category": "Java",
         "icon": "$(add)"
       },
+      {
+        "command": "java.project.addLibraryFolders",
+        "title": "%contributes.commands.java.project.addLibraryFolders%",
+        "category": "Java",
+        "icon": "$(new-folder)"
+      },
       {
         "command": "java.project.removeLibrary",
         "title": "%contributes.commands.java.project.removeLibrary%",
@@ -286,6 +292,10 @@
           "command": "java.project.addLibraries",
           "when": "false"
         },
+        {
+          "command": "java.project.addLibraryFolders",
+          "when": "false"
+        },
         {
           "command": "java.project.removeLibrary",
           "when": "false"
@@ -466,6 +476,7 @@
         },
         {
           "command": "java.project.addLibraries",
+          "alt": "java.project.addLibraryFolders",
           "when": "view == javaProjectExplorer && viewItem =~ /java:container(?=.*?\\b\\+referencedLibrary\\b)/",
           "group": "inline@0"
         },

package.nls.json

@@ -1,8 +1,9 @@
 {
   "description": "Manage Java projects in Visual Studio Code",
   "contributes.commands.java.project.create": "Create Java Project...",
-  "contributes.commands.java.project.addLibraries": "Add a jar file or a folder to project classpath",
-  "contributes.commands.java.project.removeLibrary": "Remove jar file from project classpath",
+  "contributes.commands.java.project.addLibraries": "Add Jar Libraries to Project Classpath...",
+  "contributes.commands.java.project.addLibraryFolders": "Add Library Folders to Project Classpath...",
+  "contributes.commands.java.project.removeLibrary": "Remove from Project Classpath",
   "contributes.commands.java.view.package.refresh": "Refresh",
   "contributes.commands.java.project.build.workspace": "Build Workspace",
   "contributes.commands.java.project.clean.workspace": "Clean Workspace",

package.nls.zh.json

@@ -1,8 +1,9 @@
 {
   "description": "在 Visual Studio Code 中管理 Java 项目",
   "contributes.commands.java.project.create": "创建 Java 项目...",
-  "contributes.commands.java.project.addLibraries": "将一个 Jar 文件或一个目录添加到 Java 项目类路径中",
-  "contributes.commands.java.project.removeLibrary": "将该 Jar 文件从 Java 项目类路径中移除",
+  "contributes.commands.java.project.addLibraries": "添加 Jar 文件至项目 Classpath...",
+  "contributes.commands.java.project.addLibraryFolders": "添加文件夹至项目 Classpath...",
+  "contributes.commands.java.project.removeLibrary": "从项目 Classpath 中移除",
   "contributes.commands.java.view.package.refresh": "刷新",
   "contributes.commands.java.project.build.workspace": "构建工作空间",
   "contributes.commands.java.project.clean.workspace": "清理工作空间",

src/commands.ts

@@ -46,6 +46,8 @@ export namespace Commands {
 
     export const JAVA_PROJECT_ADD_LIBRARIES = "java.project.addLibraries";
 
+    export const JAVA_PROJECT_ADD_LIBRARY_FOLDERS = "java.project.addLibraryFolders";
+
     export const JAVA_PROJECT_REMOVE_LIBRARY = "java.project.removeLibrary";
 
     export const JAVA_PROJECT_REFRESH_LIBRARIES = "java.project.refreshLibraries";

src/controllers/libraryController.ts

@@ -4,6 +4,7 @@
 import * as fse from "fs-extra";
 import * as _ from "lodash";
 import * as minimatch from "minimatch";
+import { platform } from "os";
 import * as path from "path";
 import { Disposable, ExtensionContext, Uri, window, workspace, WorkspaceFolder } from "vscode";
 import { instrumentOperationAsVsCodeCommand } from "vscode-extension-telemetry-wrapper";
@@ -20,6 +21,7 @@ export class LibraryController implements Disposable {
     public constructor(public readonly context: ExtensionContext) {
         this.disposable = Disposable.from(
             instrumentOperationAsVsCodeCommand(Commands.JAVA_PROJECT_ADD_LIBRARIES, () => this.addLibraries()),
+            instrumentOperationAsVsCodeCommand(Commands.JAVA_PROJECT_ADD_LIBRARY_FOLDERS, () => this.addLibraries(true)),
             instrumentOperationAsVsCodeCommand(Commands.JAVA_PROJECT_REMOVE_LIBRARY, (node: DataNode) =>
                 node.uri && this.removeLibrary(Uri.parse(node.uri).fsPath)),
             instrumentOperationAsVsCodeCommand(Commands.JAVA_PROJECT_REFRESH_LIBRARIES, () =>
@@ -31,36 +33,36 @@ export class LibraryController implements Disposable {
         this.disposable.dispose();
     }
 
-    public async addLibraries(libraryGlobs?: string[]) {
-        if (!libraryGlobs) {
-            libraryGlobs = [];
-            const workspaceFolder: WorkspaceFolder | undefined = Utility.getDefaultWorkspaceFolder();
-            const isWindows = process.platform.indexOf("win") === 0;
-            const results: Uri[] | undefined = await window.showOpenDialog({
-                defaultUri: workspaceFolder && workspaceFolder.uri,
-                canSelectFiles: true,
-                canSelectFolders: isWindows ? false : true,
-                canSelectMany: true,
-                openLabel: isWindows ? "Select jar files" : "Select jar files or directories",
-                filters: { Library: ["jar"] },
-            });
-            if (!results) {
-                return;
-            }
-            libraryGlobs = await Promise.all(results.map(async (uri: Uri) => {
-                // keep the param: `includeWorkspaceFolder` to false here
-                // since the multi-root is not supported well for invisible projects
-                const uriPath = workspace.asRelativePath(uri, false);
-                return (await fse.stat(uri.fsPath)).isDirectory() ? `${uriPath}/**/*.jar` : uriPath;
-            }));
-        }
-
+    public async addLibraryGlobs(libraryGlobs: string[]) {
         const setting = Settings.referencedLibraries();
         setting.exclude = this.dedupAlreadyCoveredPattern(libraryGlobs, ...setting.exclude);
         setting.include = this.updatePatternArray(setting.include, ...libraryGlobs);
         Settings.updateReferencedLibraries(setting);
     }
 
+    public async addLibraries(canSelectFolders?: boolean) {
+        const workspaceFolder: WorkspaceFolder | undefined = Utility.getDefaultWorkspaceFolder();
+        const isMac = platform() === "darwin";
+        const results: Uri[] | undefined = await window.showOpenDialog({
+            defaultUri: workspaceFolder && workspaceFolder.uri,
+            canSelectFiles: !canSelectFolders,
+            canSelectFolders: canSelectFolders || isMac,
+            canSelectMany: true,
+            openLabel: canSelectFolders ? "Select Library Folders" : "Select Jar Libraries",
+            filters: canSelectFolders ? { Folders: ["*"] } : { "Jar Files": ["jar"] },
+        });
+        if (!results) {
+            return;
+        }
+        this.addLibraryGlobs(await Promise.all(results.map(async (uri: Uri) => {
+            // keep the param: `includeWorkspaceFolder` to false here
+            // since the multi-root is not supported well for invisible projects
+            const uriPath = workspace.asRelativePath(uri, false);
+            const isLibraryFolder = canSelectFolders || isMac && (await fse.stat(uri.fsPath)).isDirectory();
+            return isLibraryFolder ? uriPath + "/**/*.jar" : uriPath;
+        })));
+    }
+
     public async removeLibrary(removalFsPath: string) {
         const setting = Settings.referencedLibraries();
         const removedPaths = _.remove(setting.include, (include) => {