Fix add libraries dialog not working on Linux #434
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT license. | ||
|
|
||
| import * as _ from "lodash"; | ||
| import * as minimatch from "minimatch"; | ||
| import * as path from "path"; | ||
|
|
@@ -20,6 +19,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 +31,34 @@ export class LibraryController implements Disposable { | |
| this.disposable.dispose(); | ||
| } | ||
|
|
||
| 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(folders?: boolean) { | ||
| const workspaceFolder: WorkspaceFolder | undefined = Utility.getDefaultWorkspaceFolder(); | ||
| const results: Uri[] | undefined = await window.showOpenDialog({ | ||
| defaultUri: workspaceFolder && workspaceFolder.uri, | ||
| canSelectFiles: !folders, | ||
| canSelectFolders: folders, | ||
|
There was a problem hiding this comment. One possible regression here is: for the Mac users, they actually lose the capability to select both files and folders in one dialog. So maybe still also check if it is in MacOS? There was a problem hiding this comment. I actually think it's better for the sake of simplicity to keep folder selection specific to the more advanced alt command. Since I don't think we can change the command title based on OS (without creating a third command that only displays on macOS), there is no consistent way to communicate with the user that both Jar files and folders can be selected when running macOS. However, I do agree that removing the capability is a regression (which might bother some users), so I added back folder selection to the |
||
| canSelectMany: true, | ||
| openLabel: folders ? "Select Library Folders" : "Select Jar Libraries", | ||
| filters: folders ? { 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); | ||
| return folders ? uriPath + "/**/*.jar" : uriPath; | ||
| }))); | ||
| } | ||
|
|
||
| public async removeLibrary(removalFsPath: string) { | ||
| const setting = Settings.referencedLibraries(); | ||
| const removedPaths = _.remove(setting.include, (include) => { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change the param name to
canSelectFoldersto just align with the API?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense, fixed in a735dc5.