Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore non-file scheme URIs when finding project.

Browse Source
This commit is contained in:
BoykoAlex
2016-11-11 10:14:14 -05:00
parent 15bc931361
commit 67e1a485d3
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java
View File

@@ -7,8 +7,8 @@ import org.springframework.ide.vscode.commons.util.Log;
public class DefaultJavaProjectFinder implements JavaProjectFinder {
private final IJavaProjectFinderStrategy[] STRATEGIES = new IJavaProjectFinderStrategy[] {
new JavaProjectWithClasspathFileFinderStrategy(),
new MavenProjectFinderStrategy()
new MavenProjectFinderStrategy(),
new JavaProjectWithClasspathFileFinderStrategy()
};
@Override

14
vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectWithClasspathFileFinderStrategy.java
View File

@@ -35,12 +35,14 @@ public class JavaProjectWithClasspathFileFinderStrategy implements IJavaProjectF
URI uri = new URI(uriStr);
// TODO: This only work with File uri. Should it work with others
// too?
File file = toFile(uri);
File cpFile = FileUtils.findFile(file, MavenCore.CLASSPATH_TXT);
if (cpFile != null) {
return cache.get(cpFile, () -> {
return new JavaProjectWithClasspathFile(cpFile);
});
if (uri.getScheme().equalsIgnoreCase("file")) {
File file = toFile(uri);
File cpFile = FileUtils.findFile(file, MavenCore.CLASSPATH_TXT);
if (cpFile != null) {
return cache.get(cpFile, () -> {
return new JavaProjectWithClasspathFile(cpFile);
});
}
}
}
return null;

14
vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/MavenProjectFinderStrategy.java
View File

@@ -41,12 +41,14 @@ public class MavenProjectFinderStrategy implements IJavaProjectFinderStrategy {
URI uri = new URI(uriStr);
// TODO: This only work with File uri. Should it work with others
// too?
File file = new File(uri).getAbsoluteFile();
File pomFile = FileUtils.findFile(file, MavenCore.POM_XML);
if (pomFile != null) {
return cache.get(pomFile, () -> {
return new MavenJavaProject(pomFile);
});
if (uri.getScheme().equalsIgnoreCase("file")) {
File file = new File(uri).getAbsoluteFile();
File pomFile = FileUtils.findFile(file, MavenCore.POM_XML);
if (pomFile != null) {
return cache.get(pomFile, () -> {
return new MavenJavaProject(pomFile);
});
}
}
}
return null;