Skip to content

Directly show children under default package #316

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
merged 1 commit into from
Aug 31, 2020
Merged

Directly show children under default package #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 26 additions & 12 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 @@ -140,7 +140,9 @@ public static List<PackageNode> resolvePath(List<Object> arguments, IProgressMon
if (StringUtils.isNotBlank(pkgRootNode.getName())) {
result.add(pkgRootNode);
}
result.add(PackageNode.createNodeForPackageFragment(packageFragment));
if (!packageFragment.isDefaultPackage()) {
result.add(PackageNode.createNodeForPackageFragment(packageFragment));
}
result.add(PackageNode.createNodeForPrimaryType(typeRoot.findPrimaryType()));
} else if (ExtUtils.isJarResourceUri(uri)) {
IJarEntryResource resource = ExtUtils.getJarEntryResource(uri);
Expand All @@ -150,7 +152,9 @@ public static List<PackageNode> resolvePath(List<Object> arguments, IProgressMon
result.add(PackageNode.createNodeForPackageFragmentRoot(pkgRoot));
if (resource.getParent() instanceof IPackageFragment) {
IPackageFragment packageFragment = (IPackageFragment) resource.getParent();
result.add(PackageNode.createNodeForPackageFragment(packageFragment));
if (!packageFragment.isDefaultPackage()) {
result.add(PackageNode.createNodeForPackageFragment(packageFragment));
}
} else {
int currentSize = result.size();
// visit back from file to the top folder
Expand Down Expand Up @@ -186,7 +190,9 @@ public static List<PackageNode> resolvePath(List<Object> arguments, IProgressMon
if (StringUtils.isNotBlank(pkgRootNode.getName())) {
result.add(pkgRootNode);
}
result.add(PackageNode.createNodeForPackageFragment(packageFragment));
if (!packageFragment.isDefaultPackage()) {
result.add(PackageNode.createNodeForPackageFragment(packageFragment));
}

PackageNode item = new PackageNode(resource.getName(), resource.getFullPath().toPortableString(), NodeKind.FILE);
item.setUri(JDTUtils.getFileURI(resource));
Expand Down Expand Up @@ -338,7 +344,7 @@ private static List<PackageNode> getPackages(PackageParams query, IProgressMonit
new Status(IStatus.ERROR, JdtlsExtActivator.PLUGIN_ID, String.format("No package root found for %s", query.getPath())));
}
Object[] result = getPackageFragmentRootContent(packageRoot, pm);
return convertToPackageNode(result, packageRoot);
return convertToPackageNode(result, packageRoot, pm);
} catch (CoreException e) {
JdtlsExtActivator.logException("Problem load project package ", e);
}
Expand Down Expand Up @@ -410,7 +416,7 @@ private static List<PackageNode> getFolderChildren(PackageParams query, IProgres
JarEntryDirectory directory = (JarEntryDirectory) resource;
Object[] children = findJarDirectoryChildren(directory, query.getPath());
if (children != null) {
return convertToPackageNode(children, null);
return convertToPackageNode(children, null, pm);
}
}
}
Expand All @@ -421,7 +427,7 @@ private static List<PackageNode> getFolderChildren(PackageParams query, IProgres
Object[] children = JavaCore.create(folder) != null ? Arrays.stream(folder.members()).filter(t -> t instanceof IFile).toArray()
: folder.members();
if (children != null) {
return convertToPackageNode(children, null);
return convertToPackageNode(children, null, pm);
}
}
}
Expand Down Expand Up @@ -457,18 +463,26 @@ private static Object[] getPackageFragmentRootContent(IPackageFragmentRoot root,
return result.toArray();
}

