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

✨ Adding ability for the handled paths to be abosolute paths #112

Merged
merged 1 commit into from
Nov 22, 2024
Merged

✨ Adding ability for the handled paths to be abosolute paths #112

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
74 changes: 55 additions & 19 deletions ...dle.core/src/main/java/io/konveyor/tackle/core/internal/SampleDelegateCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
Expand All @@ -20,6 +21,7 @@
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.internal.core.search.JavaSearchParticipant;
import org.eclipse.jdt.ls.core.internal.IDelegateCommandHandler;
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
import org.eclipse.jdt.ls.core.internal.JobHelpers;
import org.eclipse.jdt.ls.core.internal.ProjectUtils;
import org.eclipse.jdt.ls.core.internal.ResourceUtils;
Expand Down Expand Up @@ -212,32 +214,66 @@ private static List<SymbolInformation> search(String projectName, ArrayList<Stri
}

IJavaSearchScope scope;
var workspaceDirectoryLocation = JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getRootPaths();
if (workspaceDirectoryLocation == null || workspaceDirectoryLocation.size() == 0) {
logInfo("unable to find workspace directory location");
return new ArrayList<>();
}

if (includedPaths != null && includedPaths.size() > 0) {
ArrayList<IJavaElement> includedFragments = new ArrayList<IJavaElement>();
for (IJavaProject proj : targetProjects) {
for (IPackageFragment fragment : proj.getPackageFragments()) {
IPath fragmentPath = fragment.getPath();
// if there's no file extension, it's a path to java package from source
// else it is a path pointing to jar, ear, etc. we ignore deps for now
if (fragmentPath.getFileExtension() == null) {
for (String includedPath : includedPaths) {
IPath includedIPath = Path.fromOSString(includedPath);
if (includedIPath.isAbsolute()) {
includedIPath = includedIPath.makeRelativeTo(workspaceDirectoryLocation.iterator().next());
// we need to remove the /src/java from the path
if (includedIPath.segment(0).equals("src")) {
includedIPath = includedIPath.removeFirstSegments(1);
}
if (includedIPath.segment(0).equals("main")) {
includedIPath = includedIPath.removeFirstSegments(1);
}
if (includedIPath.segment(0).equals("java")) {
includedIPath = includedIPath.removeFirstSegments(1);
}
var element = proj.findElement(includedIPath);
if (element == null) {
element = proj.findElement(includedIPath.removeLastSegments(1));
continue;
}
if (element instanceof ICompilationUnit) {
var x = element.getAncestor(IJavaElement.PACKAGE_FRAGMENT);
if (x != null) {
includedFragments.add(x);
}
} else {
includedFragments.add(element);
}
continue;
}
for (IPackageFragment fragment : proj.getPackageFragments()) {
IPath fragmentPath = fragment.getPath();
// if there's no file extension, it's a path to java package from source
// else it is a path pointing to jar, ear, etc. we ignore deps for now
if (fragmentPath.getFileExtension() != null) {
continue;
}
// fragment paths are not actual filesystem paths
// they are of form /<artifact>/src/main/java
// we can only compare the relative path
fragmentPath = fragmentPath.removeFirstSegments(1);
for (String includedPath : includedPaths) {
IPath includedIPath = Path.fromOSString(includedPath);
// when there are more than one sub-projects, the paths are of form
// <project-name>/src/main/java/
if (includedPath.startsWith(proj.getElementName())) {
includedIPath = includedIPath.removeFirstSegments(1);
}
// instead of comparing path strings, comparing segments is better for 2 reasons:
// - we don't have to worry about redundant . / etc in input
// - matching sub-trees is easier with segments than strings
if (includedIPath.segmentCount() <= fragmentPath.segmentCount() &&
includedIPath.matchingFirstSegments(fragmentPath) == includedIPath.segmentCount()) {
includedFragments.add(fragment);
}
// when there are more than one sub-projects, the paths are of form
// <project-name>/src/main/java/
if (includedPath.startsWith(proj.getElementName())) {
includedIPath = includedIPath.removeFirstSegments(1);
}
// instead of comparing path strings, comparing segments is better for 2 reasons:
Copy link
Contributor

Choose a reason for hiding this comment

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

+1

// - we don't have to worry about redundant . / etc in input
// - matching sub-trees is easier with segments than strings
if (includedIPath.segmentCount() <= fragmentPath.segmentCount() &&
includedIPath.matchingFirstSegments(fragmentPath) == includedIPath.segmentCount()) {
includedFragments.add(fragment);
}
}
}
Expand Down
Loading