Skip to content

fix: Show folders in the package nodes #643

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

Merged
jdneo merged 3 commits into from
Jun 22, 2022
Merged

fix: Show folders in the package nodes #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b83374
fix: Show folders in the package nodes
jdneo Jun 17, 2022
18cd58c
Add null check
jdneo Jun 17, 2022
a09c59f
Merge branch 'main' into cs/issue-635
CsCherrYY Jun 22, 2022
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
14 changes: 10 additions & 4 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 @@ -18,6 +18,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.BiFunction;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -403,20 +404,25 @@ private static List<PackageNode> getRootTypes(PackageParams query, IProgressMoni
}
// when .java files and other .properties files are mixed up
rootTypeNodes.addAll(
Arrays.stream(nonJavaResources).filter(resource -> resource instanceof IFile || resource instanceof JarEntryFile).map(resource -> {
Arrays.stream(nonJavaResources).map(resource -> {
if (resource instanceof IFile) {
IFile file = (IFile) resource;
PackageNode item = new PackageNode(file.getName(), file.getFullPath().toPortableString(), NodeKind.FILE);
item.setUri(JDTUtils.getFileURI(file));
return item;
} else {
} else if (resource instanceof IFolder) {
IFolder folder = (IFolder) resource;
PackageNode item = new PackageNode(folder.getName(), folder.getFullPath().toPortableString(), NodeKind.FOLDER);
item.setUri(JDTUtils.getFileURI(folder));
return item;
} else if (resource instanceof JarEntryFile) {
JarEntryFile file = (JarEntryFile) resource;
PackageNode entry = new PackageNode(file.getName(), file.getFullPath().toPortableString(), NodeKind.FILE);
entry.setUri(ExtUtils.toUri((JarEntryFile) resource));
return entry;
}

}).collect(Collectors.toList()));
return null;
}).filter(Objects::nonNull).collect(Collectors.toList()));
return rootTypeNodes;
}
} catch (CoreException e) {
Expand Down
3 changes: 3 additions & 0 deletions src/views/hierarchicalPackageNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { explorerLock } from "../utils/Lock";
import { DataNode } from "./dataNode";
import { ExplorerNode } from "./explorerNode";
import { FileNode } from "./fileNode";
import { FolderNode } from "./folderNode";
import { PackageNode } from "./packageNode";
import { PrimaryTypeNode } from "./PrimaryTypeNode";
import { ProjectNode } from "./projectNode";
Expand Down Expand Up @@ -75,6 +76,8 @@ export class HierarchicalPackageNode extends PackageNode {
if (nodeData.metaData && nodeData.metaData[PrimaryTypeNode.K_TYPE_KIND]) {
result.push(new PrimaryTypeNode(nodeData, this, this._rootNode));
}
} else if (nodeData.kind === NodeKind.Folder) {
result.push(new FolderNode(nodeData, this, this._project, this._rootNode));
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion src/views/packageNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ import { isTest } from "../utility";
import { DataNode } from "./dataNode";
import { ExplorerNode } from "./explorerNode";
import { FileNode } from "./fileNode";
import { FolderNode } from "./folderNode";
import { PrimaryTypeNode } from "./PrimaryTypeNode";
import { ProjectNode } from "./projectNode";

export class PackageNode extends DataNode {
constructor(nodeData: INodeData, parent: DataNode, protected _project: DataNode, protected _rootNode: DataNode) {
constructor(nodeData: INodeData, parent: DataNode, protected _project: ProjectNode, protected _rootNode: DataNode) {
super(nodeData, parent);
}

Expand All @@ -37,6 +39,8 @@ export class PackageNode extends DataNode {
if (nodeData.metaData && nodeData.metaData[PrimaryTypeNode.K_TYPE_KIND]) {
result.push(new PrimaryTypeNode(nodeData, this, this._rootNode));
}
} else if (nodeData.kind === NodeKind.Folder) {
result.push(new FolderNode(nodeData, this, this._project, this._rootNode));
}
});
}
Expand Down