Skip to content

Fix the sync issue with non-java files, resolvePath for non-java file… #105

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

Closed
andxu wants to merge 1 commit into from
Closed

Fix the sync issue with non-java files, resolvePath for non-java file… #105

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
85 changes: 79 additions & 6 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 @@ -25,6 +25,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
Expand Down Expand Up @@ -125,12 +126,7 @@ public static List<PackageNode> resolvePath(List<Object> arguments, IProgressMon
List<PackageNode> result = new ArrayList<>();

URI uri = JDTUtils.toURI(typeRootUri);
ITypeRoot typeRoot = null;
if ("jdt".equals(uri.getScheme())) {
typeRoot = JDTUtils.resolveClassFile(uri);
} else {
typeRoot = JDTUtils.resolveCompilationUnit(uri);
}
ITypeRoot typeRoot = "jdt".equals(uri.getScheme()) ? JDTUtils.resolveClassFile(uri) : JDTUtils.resolveCompilationUnit(uri);
if (typeRoot != null) {
// Add project node:
IProject proj = typeRoot.getJavaProject().getProject();
Expand Down Expand Up @@ -164,11 +160,88 @@ public static List<PackageNode> resolvePath(List<Object> arguments, IProgressMon
PackageNode item = new TypeRootNode(typeRoot.getElementName(), typeRoot.getPath().toPortableString(), NodeKind.TYPEROOT, TypeRootNode.K_SOURCE);
item.setUri(JDTUtils.toUri(typeRoot));
result.add(item);
} else {
// this is not a .java/.class file
IResource resource = JDTUtils.findResource(uri, ResourcesPlugin.getWorkspace().getRoot()::findFilesForLocationURI);
if (resource != null) {
IResource parent = resource.getParent();
IJavaElement parentJavaElement = JavaCore.create(parent);
if (parent instanceof IFolder && parentJavaElement instanceof IPackageFragment) {
IPackageFragment packageFragment = (IPackageFragment) parentJavaElement;
String packageName = packageFragment.isDefaultPackage() ? DEFAULT_PACKAGE_DISPLAYNAME : packageFragment.getElementName();
PackageNode packageNode = new PackageNode(packageName, packageFragment.getPath().toPortableString(), NodeKind.PACKAGE);
IPackageFragmentRoot pkgRoot = (IPackageFragmentRoot) packageFragment.getParent();
PackageNode rootNode = null;
if (typeRoot instanceof IClassFile) {
Copy link
Contributor

@yaohaizh yaohaizh Nov 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typeRoot is already null...

rootNode = new PackageRootNode(pkgRoot.getElementName(), pkgRoot.getPath().toPortableString(), NodeKind.PACKAGEROOT, pkgRoot.getKind());
} else {
rootNode = new PackageRootNode(
ExtUtils.removeProjectSegment(packageFragment.getJavaProject().getElementName(), pkgRoot.getPath()).toPortableString(),
pkgRoot.getPath().toPortableString(), NodeKind.PACKAGEROOT, pkgRoot.getKind());
}

IProject proj = parentJavaElement.getJavaProject().getProject();
Copy link
Contributor

@yaohaizh yaohaizh Nov 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part should be duplicate code

PackageNode projectNode = new PackageNode(proj.getName(), proj.getFullPath().toPortableString(), NodeKind.PROJECT);
projectNode.setUri(proj.getLocationURI().toString());
result.add(projectNode);
result.add(rootNode);
result.add(packageNode);

PackageNode item = new PackageNode(resource.getName(), resource.getFullPath().toPortableString(), NodeKind.FILE);
item.setUri(JDTUtils.getFileURI(resource));
result.add(item);
} else {
return getParentListToProject(resource);
}
}
}

return result;
}


Copy link
Contributor

@yaohaizh yaohaizh Nov 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Misleading method name. Should be ancestor list

private static List<PackageNode> getParentListToProject(IResource element) throws JavaModelException {
List<PackageNode> nodeList = new ArrayList<>();
while (element != null) {
Copy link
Contributor

@yaohaizh yaohaizh Nov 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part have lots of duplicate code with other parts in this file

IJavaElement javaElement = JavaCore.create(element);
if (javaElement instanceof IPackageFragmentRoot) {
IPackageFragmentRoot pkgRoot = (IPackageFragmentRoot) javaElement;
IProject proj = element.getProject();

nodeList.add(0, new PackageRootNode(element.getProjectRelativePath().toPortableString(), pkgRoot.getPath().toPortableString(),
NodeKind.PACKAGEROOT, pkgRoot.getKind()));

PackageNode projectNode = new PackageNode(proj.getName(), proj.getFullPath().toPortableString(), NodeKind.PROJECT);
projectNode.setUri(proj.getLocationURI().toString());
nodeList.add(0, projectNode);
return nodeList;
} else if (javaElement instanceof IPackageFragment) {
IPackageFragment packageFragment = (IPackageFragment) javaElement;
if (packageFragment.containsJavaResources() || packageFragment.getNonJavaResources().length > 0) {
String packageName = packageFragment.isDefaultPackage() ? DEFAULT_PACKAGE_DISPLAYNAME : packageFragment.getElementName();
PackageNode entry = new PackageNode(packageName, packageFragment.getPath().toPortableString(), NodeKind.PACKAGE);
nodeList.add(0, entry);
}

} else if (javaElement == null) {
if (element instanceof IFile) {
IFile file = (IFile) element;
PackageNode entry = new PackageNode(file.getName(), file.getFullPath().toPortableString(), NodeKind.FILE);
entry.setUri(JDTUtils.getFileURI(file));
nodeList.add(0, entry);
} else if (element instanceof IFolder) {
IFolder folder = (IFolder) element;
PackageNode entry = new PackageNode(folder.getName(), folder.getFullPath().toPortableString(), NodeKind.FOLDER);
entry.setUri(JDTUtils.getFileURI(folder));
nodeList.add(0, entry);
}
}
element = element.getParent();
}

return nodeList;
}

/**
* Get the class path container list.
*/
Expand Down