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

PT #160596363: Resource links for dependency project for app from CF

Browse Source
This commit is contained in:
BoykoAlex
2019-01-21 23:59:03 -05:00
parent 5093d5e5dc
commit 923a21132a
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
View File

@@ -356,7 +356,8 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
public CompletableFuture<JavadocHoverLinkResponse> javadocHoverLink(JavaDataParams params) {
JavadocHoverLinkResponse response = new JavadocHoverLinkResponse(null);
try {
IJavaElement element = JavaData.findElement(URI.create(params.getProjectUri()), params.getBindingKey(), JavaDataParams.isLookInOtherProjects(params));
URI projectUri = params.getProjectUri() == null ? null : URI.create(params.getProjectUri());
IJavaElement element = JavaData.findElement(projectUri, params.getBindingKey(), JavaDataParams.isLookInOtherProjects(params));
if (element != null) {
response.setLink(JavaElementLinks.createURI(JavaElementLinks.OPEN_LINK_SCHEME, element));
}

21
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java
View File

@@ -11,9 +11,12 @@
package org.springframework.ide.vscode.boot.java.links;
import java.io.File;
import java.io.IOException;
import java.net.JarURLConnection;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -110,7 +113,23 @@ public interface SourceLinks {
if (idx >= 0) {
Path filePath = Paths.get(path.substring(0, idx));
IJavaProject project = projectFinder.find(new TextDocumentIdentifier(filePath.toUri().toString())).orElse(null);
if (project != null) {
if (project == null) {
try {
URL url = new URL(path.substring(0, idx));
if (url.getProtocol().equals("jar")) {
URLConnection connection = url.openConnection();
if (connection instanceof JarURLConnection) {
JarURLConnection jarConnection = (JarURLConnection) connection;
String fqName = jarConnection.getEntryName().replace(File.separator, ".");
return sourceLinks.sourceLinkUrlForFQName(null, fqName);
}
}
} catch (MalformedURLException e) {
log.error("", e);
} catch (IOException e) {
log.error("", e);
}
} else {
try {
for (CPE cpe : project.getClasspath().getClasspathEntries()) {
if (Classpath.isSource(cpe)) {

2
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveChangeDetectionWatchdog.java
View File

@@ -242,7 +242,7 @@ public class SpringLiveChangeDetectionWatchdog {
String path = resource.substring(matcher.start()+1, matcher.end()-1);
for (IJavaProject project : projects) {
if (SpringResource.FILE.equals(type)) {
if (SpringResource.FILE.equals(type) || SpringResource.URL.equals(type)) {
result = sourceLinks.sourceLinkUrlForClasspathResource(path).get();
if (result == null) {
result = sourceLinks.sourceLinkForResourcePath(Paths.get(path)).get();

2
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringResource.java
View File

@@ -31,6 +31,7 @@ public class SpringResource {
public static final String FILE = "file";
public static final String CLASS_PATH_RESOURCE = "class path resource";
public static final String URL = "URL";
private static final String CF_CLASSPATH_PREFIX = "/home/vcap/app/";
private SourceLinks sourceLinks;
@@ -70,6 +71,7 @@ public class SpringResource {
Optional<String> linkUrl = Optional.empty();
switch (type) {
case FILE:
case URL:
linkUrl = sourceLinks.sourceLinkUrlForClasspathResource(path);
if (!linkUrl.isPresent()) {
linkUrl = sourceLinks.sourceLinkForResourcePath(Paths.get(path));