Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate icons to codicon in dependency explorer #242

Merged
merged 10 commits into from
Mar 19, 2020
Merged

Migrate icons to codicon in dependency explorer #242

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
36c2e09
bugfix: Can only modify the referenced libraries in invisible project
jdneo Jan 17, 2020
dd17eb1
Merge branch 'master' of github.com:Microsoft/vscode-java-dependency
jdneo Jan 19, 2020
0562972
Merge branch 'master' of github.com:Microsoft/vscode-java-dependency
jdneo Jan 19, 2020
98f5cdf
Migrate icons to codicon in dependency explorer
jdneo Mar 13, 2020
aa58570
Fix lint error
jdneo Mar 13, 2020
ab57a65
Address comments
jdneo Mar 13, 2020
9b142b1
Merge branch 'master' of github.com:Microsoft/vscode-java-dependency
jdneo Mar 16, 2020
a72e365
Merge branch 'cs/codicon' of github.com:Microsoft/vscode-java-depende…
jdneo Mar 16, 2020
8be2d57
Remove unused class: services
jdneo Mar 16, 2020
b51c174
Merge branch 'master' into cs/codicon
jdneo Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bugfix: Can only modify the referenced libraries in invisible project
  • Loading branch information
@jdneo
jdneo committed Jan 17, 2020
commit 36c2e09f9311e38849d8e809eaf338175bd0ff44
7 changes: 4 additions & 3 deletions jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,11 @@ private static List<PackageNode> getContainers(PackageParams query, IProgressMon
.collect(Collectors.toList());
boolean isReferencedLibrariesExist = Arrays.stream(references)
.anyMatch(entry -> entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY || entry.getEntryKind() == IClasspathEntry.CPE_VARIABLE);
if (isReferencedLibrariesExist || !ProjectUtils.isVisibleProject(javaProject.getProject())) {
// Invisble project will always have the referenced libraries entry
if (!ProjectUtils.isVisibleProject(javaProject.getProject())) {
result.add(PackageNode.REFERENCED_LIBRARIES_CONTAINER);
} else if (isReferencedLibrariesExist) {
result.add(PackageNode.IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER);
}
return result;
} catch (CoreException e) {
Expand All @@ -258,8 +261,6 @@ private static List<PackageNode> getContainers(PackageParams query, IProgressMon
return Collections.emptyList();
}



private static List<PackageNode> getPackageFragmentRoots(PackageParams query, IProgressMonitor pm) {
ArrayList<PackageNode> children = new ArrayList<>();
IJavaProject javaProject = getJavaProject(query.getProjectUri());
Expand Down
3 changes: 3 additions & 0 deletions ....ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,14 @@
*/
public class PackageNode {
private static final String REFERENCED_LIBRARIES_CONTAINER_NAME = "Referenced Libraries";
private static final String IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER_NAME = "Referenced Libraries (Read-only)";

public static final String REFERENCED_LIBRARIES_PATH = "REFERENCED_LIBRARIES_PATH";
public static final String DEFAULT_PACKAGE_DISPLAYNAME = "(default package)";
public static final ContainerNode REFERENCED_LIBRARIES_CONTAINER = new ContainerNode(REFERENCED_LIBRARIES_CONTAINER_NAME, REFERENCED_LIBRARIES_PATH,
NodeKind.CONTAINER, IClasspathEntry.CPE_CONTAINER);
public static final ContainerNode IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER = new ContainerNode(IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER_NAME, REFERENCED_LIBRARIES_PATH,
NodeKind.CONTAINER, IClasspathEntry.CPE_CONTAINER);

/**
* The name of the PackageNode
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,17 @@
},
{
"command": "java.project.addLibraries",
"when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries/",
"when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries$/",
"group": "inline@0"
},
{
"command": "java.project.removeLibrary",
"when": "view == javaDependencyExplorer && viewItem =~ /java:jar\/referenced-libraries/",
"when": "view == javaDependencyExplorer && viewItem =~ /java:jar\/referenced-libraries\\+uri$/",
"group": "inline"
},
{
"command": "java.project.refreshLibraries",
"when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries/",
"when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries$/",
"group": "inline@1"
}
]
Expand Down