-
Notifications
You must be signed in to change notification settings - Fork 408
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.
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
[Deprecated]Improve the standalone java file support #843
Closed
testforstephen
wants to merge
7
commits into
eclipse-jdtls:master
from
testforstephen:jinbo_standalonesupport
Closed
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fd28d12
Improve the standalone java file support
testforstephen 4528139
Fix test build error
testforstephen 02e317f
Fix NPE threw by test case
testforstephen 52f6380
Use more SRC prefixes to filter the file path to guess the package name
testforstephen 1ad11ce
Remove the unnecessary gradle check per review comments
testforstephen e5ba184
The exclusion path of newSourceEntry should be relative path
testforstephen c904211
Refractor and move invisible project code to ProjectUtils
testforstephen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
196 changes: 196 additions & 0 deletions
196
org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JDTStandaloneFileUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2018 Microsoft Corporation and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Microsoft Corporation - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.jdt.ls.core.internal; | ||
|
|
||
| import java.net.URI; | ||
| import java.nio.file.Paths; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.codehaus.plexus.util.StringUtils; | ||
| 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.ResourcesPlugin; | ||
| import org.eclipse.core.runtime.CoreException; | ||
| 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.IJavaProject; | ||
| import org.eclipse.jdt.core.JavaCore; | ||
| import org.eclipse.jdt.core.JavaModelException; | ||
| import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager; | ||
|
|
||
| public class JDTStandaloneFileUtils { | ||
| public static final String PATH_SEPARATOR = "/"; | ||
| public static final String PERIOD = "."; | ||
| public static final String SRC = "src"; | ||
| public static final String WORKSPACE_LINK = "_"; | ||
|
|
||
| public static ICompilationUnit getFakeCompilationUnit(URI uri, IProgressMonitor monitor) { | ||
| if (uri == null || !"file".equals(uri.getScheme()) || !uri.getPath().endsWith(".java")) { | ||
| return null; | ||
| } | ||
| java.nio.file.Path path = Paths.get(uri); | ||
| //Only support existing standalone java files | ||
| if (!java.nio.file.Files.isReadable(path)) { | ||
| return null; | ||
| } | ||
|
|
||
| IPath workspaceRoot = getWorkspaceRoot(ResourceUtils.filePathFromURI(uri.toString())); | ||
| if (workspaceRoot != null) { | ||
| return getFakeCompilationUnitForInsideStandaloneFile(uri, workspaceRoot, monitor); | ||
| } else { | ||
| return getFakeCompilationUnitForExternalStandaloneFile(uri, monitor); | ||
| } | ||
| } | ||
|
|
||
| public static IPath getWorkspaceRoot(IPath filePath) { | ||
| PreferenceManager manager = JavaLanguageServerPlugin.getPreferencesManager(); | ||
| Collection<IPath> rootPaths = manager.getPreferences().getRootPaths(); | ||
| if (rootPaths != null) { | ||
| for (IPath rootPath : rootPaths) { | ||
| if (rootPath.isPrefixOf(filePath)) { | ||
| return rootPath; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| public static String getWorkspaceInvisibleProjectName(IPath workspacePath) { | ||
| String fileName = workspacePath.toFile().getName(); | ||
| String projectName = fileName + "_" + Integer.toHexString(workspacePath.toPortableString().hashCode()); | ||
| return projectName; | ||
| } | ||
|
|
||
| public static boolean isVisibleProject(IProject project) { | ||
| PreferenceManager manager = JavaLanguageServerPlugin.getPreferencesManager(); | ||
| Collection<IPath> rootPaths = manager.getPreferences().getRootPaths(); | ||
| return ResourceUtils.isContainedIn(project.getLocation(), rootPaths); | ||
| } | ||
|
|
||
| public static List<IProject> getVisibleProjects(IPath workspaceRoot) { | ||
| List<IProject> projects = new ArrayList<>(); | ||
| for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { | ||
| if (project.exists() && isVisibleProject(project) && workspaceRoot.isPrefixOf(project.getLocation())) { | ||
| projects.add(project); | ||
| } | ||
| } | ||
|
|
||
| return projects; | ||
| } | ||
|
|
||
| private static ICompilationUnit getFakeCompilationUnitForExternalStandaloneFile(URI uri, IProgressMonitor monitor) { | ||
| IProject project = JavaLanguageServerPlugin.getProjectsManager().getDefaultProject(); | ||
| if (project == null || !project.isAccessible()) { | ||
| return null; | ||
| } | ||
|
|
||
| IJavaProject javaProject = JavaCore.create(project); | ||
| String packageName = JDTUtils.getPackageName(javaProject, uri); | ||
| java.nio.file.Path path = Paths.get(uri); | ||
| String fileName = path.getName(path.getNameCount() - 1).toString(); | ||
| String packagePath = packageName.replace(PERIOD, PATH_SEPARATOR); | ||
| IPath filePath = new Path(SRC).append(packagePath).append(fileName); | ||
| final IFile file = project.getFile(filePath); | ||
| if (!file.isLinked()) { | ||
| try { | ||
| JDTUtils.createFolders(file.getParent(), monitor); | ||
| file.createLink(uri, IResource.REPLACE, monitor); | ||
| } catch (CoreException e) { | ||
| String errMsg = "Failed to create linked resource from " + uri + " to " + project.getName(); | ||
| JavaLanguageServerPlugin.logException(errMsg, e); | ||
| } | ||
| } | ||
|
|
||
| if (file.isLinked()) { | ||
| return (ICompilationUnit) JavaCore.create(file, javaProject); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| private static ICompilationUnit getFakeCompilationUnitForInsideStandaloneFile(URI uri, IPath workspaceRoot, IProgressMonitor monitor) { | ||
| java.nio.file.Path path = Paths.get(uri); | ||
| if (!getVisibleProjects(workspaceRoot).isEmpty()) { | ||
| return null; | ||
| } | ||
|
|
||
| // Try to resolve the CompilationUnit from the workspace root associated invisible project. | ||
| String invisibleProjectName = getWorkspaceInvisibleProjectName(workspaceRoot); | ||
| IProject invisibleProject = ResourcesPlugin.getWorkspace().getRoot().getProject(invisibleProjectName); | ||
| if (!invisibleProject.exists()) { | ||
| try { | ||
| JavaLanguageServerPlugin.getProjectsManager().createJavaProject(invisibleProject, null, null, "bin", monitor); | ||
| IJavaProject javaProject = JavaCore.create(invisibleProject); | ||
|
|
||
| // Link the workspace root to the invisible project. | ||
| IFolder workspaceLinkFolder = invisibleProject.getFolder(WORKSPACE_LINK); | ||
| if (!workspaceLinkFolder.isLinked()) { | ||
| try { | ||
| JDTUtils.createFolders(workspaceLinkFolder.getParent(), null); | ||
| workspaceLinkFolder.createLink(workspaceRoot.toFile().toURI(), IResource.REPLACE, null); | ||
| } catch (CoreException e) { | ||
| String errMsg = "Failed to create linked resource from " + workspaceRoot + " to the invisible project " + invisibleProject.getName() + " ."; | ||
| JavaLanguageServerPlugin.logException(errMsg, e); | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| try { | ||
| // Mark the containing folder of the opened file as Source Root of the invisible project. | ||
| String packageName = JDTUtils.getPackageName(javaProject, uri); | ||
| IPath containerPath = getContainingFolderPath(path, packageName); | ||
| IPath containerRelativePath = new Path(""); | ||
| if (workspaceRoot.isPrefixOf(containerPath)) { | ||
| containerRelativePath = containerPath.makeRelativeTo(workspaceRoot); | ||
| } | ||
| IPath sourcePath = containerRelativePath.isEmpty() ? workspaceLinkFolder.getFullPath() : workspaceLinkFolder.getFolder(containerRelativePath).getFullPath(); | ||
| List<IProject> subProjects = getVisibleProjects(workspaceRoot); | ||
| List<IPath> subProjectPaths = subProjects.stream().map(project -> project.getLocation()).collect(Collectors.toList()); | ||
| ProjectUtils.addSourcePath(sourcePath, subProjectPaths.toArray(new IPath[0]), javaProject); | ||
| } catch (JavaModelException e) { | ||
| String errMsg = "Failed to update classpath to the invisible project " + invisibleProject.getName() + " ."; | ||
| JavaLanguageServerPlugin.logException(errMsg, e); | ||
| return null; | ||
| } | ||
|
|
||
| IPath fileRelativePath = ResourceUtils.filePathFromURI(uri.toString()).makeRelativeTo(workspaceRoot); | ||
| final IFile file = workspaceLinkFolder.getFile(fileRelativePath); | ||
| return (ICompilationUnit) JavaCore.create(file, javaProject); | ||
| } catch (CoreException e) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| private static IPath getContainingFolderPath(java.nio.file.Path filePath, String packageName) { | ||
| String packagePath = packageName.replace(PERIOD, PATH_SEPARATOR); | ||
| java.nio.file.Path sourcePath = filePath.getParent(); | ||
| if (StringUtils.isNotBlank(packagePath) && sourcePath.endsWith(Paths.get(packagePath))) { | ||
| int packageCount = packageName.split("\\" + PERIOD).length; | ||
| while (packageCount > 0) { | ||
| sourcePath = sourcePath.getParent(); | ||
| packageCount--; | ||
| } | ||
| } | ||
|
|
||
| return ResourceUtils.filePathFromURI(sourcePath.toUri().toString()); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"_" => WORKSPACE_LINK
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here
_is just a simple separator. But the WORKSPACE_LINK symbol represents a special folder. Don't like to replace it here.