private static List<PackageNode> convertToPackageNode(Object[] rootContent, IPackageFragmentRoot packageRoot) throws JavaModelException {
private static List<PackageNode> convertToPackageNode(Object[] rootContent, IPackageFragmentRoot packageRoot, IProgressMonitor pm) throws JavaModelException {
List<PackageNode> result = new ArrayList<>();
for (Object root : rootContent) {
if (root instanceof IPackageFragment) {
IPackageFragment fragment = (IPackageFragment) root;
PackageNode entry = PackageNode.createNodeForPackageFragment(fragment);
if (fragment.getResource() != null) {
entry.setUri(fragment.getResource().getLocationURI().toString());
if (fragment.isDefaultPackage()) {
// directly show root types under default package
PackageParams subQuery = new PackageParams(NodeKind.PACKAGE, packageRoot.getJavaProject().getProject().getLocationURI().toString(),
fragment.getPath().toPortableString(), fragment.getHandleIdentifier());
List<PackageNode> packageNodes = getRootTypes(subQuery, pm);
result.addAll(packageNodes);
} else {
entry.setUri(fragment.getPath().toFile().toURI().toString());
PackageNode entry = PackageNode.createNodeForPackageFragment(fragment);
if (fragment.getResource() != null) {
entry.setUri(fragment.getResource().getLocationURI().toString());
} else {
entry.setUri(fragment.getPath().toFile().toURI().toString());
}
result.add(entry);
}
result.add(entry);
} else if (root instanceof IClassFile) {
IClassFile classFile = (IClassFile) root;
PackageNode entry = new PackageNode(classFile.getElementName(), null, NodeKind.FILE);
Expand Down
4 changes: 1 addition & 3 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 @@ -69,7 +69,6 @@ public class PackageNode {
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,
Expand Down Expand Up @@ -177,8 +176,7 @@ public static PackageNode createNodeForResource(IResource resource) {
}

public static PackageNode createNodeForPackageFragment(IPackageFragment packageFragment) {
String packageName = packageFragment.isDefaultPackage() ? DEFAULT_PACKAGE_DISPLAYNAME : packageFragment.getElementName();
PackageNode fragmentNode = new PackageNode(packageName, packageFragment.getPath().toPortableString(), NodeKind.PACKAGE);
PackageNode fragmentNode = new PackageNode(packageFragment.getElementName(), packageFragment.getPath().toPortableString(), NodeKind.PACKAGE);
fragmentNode.setHandlerIdentifier(packageFragment.getHandleIdentifier());
return fragmentNode;
}
Expand Down
1 change: 0 additions & 1 deletion src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export namespace Context {
}

export namespace Explorer {
export const DEFAULT_PACKAGE_NAME: string = "(default package)";
export enum ContextValueType {
WorkspaceFolder = "workspaceFolder",
Project = "project",
Expand Down
3 changes: 1 addition & 2 deletions src/explorerCommands/new.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import * as fse from "fs-extra";
import * as path from "path";
import { Uri, window, workspace, WorkspaceEdit } from "vscode";
import { Explorer } from "../constants";
import { NodeKind } from "../java/nodeData";
import { isJavaIdentifier, isKeyword } from "../utility";
import { DataNode } from "../views/dataNode";
Expand Down Expand Up @@ -50,7 +49,7 @@ function getNewFilePath(basePath: string, className: string): string {
export async function newPackage(node: DataNode): Promise<void> {
let defaultValue: string;
let packageRootPath: string;
if (node.nodeData.kind === NodeKind.PackageRoot || node.name === Explorer.DEFAULT_PACKAGE_NAME) {
if (node.nodeData.kind === NodeKind.PackageRoot) {
defaultValue = "";
packageRootPath = Uri.parse(node.uri).fsPath;
} else if (node.nodeData.kind === NodeKind.Package) {
Expand Down
5 changes: 1 addition & 4 deletions src/views/nodeCache/explorerNodeCache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import * as path from "path";
import { Uri } from "vscode";
import { Explorer } from "../../constants";
import { DataNode } from "../dataNode";
import { ExplorerNode } from "../explorerNode";
import { Trie, TrieNode } from "./Trie";
Expand All @@ -28,9 +27,7 @@ class ExplorerNodeCache {
}

public saveNode(node: ExplorerNode): void {
// default package has the same uri as the root package,
// we skip default package and store the root package here.
if (node instanceof DataNode && node.uri && node.name !== Explorer.DEFAULT_PACKAGE_NAME) {
if (node instanceof DataNode && node.uri) {
this.mutableNodeCache.insert(node);
}
}
Expand Down