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

PT #163527410: Don't load source for Eclipse. Ask JDT LS for locations.

Browse Source
This commit is contained in:
BoykoAlex
2019-02-04 18:48:40 -05:00
parent 5bb448b0a0
commit 7fe0d75412
19 changed files with 245 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java
View File

@@ -20,9 +20,9 @@ import org.springframework.ide.vscode.boot.common.PropertyCompletionFactory;
import org.springframework.ide.vscode.boot.common.RelaxedNameConfig;
import org.springframework.ide.vscode.boot.java.links.DefaultJavaElementLocationProvider;
import org.springframework.ide.vscode.boot.java.links.EclipseJavaDocumentUriProvider;
import org.springframework.ide.vscode.boot.java.links.EclipseJavaElementLocationProvider;
import org.springframework.ide.vscode.boot.java.links.JavaDocumentUriProvider;
import org.springframework.ide.vscode.boot.java.links.JavaElementLocationProvider;
import org.springframework.ide.vscode.boot.java.links.JavaServerElementLocationProvider;
import org.springframework.ide.vscode.boot.java.links.JdtJavaDocumentUriProvider;
import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory;
import org.springframework.ide.vscode.boot.java.links.SourceLinks;
@@ -111,11 +111,12 @@ public class BootLanguagServerBootApp {
}
}
@Bean JavaElementLocationProvider javaElementLocationProvider(CompilationUnitCache cuCache, JavaDocumentUriProvider javaDocUriProvider) {
@Bean JavaElementLocationProvider javaElementLocationProvider(SimpleLanguageServer server, CompilationUnitCache cuCache, JavaDocumentUriProvider javaDocUriProvider) {
switch (LspClient.currentClient()) {
case ECLIPSE:
// LSP4E doesn't support JDT java doc URIs. Only supports file, eclipse intro and http URIs for docs
return new EclipseJavaElementLocationProvider();
case VSCODE:
case THEIA:
return new JavaServerElementLocationProvider(server);
default:
return new DefaultJavaElementLocationProvider(cuCache, javaDocUriProvider);
}

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

@@ -60,6 +60,9 @@ public class DefaultJavaElementLocationProvider implements JavaElementLocationPr
URI uri = url.get().toURI();
Range r = cuCache.withCompilationUnit(project, uri, (cu) -> {
AtomicReference<Range> range = new AtomicReference<>(null);
if (cu == null) {
return new Range(new Position(0, 0), new Position(0, 0));
}
cu.accept(new ASTVisitor() {
private Range nameRange(SimpleName nameNode) {

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

@@ -37,11 +37,11 @@ public class EclipseSourceLinks implements SourceLinks {
private static final String PARAMETERS_START = "(";
private static final String PARAMETERS_END = ")";
private static final String JAVA_ELEMENT_COMMAND = "org.springframework.tooling.boot.ls.OpenJavaElement";
private static final String JAVA_ELEMENT_COMMAND = "org.springframework.tooling.ls.eclipse.commons.commands.OpenJavaElementInEditor";
private static final String BINDING_KEY_PARAMETER_ID = "bindingKey";
private static final String PROJECT_NAME_PARAMETER_ID = "projectName";
private static final String RESOURCE_COMMAND = "org.springframework.tooling.boot.ls.OpenResourceInEditor";
private static final String RESOURCE_COMMAND = "org.springframework.tooling.ls.eclipse.commons.commands.OpenResourceInEditor";
private static final String PATH = "path";
private static final Logger log = LoggerFactory.getLogger(EclipseSourceLinks.class);

48
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaServerElementLocationProvider.java Normal file
View File

@@ -0,0 +1,48 @@
/*******************************************************************************
* Copyright (c) 2019 Pivotal, Inc.
* 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:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.java.links;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.eclipse.lsp4j.Location;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.java.IMember;
import org.springframework.ide.vscode.commons.languageserver.java.ls.JavaDataParams;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
public class JavaServerElementLocationProvider implements JavaElementLocationProvider {
private static final Logger log = LoggerFactory.getLogger(JavaServerElementLocationProvider.class);
private SimpleLanguageServer server;
public JavaServerElementLocationProvider(SimpleLanguageServer server) {
this.server = server;
}
@Override
public Location findLocation(IJavaProject project, IMember member) {
String projectUri = project == null ? null : project.getLocationUri().toString();
String bindingKey = member.getBindingKey();
try {
Location location = server.getClient().javaLocation(new JavaDataParams(projectUri, bindingKey, true)).get(500, TimeUnit.MILLISECONDS);
return location;
} catch (InterruptedException | ExecutionException | TimeoutException e) {
log.error("", e);
return null;
}
}
}