From f2be2c717b9d871463ff93101773026800004bd0 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 6 Nov 2018 16:45:21 -0500 Subject: [PATCH] PT #155474415: CTRL-CLICK navigation from .properties to Java --- .../commons/jandex/BindingKeyUtils.java | 5 + .../ide/vscode/commons/jandex/TypeImpl.java | 2 +- .../vscode/commons/java/BootProjectUtil.java | 26 ++ .../maven/java/MavenProjectClasspath.java | 2 + .../starter/LanguageServerAutoConf.java | 13 +- .../languageserver/testharness/Editor.java | 21 +- .../boot/app/BootLanguagServerBootApp.java | 26 ++ .../app/BootLanguageServerInitializer.java | 6 +- .../app/PropertiesJavaDefinitionHandler.java | 56 +++ .../BootJavaLanguageServerComponents.java | 27 +- .../autowired/AutowiredHoverProvider.java | 15 +- .../boot/java/links/AbstractSourceLinks.java | 178 +++------- .../boot/java/links/AtomSourceLinks.java | 10 +- .../DefaultJavaElementLocationProvider.java | 148 ++++++++ .../java/links/JavaDocumentUriProvider.java | 22 ++ .../links/JavaElementLocationProvider.java | 22 ++ .../links/JdtJavaDocumentUriProvider.java | 78 ++++ .../boot/java/links/SourceLinkFactory.java | 31 +- .../vscode/boot/java/links/SourceLinks.java | 82 ++++- .../boot/java/links/VSCodeSourceLinks.java | 53 +-- .../AbstractInjectedIntoHoverProvider.java | 13 +- .../BeanInjectedIntoHoverProvider.java | 6 +- .../ComponentInjectionsHoverProvider.java | 6 +- .../boot/java/livehover/LiveHoverUtils.java | 32 +- .../boot/java/utils/CompilationUnitCache.java | 59 +++- .../java/utils/DocumentContentProvider.java | 20 ++ .../SpringLiveChangeDetectionWatchdog.java | 6 +- .../boot/metadata/hints/StsValueHint.java | 5 +- .../vscode/boot/metadata/types/TypeUtil.java | 3 +- .../boot/metadata/util/PropertyDocUtils.java | 13 +- .../hover/PropertiesDefinitionCalculator.java | 237 +++++++++++++ .../hover/PropertiesHoverCalculator.java | 91 +---- .../boot/properties/hover/PropertyFinder.java | 88 +++++ .../ApplicationYamlAssistContext.java | 3 +- .../boot/bootiful/BootLanguageServerTest.java | 2 - .../vscode/boot/bootiful/HoverTestConf.java | 7 + .../boot/bootiful/PropertyEditorTestConf.java | 8 + .../boot/bootiful/SymbolProviderTestConf.java | 6 + .../test/AutowiredHoverProviderTest.java | 3 - .../utils/test/CompilationUnitCacheTest.java | 8 + .../utils/test/VSCodeSourceLinksTest.java | 9 +- .../java/value/test/ValueCompletionTest.java | 9 + .../test/ApplicationPropertiesEditorTest.java | 334 ++++++++++++++++-- .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + .../resources/test-projects/enum-def-nav/mvnw | 286 +++++++++++++++ .../test-projects/enum-def-nav/mvnw.cmd | 161 +++++++++ .../test-projects/enum-def-nav/pom.xml | 55 +++ .../src/main/java/com/example/demo/Color.java | 7 + .../example/demo/EnumDefNavApplication.java | 12 + .../java/com/example/demo/MyProperties.java | 65 ++++ .../demo/EnumDefNavApplicationTests.java | 16 + 52 files changed, 1998 insertions(+), 396 deletions(-) create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/PropertiesJavaDefinitionHandler.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/DefaultJavaElementLocationProvider.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaDocumentUriProvider.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaElementLocationProvider.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JdtJavaDocumentUriProvider.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/DocumentContentProvider.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesDefinitionCalculator.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertyFinder.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/.mvn/wrapper/maven-wrapper.jar create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/.mvn/wrapper/maven-wrapper.properties create mode 100755 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/mvnw create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/mvnw.cmd create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/pom.xml create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/Color.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/EnumDefNavApplication.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/MyProperties.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/test/java/com/example/demo/EnumDefNavApplicationTests.java diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/BindingKeyUtils.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/BindingKeyUtils.java index 0ae8e6096..db64367d4 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/BindingKeyUtils.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/BindingKeyUtils.java @@ -45,6 +45,8 @@ class BindingKeyUtils { sb.append(getBindingKey(field.declaringClass())); sb.append('.'); sb.append(field.name()); + sb.append(')'); + sb.append(getGeneralTypeBindingKey(field.type())); return sb.toString(); } @@ -104,6 +106,9 @@ class BindingKeyUtils { sb.append(getGeneralTypeBindingKey(argument)); } sb.append('>'); + if (type.owner() == null) { + sb.append(';'); + } return sb.toString(); } diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java index c66b2d82c..9109099cc 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java @@ -53,7 +53,7 @@ class TypeImpl implements IType { @Override public IType getDeclaringType() { DotName enclosingClass = info.enclosingClass(); - return enclosingClass == null ? null : index.findType(enclosingClass.toString()); + return enclosingClass == null ? this : index.findType(enclosingClass.toString()); } @Override diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/BootProjectUtil.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/BootProjectUtil.java index ff9227678..caffb50f8 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/BootProjectUtil.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/BootProjectUtil.java @@ -11,6 +11,8 @@ package org.springframework.ide.vscode.commons.java; import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,4 +39,28 @@ public class BootProjectUtil { return name.endsWith(".jar") && name.startsWith("spring-boot"); } + public static Path javaHomeFromLibJar(Path libJar) { + for (Path home = libJar; home.getParent() != null; home = home.getParent()) { + if (Files.exists(home.resolve("release")) || Files.exists(home.resolve("release.txt"))) { + return home; + } + } + return null; + } + + public static Path jreSources(Path libJar) { + Path home = javaHomeFromLibJar(libJar); + if (home != null) { + Path sources = home.resolve("src.zip"); + if (Files.exists(sources)) { + return sources; + } + sources = home.resolve("lib/src.zip"); + if (Files.exists(sources)) { + return sources; + } + } + return null; + } + } diff --git a/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java index 03832c58d..c0778c3e5 100644 --- a/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java +++ b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java @@ -21,6 +21,7 @@ import java.util.Set; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Resource; import org.apache.maven.project.MavenProject; +import org.springframework.ide.vscode.commons.java.BootProjectUtil; import org.springframework.ide.vscode.commons.java.ClasspathData; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.languageserver.jdt.ls.Classpath.CPE; @@ -86,6 +87,7 @@ public class MavenProjectClasspath implements IClasspath { if (javaVersion == null) { javaVersion = "8"; } + cpe.setSourceContainerUrl(BootProjectUtil.jreSources(path).toUri().toURL()); cpe.setJavadocContainerUrl(new URL("https://docs.oracle.com/javase/" + javaVersion + "/docs/api/")); cpe.setSystem(true); entries.add(cpe); diff --git a/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java b/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java index 8afb9b453..06cf28bef 100644 --- a/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java +++ b/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java @@ -21,7 +21,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.ide.vscode.commons.languageserver.config.LanguageServerInitializer; import org.springframework.ide.vscode.commons.languageserver.config.LanguageServerProperties; import org.springframework.ide.vscode.commons.languageserver.reconcile.DiagnosticSeverityProvider; +import org.springframework.ide.vscode.commons.languageserver.util.DefinitionHandler; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; +import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; @Configuration @EnableConfigurationProperties(LanguageServerProperties.class) @@ -45,5 +47,14 @@ public class LanguageServerAutoConf { }; } - + @Bean SimpleTextDocumentService documents(SimpleLanguageServer ls) { + return ls.getTextDocumentService(); + } + + @ConditionalOnBean(DefinitionHandler.class) + @Bean + InitializingBean registerDefintionHandler(SimpleTextDocumentService documents, + DefinitionHandler definitionHandler) { + return () -> documents.onDefinition(definitionHandler); + } } diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java index 1a171bcd6..209bd74d0 100644 --- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java +++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java @@ -55,6 +55,7 @@ import org.springframework.ide.vscode.commons.util.Unicodes; import org.springframework.ide.vscode.commons.util.text.LanguageId; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import reactor.core.publisher.Flux; @@ -720,10 +721,28 @@ public class Editor { return "Editor(\n"+getText()+"\n)"; } + public void assertLinkTargets(String hoverOver, Set expectedLocations) throws Exception { + int pos = getRawText().indexOf(hoverOver); + if (pos>=0) { + pos += hoverOver.length() / 2; + } + assertTrue("Not found in editor: '"+hoverOver+"'", pos>=0); + + TextDocumentPositionParams params = new TextDocumentPositionParams(new TextDocumentIdentifier(getUri()), doc.toPosition(pos)); + List definitions = harness.getDefinitions(params); + + assertEquals(ImmutableSet.copyOf(expectedLocations), ImmutableSet.copyOf(definitions)); + } + + @Deprecated public void assertLinkTargets(String hoverOver, String... expecteds) { throw new UnsupportedOperationException("Not implemented yet!"); // Editor editor = this; -// int pos = editor.middleOf(hoverOver); +// int pos = getRawText().indexOf(hoverOver); +// if (pos>=0) { +// pos += hoverOver.length(); +// } +// return harness.getHover(doc, doc.toPosition(pos)); // assertTrue("Not found in editor: '"+hoverOver+"'", pos>=0); // // List targets = getLinkTargets(editor, pos); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java index 8b33b11e6..56838f0d2 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java @@ -14,7 +14,15 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Bean; +import org.springframework.ide.vscode.boot.java.links.DefaultJavaElementLocationProvider; +import org.springframework.ide.vscode.boot.java.links.JavaElementLocationProvider; +import org.springframework.ide.vscode.boot.java.links.JavaDocumentUriProvider; +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; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; +import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.util.LogRedirect; @SpringBootApplication @@ -34,4 +42,22 @@ public class BootLanguagServerBootApp { @Bean BootLanguageServerParams serverParams(SimpleLanguageServer server) { return BootLanguageServerParams.createDefault(server); } + + @ConditionalOnMissingClass("org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness") + @Bean SourceLinks sourceLinks(CompilationUnitCache cuCache) { + return SourceLinkFactory.createSourceLinks(cuCache); + } + + @Bean CompilationUnitCache cuCache(BootLanguageServerParams params, SimpleTextDocumentService documents) { + return new CompilationUnitCache(params.projectFinder, documents, params.projectObserver); + } + + @Bean JavaDocumentUriProvider javaDocumentUriProvider() { + return new JdtJavaDocumentUriProvider(); + } + + @Bean JavaElementLocationProvider javaElementLocationProvider(CompilationUnitCache cuCache, JavaDocumentUriProvider javaDocUriProvider) { + return new DefaultJavaElementLocationProvider(cuCache, javaDocUriProvider); + } + } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java index 3af6fc1ea..017b06f8c 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java @@ -15,6 +15,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; +import org.springframework.ide.vscode.boot.java.links.SourceLinks; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerComponents; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine; import org.springframework.ide.vscode.commons.languageserver.completion.VscodeCompletionEngineAdapter; @@ -32,6 +34,8 @@ public class BootLanguageServerInitializer implements InitializingBean { @Autowired SimpleLanguageServer server; @Autowired BootLanguageServerParams params; + @Autowired SourceLinks sourceLinks; + @Autowired CompilationUnitCache cuCache; private CompositeLanguageServerComponents components; private VscodeCompletionEngineAdapter completionEngineAdapter; @@ -55,7 +59,7 @@ public class BootLanguageServerInitializer implements InitializingBean { // some server intialization code. Migrate that code and get rid of the ComposableLanguageServer class CompositeLanguageServerComponents.Builder builder = new CompositeLanguageServerComponents.Builder(); builder.add(new BootPropertiesLanguageServerComponents(server, (ignore) -> params)); - builder.add(new BootJavaLanguageServerComponents(server, (ignore) -> params)); + builder.add(new BootJavaLanguageServerComponents(server, params, sourceLinks, cuCache)); components = builder.build(server); params.projectObserver.addListener(reconcileOpenDocuments(server, components)); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/PropertiesJavaDefinitionHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/PropertiesJavaDefinitionHandler.java new file mode 100644 index 000000000..209422ad0 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/PropertiesJavaDefinitionHandler.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2018 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.app; + +import java.util.List; + +import org.eclipse.lsp4j.Location; +import org.eclipse.lsp4j.TextDocumentPositionParams; +import org.gradle.internal.impldep.com.google.common.collect.ImmutableList; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ide.vscode.boot.java.links.JavaElementLocationProvider; +import org.springframework.ide.vscode.boot.metadata.PropertyInfo; +import org.springframework.ide.vscode.boot.metadata.types.TypeUtil; +import org.springframework.ide.vscode.boot.properties.hover.PropertiesDefinitionCalculator; +import org.springframework.ide.vscode.commons.languageserver.util.DefinitionHandler; +import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; +import org.springframework.ide.vscode.commons.util.BadLocationException; +import org.springframework.ide.vscode.commons.util.FuzzyMap; +import org.springframework.ide.vscode.commons.util.text.TextDocument; +import org.springframework.stereotype.Component; + +@Component +public class PropertiesJavaDefinitionHandler implements DefinitionHandler { + + @Autowired + private SimpleTextDocumentService documents; + + @Autowired + private JavaElementLocationProvider javaDocumentLocationProvider; + + @Autowired + private BootLanguageServerParams params; + + @Override + public List handle(TextDocumentPositionParams position) { + try { + TextDocument doc = documents.get(position); + TypeUtil typeUtil = params.typeUtilProvider.getTypeUtil(doc); + FuzzyMap index = params.indexProvider.getIndex(doc); + int offset; + offset = doc.toOffset(position.getPosition()); + return new PropertiesDefinitionCalculator(javaDocumentLocationProvider, index, typeUtil, doc, offset).calculate(); + } catch (BadLocationException e) { + return ImmutableList.of(); + } + } + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java index 3d29d38c4..48a27e154 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java @@ -41,6 +41,7 @@ import org.springframework.ide.vscode.boot.java.handlers.HoverProvider; import org.springframework.ide.vscode.boot.java.handlers.ReferenceProvider; import org.springframework.ide.vscode.boot.java.handlers.RunningAppProvider; import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider; +import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.java.livehover.ActiveProfilesProvider; import org.springframework.ide.vscode.boot.java.livehover.BeanInjectedIntoHoverProvider; import org.springframework.ide.vscode.boot.java.livehover.ComponentInjectionsHoverProvider; @@ -70,7 +71,6 @@ import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserve import org.springframework.ide.vscode.commons.languageserver.util.CodeLensHandler; import org.springframework.ide.vscode.commons.languageserver.util.DocumentHighlightHandler; import org.springframework.ide.vscode.commons.languageserver.util.HoverHandler; -import org.springframework.ide.vscode.commons.languageserver.util.LSFactory; import org.springframework.ide.vscode.commons.languageserver.util.ReferencesHandler; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; @@ -108,15 +108,15 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent private CodeLensHandler codeLensHandler; private DocumentHighlightHandler highlightsEngine; - public BootJavaLanguageServerComponents(SimpleLanguageServer server, LSFactory _params) { + public BootJavaLanguageServerComponents(SimpleLanguageServer server, BootLanguageServerParams serverParams, SourceLinks sourceLinks, CompilationUnitCache cuCache) { this.server = server; - this.serverParams = _params.create(server); + this.serverParams = serverParams; this.config = new BootJavaConfig(); projectFinder = serverParams.projectFinder; projectObserver = serverParams.projectObserver; - cuCache = new CompilationUnitCache(projectFinder, server.getTextDocumentService(), projectObserver); + this.cuCache = cuCache; propertyIndexProvider = serverParams.indexProvider; adHocPropertyIndexProvider = serverParams.adHocIndexProvider; @@ -146,7 +146,7 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent // documents.onCodeLens(codeLensHandler::createCodeLenses); // documents.onCodeLensResolve(codeLensHandler::resolveCodeLens); - hoverProvider = createHoverHandler(projectFinder, serverParams.runningAppProvider); + hoverProvider = createHoverHandler(projectFinder, serverParams.runningAppProvider, sourceLinks); liveHoverWatchdog = new SpringLiveHoverWatchdog(server, hoverProvider, serverParams.runningAppProvider, projectFinder, projectObserver, serverParams.watchDogInterval); documents.onDidChangeContent(params -> { @@ -174,7 +174,14 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent // } }); - liveChangeDetectionWatchdog = new SpringLiveChangeDetectionWatchdog(this, server, serverParams.projectObserver, serverParams.runningAppProvider, projectFinder, serverParams.watchDogInterval); + liveChangeDetectionWatchdog = new SpringLiveChangeDetectionWatchdog( + this, + server, + serverParams.projectObserver, + serverParams.runningAppProvider, + projectFinder, + serverParams.watchDogInterval, + sourceLinks); codeLensHandler = createCodeLensEngine(); documents.onCodeLens(codeLensHandler); @@ -293,14 +300,14 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent } protected BootJavaHoverProvider createHoverHandler(JavaProjectFinder javaProjectFinder, - RunningAppProvider runningAppProvider) { + RunningAppProvider runningAppProvider, SourceLinks sourceLinks) { AnnotationHierarchyAwareLookup providers = new AnnotationHierarchyAwareLookup<>(); ValueHoverProvider valueHoverProvider = new ValueHoverProvider(); RequestMappingHoverProvider requestMappingHoverProvider = new RequestMappingHoverProvider(); - AutowiredHoverProvider autowiredHoverProvider = new AutowiredHoverProvider(this); - ComponentInjectionsHoverProvider componentInjectionsHoverProvider = new ComponentInjectionsHoverProvider(this); - BeanInjectedIntoHoverProvider beanInjectedIntoHoverProvider = new BeanInjectedIntoHoverProvider(this); + AutowiredHoverProvider autowiredHoverProvider = new AutowiredHoverProvider(sourceLinks); + ComponentInjectionsHoverProvider componentInjectionsHoverProvider = new ComponentInjectionsHoverProvider(sourceLinks); + BeanInjectedIntoHoverProvider beanInjectedIntoHoverProvider = new BeanInjectedIntoHoverProvider(sourceLinks); ConditionalsLiveHoverProvider conditionalsLiveHoverProvider = new ConditionalsLiveHoverProvider(); providers.put(org.springframework.ide.vscode.boot.java.value.Constants.SPRING_VALUE, valueHoverProvider); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java index 97f4f6d13..3f293b3fc 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java @@ -32,10 +32,8 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.boot.java.Annotations; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; import org.springframework.ide.vscode.boot.java.annotations.AnnotationHierarchies; import org.springframework.ide.vscode.boot.java.handlers.HoverProvider; -import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.java.livehover.ComponentInjectionsHoverProvider; import org.springframework.ide.vscode.boot.java.livehover.LiveHoverUtils; @@ -65,11 +63,11 @@ public class AutowiredHoverProvider implements HoverProvider { private static final int MAX_INLINE_BEANS_STRING_LENGTH = 60; private static final String INLINE_BEANS_STRING_SEPARATOR = " "; + private SourceLinks sourceLinks; - private BootJavaLanguageServerComponents server; + public AutowiredHoverProvider(SourceLinks sourceLinks) { + this.sourceLinks = sourceLinks; - public AutowiredHoverProvider(BootJavaLanguageServerComponents server) { - this.server = server; } @Override @@ -139,7 +137,7 @@ public class AutowiredHoverProvider implements HoverProvider { } else { hover.append(" \n \n"); } - createHoverContentForBeans(server, project, hover, autowiredBeans); + createHoverContentForBeans(sourceLinks, project, hover, autowiredBeans); hover.append("Bean id: `"); hover.append(definedBean.getId()); hover.append("` \n"); @@ -154,14 +152,13 @@ public class AutowiredHoverProvider implements HoverProvider { return null; } - public static void createHoverContentForBeans(BootJavaLanguageServerComponents server, IJavaProject project, StringBuilder hover, + public static void createHoverContentForBeans(SourceLinks sourceLinks, IJavaProject project, StringBuilder hover, List autowiredBeans) { - SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks(server); hover.append("**"); hover.append(LiveHoverUtils.createBeansTitleMarkdown(sourceLinks, project, autowiredBeans, BEANS_PREFIX_MARDOWN, MAX_INLINE_BEANS_STRING_LENGTH, INLINE_BEANS_STRING_SEPARATOR)); hover.append("**\n"); hover.append(autowiredBeans.stream() - .map(b -> "- " + LiveHoverUtils.showBeanWithResource(server, b, " ", project)) + .map(b -> "- " + LiveHoverUtils.showBeanWithResource(sourceLinks, b, " ", project)) .collect(Collectors.joining("\n"))); hover.append("\n \n"); } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java index 3ab74121d..fe3688544 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java @@ -11,51 +11,41 @@ package org.springframework.ide.vscode.boot.java.links; import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; +import java.net.URI; import java.net.URISyntaxException; -import java.nio.charset.Charset; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Optional; import java.util.Stack; -import org.apache.commons.io.IOUtils; import org.eclipse.jdt.core.dom.ASTVisitor; import org.eclipse.jdt.core.dom.AbstractTypeDeclaration; import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration; import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jdt.core.dom.EnumDeclaration; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.commons.java.IClasspath; -import org.springframework.ide.vscode.commons.java.IClasspathUtil; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.javadoc.TypeUrlProviderFromContainerUrl; import org.springframework.ide.vscode.commons.util.text.Region; -import org.springframework.ide.vscode.commons.util.text.TextDocument; - -import com.google.common.base.Supplier; -import com.google.common.base.Suppliers; /** - * Base logic for {@link SourceLinks} independent of any client - * + * Base logic for {@link SourceLinks} independent of any client + * * @author Alex Boyko * */ public abstract class AbstractSourceLinks implements SourceLinks { - - private static Supplier LOG = Suppliers.memoize(() -> LoggerFactory.getLogger(AbstractSourceLinks.class)); - - private BootJavaLanguageServerComponents server; - - protected AbstractSourceLinks(BootJavaLanguageServerComponents server) { - this.server = server; + + private static final Logger log = LoggerFactory.getLogger(AbstractSourceLinks.class); + + private CompilationUnitCache cuCache; + + protected AbstractSourceLinks(CompilationUnitCache cuCache) { + this.cuCache = cuCache; } @Override @@ -65,7 +55,7 @@ public abstract class AbstractSourceLinks implements SourceLinks { File file = classpathResource.get(); if (file.isDirectory()) { return javaSourceLinkUrl(project, fqName, file); - } else if (file.getName().endsWith(JAR)) { + } else { return jarSourceLinkUrl(project, fqName, file); } } @@ -81,123 +71,56 @@ public abstract class AbstractSourceLinks implements SourceLinks { } return Optional.empty(); } - + + + private Optional javaSourceLinkUrl(IJavaProject project, String fqName, File containerFolder) { IClasspath classpath = project.getClasspath(); - return IClasspathUtil.getSourceFolders(classpath) - .map(sourceFolder -> { - try { - return sourceFolder.toURI().toURL(); - } catch (MalformedURLException e) { - LOG.get().warn("Failed to convert source folder " + sourceFolder + "to URI." + fqName, e); - return null; - } - }) - .map(url -> { - try { - return TypeUrlProviderFromContainerUrl.SOURCE_FOLDER_URL_SUPPLIER.url(url, fqName); - } catch (Exception e) { - LOG.get().warn("Failed to determine source URL from url=" + url + " fqName=" + fqName, e); - return null; - } - }) - .map(url -> { - try { - return Paths.get(url.toURI()); - } catch (URISyntaxException e) { - LOG.get().warn("Failed to convert URL " + url + " to path." + fqName, e); - return null; - } - }) - .filter(sourcePath -> sourcePath != null && Files.exists(sourcePath)) - .findFirst() + return SourceLinks.sourceFromSourceFolder(fqName, classpath) .map(sourcePath -> javaSourceLinkUrl(project, sourcePath, fqName)); } private String javaSourceLinkUrl(IJavaProject project, Path sourcePath, String fqName) { Optional linkOptional = sourceLinkForResourcePath(sourcePath); if (linkOptional.isPresent()) { - Optional positionLink = findCUForJavaSourceFile(sourcePath).map(cu -> positionLink(cu, fqName)); + Optional positionLink = findCU(project, sourcePath.toUri()).map(cu -> positionLink(cu, fqName)); return positionLink.isPresent() ? linkOptional.get() + positionLink.get() : linkOptional.get(); } return null; } - + abstract protected String positionLink(CompilationUnit cu, String fqName); - - private Optional findCUForJavaSourceFile(Path resourcePath) { - Optional cu = findCUfromCache(resourcePath.toUri().toString()); - if (cu == null) { - try { - char[] bytes = new String(Files.readAllBytes(resourcePath), Charset.defaultCharset()).toCharArray(); - String uri = resourcePath.toUri().toString(); - String unitName = resourcePath.getFileName().toString(); - cu = Optional.ofNullable(CompilationUnitCache.parse(bytes, uri, unitName, new String[0])); - } catch (Exception e) { - LOG.get().warn("Failed to create CompilationUnit from " + resourcePath, e); - cu = Optional.empty(); - } - } - return cu; + + private Optional findCU(IJavaProject project, URI uri) { + return cuCache == null ? Optional.empty() : cuCache.withCompilationUnit(project, uri, compilationUnit -> Optional.ofNullable(compilationUnit)); } - - private Optional findCUfromCache(String uri) { - Optional cu = null; - if (server != null && server.getCompilationUnitCache() != null) { - TextDocument doc = server.getTextDocumentService().get(uri); - if (doc != null) { - cu = server.getCompilationUnitCache().withCompilationUnit(doc, compilationUnit -> compilationUnit == null ? null : Optional.of(compilationUnit)); - } - } - return cu; - } - - abstract protected Optional jarUrl(IJavaProject project, String fqName, File jarFile); - + + abstract protected Optional jarLinkUrl(IJavaProject project, String fqName, File jarFile); + private Optional jarSourceLinkUrl(IJavaProject project, String fqName, File jarFile) { - return jarUrl(project, fqName, jarFile).map(sourceUrl -> { - Optional positionLink = findCUForFQNameFromJar(project, jarFile, sourceUrl, fqName).map(cu -> positionLink(cu, fqName)); + return jarLinkUrl(project, fqName, jarFile).map(sourceUrl -> { + Optional positionLink = findCUForFQNameFromJar(project, jarFile, fqName).map(cu -> positionLink(cu, fqName)); return positionLink.isPresent() ? sourceUrl + positionLink.get() : sourceUrl; }); } - - private Optional findCUForFQNameFromJar(IJavaProject project, File jarFile, String clientSourceUri, String fqName) { - Optional cu = findCUfromCache(clientSourceUri); - if (cu == null) { - cu = project.sourceContainer(jarFile) - .map(url -> { - try { - return TypeUrlProviderFromContainerUrl.JAR_SOURCE_URL_PROVIDER.url(url, fqName); - } catch (Exception e) { - LOG.get().warn("Failed to determine source URL from url=" + url + " fqName=" + fqName, e); - return null; - } - }) - .map(sourceUrl -> { - InputStream openStream = null; - try { - openStream = sourceUrl.openStream(); - char[] bytes = IOUtils.toCharArray(openStream); - String uri = sourceUrl.toURI().toString(); - String unitName = fqName; - return CompilationUnitCache.parse(bytes, uri, unitName, new String[0]); - } catch (Exception e) { - LOG.get().warn("Failed to create CompilationUnit from " + sourceUrl, e); - return null; - } finally { - if (openStream != null) { - try { - openStream.close(); - } catch (IOException e) { - LOG.get().error("Failed to close stream from " + sourceUrl, e); - } - } - } - }); - } - return cu; + + private Optional findCUForFQNameFromJar(IJavaProject project, File jarFile, String fqName) { + return project.sourceContainer(jarFile).map(url -> { + try { + return TypeUrlProviderFromContainerUrl.JAR_SOURCE_URL_PROVIDER.url(url, fqName); + } catch (Exception e) { + log.warn("Failed to determine source URL from url={} fqName={}", url, fqName, e); + return null; + } + }).map(sourceUrl -> { + try { + return sourceUrl.toURI(); + } catch (URISyntaxException e) { + throw new IllegalStateException(e); + } + }).map(sourcePath -> findCU(project, sourcePath).orElse(null)); } - + protected Region findTypeRegion(CompilationUnit cu, String fqName) { if (cu == null) { return null; @@ -209,7 +132,7 @@ public abstract class AbstractSourceLinks implements SourceLinks { if (packageName.equals(cu.getPackage().getName().getFullyQualifiedName())) { Stack visitedType = new Stack<>(); cu.accept(new ASTVisitor() { - + private boolean visitDeclaration(AbstractTypeDeclaration node) { visitedType.push(node.getName().getIdentifier()); if (values[1] < 0) { @@ -231,6 +154,17 @@ public abstract class AbstractSourceLinks implements SourceLinks { return visitDeclaration(node); } + @Override + public boolean visit(EnumDeclaration node) { + return visitDeclaration(node); + } + + @Override + public void endVisit(EnumDeclaration node) { + visitedType.pop(); + super.endVisit(node); + } + @Override public void endVisit(AnnotationTypeDeclaration node) { visitedType.pop(); @@ -247,5 +181,5 @@ public abstract class AbstractSourceLinks implements SourceLinks { } return values[1] < 0 ? null : new Region(values[0], values[1]); } - + } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AtomSourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AtomSourceLinks.java index 81d3c973a..a4d4d6476 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AtomSourceLinks.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AtomSourceLinks.java @@ -19,7 +19,7 @@ import java.util.Optional; import org.eclipse.jdt.core.dom.CompilationUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.util.text.Region; @@ -28,7 +28,7 @@ import com.google.common.base.Suppliers; /** * Source links for Atom client - * + * * @author Alex Boyko * */ @@ -36,8 +36,8 @@ public class AtomSourceLinks extends AbstractSourceLinks { private static Supplier LOG = Suppliers.memoize(() -> LoggerFactory.getLogger(AbstractSourceLinks.class)); - public AtomSourceLinks(BootJavaLanguageServerComponents server) { - super(server); + public AtomSourceLinks(CompilationUnitCache cuCache) { + super(cuCache); } @Override @@ -69,7 +69,7 @@ public class AtomSourceLinks extends AbstractSourceLinks { } @Override - protected Optional jarUrl(IJavaProject project, String fqName, File jarFile) { + protected Optional jarLinkUrl(IJavaProject project, String fqName, File jarFile) { // JAR URLs are not supported yet return Optional.empty(); } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/DefaultJavaElementLocationProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/DefaultJavaElementLocationProvider.java new file mode 100644 index 000000000..e661d1a81 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/DefaultJavaElementLocationProvider.java @@ -0,0 +1,148 @@ +/******************************************************************************* + * Copyright (c) 2018 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.net.URI; +import java.net.URL; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; + +import org.eclipse.jdt.core.dom.ASTVisitor; +import org.eclipse.jdt.core.dom.EnumConstantDeclaration; +import org.eclipse.jdt.core.dom.EnumDeclaration; +import org.eclipse.jdt.core.dom.MethodDeclaration; +import org.eclipse.jdt.core.dom.SimpleName; +import org.eclipse.jdt.core.dom.TypeDeclaration; +import org.eclipse.lsp4j.Location; +import org.eclipse.lsp4j.Position; +import org.eclipse.lsp4j.Range; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; +import org.springframework.ide.vscode.commons.java.IField; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IMember; +import org.springframework.ide.vscode.commons.java.IMethod; +import org.springframework.ide.vscode.commons.java.IType; + +public class DefaultJavaElementLocationProvider implements JavaElementLocationProvider { + + private static final Logger log = LoggerFactory.getLogger(DefaultJavaElementLocationProvider.class); + + private CompilationUnitCache cuCache; + private JavaDocumentUriProvider javaDocUriProvider; + + public DefaultJavaElementLocationProvider(CompilationUnitCache cuCache, JavaDocumentUriProvider javaDocUriProvider) { + this.cuCache = cuCache; + this.javaDocUriProvider = javaDocUriProvider; + } + + @Override + public Location findLocation(IJavaProject project, IMember member) { + Location loc = new Location(); + String fqName = member.getDeclaringType().getFullyQualifiedName(); + URI docUri = javaDocUriProvider.docUri(project, fqName); + if (docUri != null) { + loc.setUri(docUri.toString()); + Optional url = SourceLinks.source(project, fqName); + if (url.isPresent()) { + String memberBindingKey = member.getBindingKey(); + + try { + URI uri = url.get().toURI(); + Range r = cuCache.withCompilationUnit(project, uri, (cu) -> { + AtomicReference range = new AtomicReference<>(null); + cu.accept(new ASTVisitor() { + + private Range nameRange(SimpleName nameNode) { + int startOffset = nameNode.getStartPosition(); + int endOffset = nameNode.getLength() + startOffset; + + // Line -1 because for CU lines are starting from 1 + return new Range( + new Position(cu.getLineNumber(startOffset) - 1, cu.getColumnNumber(startOffset)), + new Position(cu.getLineNumber(endOffset) - 1, cu.getColumnNumber(endOffset))); + } + + @Override + public boolean visit(MethodDeclaration node) { + if (member instanceof IMethod) { + String bindingKey = node.resolveBinding().getKey(); + if (matchMethodBindingKeys(memberBindingKey, bindingKey)) { + range.set(nameRange(node.getName())); + return false; + } + } + return true; + } + + @Override + public boolean visit(EnumConstantDeclaration node) { + if (member instanceof IField) { + String bindingKey = node.resolveVariable().getKey(); + if (memberBindingKey.equals(bindingKey)) { + range.set(nameRange(node.getName())); + return false; + } + } + return true; + } + + @Override + public boolean visit(EnumDeclaration node) { + if (member instanceof IType) { + String bindingKey = node.resolveBinding().getKey(); + if (memberBindingKey.equals(bindingKey)) { + range.set(nameRange(node.getName())); + return false; + } + } + return true; + } + + @Override + public boolean visit(TypeDeclaration node) { + if (member instanceof IType) { + String bindingKey = node.resolveBinding().getKey(); + if (memberBindingKey.equals(bindingKey)) { + range.set(nameRange(node.getName())); + return false; + } + } + return true; + } + + }); + return range.get(); + }); + if (r == null) { + throw new IllegalStateException("Couldn't find " + member); + } + loc.setRange(r); + } catch (Throwable t) { + log.error("", t); + } + + } + } + return loc; + } + + private static boolean matchMethodBindingKeys(String key1, String key2) { + return removeReturnTypeFromMethodKeyBinding(key1).equals(removeReturnTypeFromMethodKeyBinding(key2)); + } + + private static String removeReturnTypeFromMethodKeyBinding(String key) { + int idx = key.lastIndexOf(')'); + return idx >= 0 ? key.substring(0, idx + 1) : key; + } + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaDocumentUriProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaDocumentUriProvider.java new file mode 100644 index 000000000..9ecc4e331 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaDocumentUriProvider.java @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2018 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.net.URI; + +import org.springframework.ide.vscode.commons.java.IJavaProject; + +@FunctionalInterface +public interface JavaDocumentUriProvider { + + URI docUri(IJavaProject project, String fqName); + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaElementLocationProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaElementLocationProvider.java new file mode 100644 index 000000000..ed437fa3e --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JavaElementLocationProvider.java @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2018 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 org.eclipse.lsp4j.Location; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IMember; + +@FunctionalInterface +public interface JavaElementLocationProvider { + + Location findLocation(IJavaProject project, IMember member); + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JdtJavaDocumentUriProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JdtJavaDocumentUriProvider.java new file mode 100644 index 000000000..e6301d05a --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/JdtJavaDocumentUriProvider.java @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2018 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.io.File; +import java.net.URI; +import java.net.URLEncoder; +import java.util.Optional; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ide.vscode.commons.java.IClasspath; +import org.springframework.ide.vscode.commons.java.IJavaProject; + +public class JdtJavaDocumentUriProvider implements JavaDocumentUriProvider { + + private static final Logger log = LoggerFactory.getLogger(JdtJavaDocumentUriProvider.class); + + @Override + public URI docUri(IJavaProject project, String fqName) { + return uri(project, fqName); + } + + public static URI uri(IJavaProject project, String fqName) { + Optional classpathResource = project.getIndex().findClasspathResourceContainer(fqName); + if (classpathResource.isPresent()) { + File file = classpathResource.get(); + if (file.isDirectory()) { + IClasspath classpath = project.getClasspath(); + return SourceLinks.sourceFromSourceFolder(fqName, classpath).map(path -> path.toUri()).orElse(null); + } else { + try { + int lastDotIndex = fqName.lastIndexOf('.'); + String packageName = fqName.substring(0, lastDotIndex); + String typeName = fqName.substring(lastDotIndex + 1); + String jarFileName = file.getName(); + StringBuilder sb = new StringBuilder(); + sb.append("jdt://contents/"); + sb.append(jarFileName); + sb.append("/"); + sb.append(packageName); + sb.append("/"); + sb.append(typeName); + sb.append(SourceLinks.CLASS); + sb.append("?"); + + StringBuilder query = new StringBuilder(); + query.append("="); + query.append(project.getElementName()); + query.append("/"); + String convertedPath = file.toString().replace(File.separator, "\\/"); + query.append(convertedPath); + query.append("<"); + query.append(packageName); + query.append("("); + query.append(typeName); + query.append(SourceLinks.CLASS); + + sb.append(URLEncoder.encode(query.toString(), "UTF8")); + + return URI.create(sb.toString()); + } catch (Throwable t) { + log.warn("Failed creating Java document URI for " + file + " type " + fqName + " in the context of project " + project.getElementName(), t); + } + } + } + return null; + } + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java index f33a4e5d2..0e12db838 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java @@ -14,54 +14,61 @@ import java.nio.file.Path; import java.util.Optional; import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.util.LspClient; /** * Factory for creating {@link SourceLinks} - * + * * @author Alex Boyko * */ public final class SourceLinkFactory { - - private static final SourceLinks NO_SOURCE_LINKS = new SourceLinks() { - + + public static final SourceLinks NO_SOURCE_LINKS = new SourceLinks() { + @Override public Optional sourceLinkUrlForFQName(IJavaProject project, String fqName) { return Optional.empty(); } - + @Override public Optional sourceLinkUrlForClasspathResource(IJavaProject project, String path) { return Optional.empty(); } - + @Override public Optional sourceLinkForResourcePath(Path path) { return Optional.empty(); } - + }; - + /** * Creates {@link SourceLinks} for specific server based on client type * @param server the boot LS * @return appropriate source links object */ - public static SourceLinks createSourceLinks(BootJavaLanguageServerComponents server) { + public static SourceLinks createSourceLinks(CompilationUnitCache cuCache) { switch (LspClient.currentClient()) { case VSCODE: - case THEIA: - return new VSCodeSourceLinks(server); + case THEIA: + return new VSCodeSourceLinks(cuCache); case ECLIPSE: return new EclipseSourceLinks(); case ATOM: - return new AtomSourceLinks(server); + return new AtomSourceLinks(cuCache); default: return NO_SOURCE_LINKS; } } + @Deprecated + public static SourceLinks createSourceLinks(BootJavaLanguageServerComponents server) { + return server == null + ? createSourceLinks((CompilationUnitCache)null) + : createSourceLinks(server.getCompilationUnitCache()); + } } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java index 43418fb8d..97db096ed 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java @@ -10,25 +10,97 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot.java.links; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ide.vscode.commons.java.IClasspath; +import org.springframework.ide.vscode.commons.java.IClasspathUtil; import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.javadoc.TypeUrlProviderFromContainerUrl; /** * Instance is able to provide client specific URL links to navigate to a * specific file on the client given various types of data such as fully * qualified java type name or classpath resource or just some file resource * given by its path. - * + * * @author Alex Boyko * */ public interface SourceLinks { - + + static final Logger log = LoggerFactory.getLogger(SourceLinks.class); + static final String JAR = ".jar"; static final String CLASS = ".class"; + public static Optional sourceFromSourceFolder(String fqName, IClasspath classpath) { + return IClasspathUtil.getSourceFolders(classpath) + .map(sourceFolder -> { + try { + return sourceFolder.toURI().toURL(); + } catch (MalformedURLException e) { + log.warn("Failed to convert source folder {} to URI {}", sourceFolder, fqName, e); + return null; + } + }) + .map(url -> { + try { + return TypeUrlProviderFromContainerUrl.SOURCE_FOLDER_URL_SUPPLIER.url(url, fqName); + } catch (Exception e) { + log.warn("Failed to determine source URL from url={} fqName=", url, fqName, e); + return null; + } + }) + .map(url -> { + try { + return Paths.get(url.toURI()); + } catch (URISyntaxException e) { + log.warn("Failed to convert URL {} to path. {}", url, fqName, e); + return null; + } + }) + .filter(sourcePath -> sourcePath != null && Files.exists(sourcePath)) + .findFirst(); + } + + public static Optional source(IJavaProject project, String fqName) { + Optional classpathResourceContainer = project.findClasspathResourceContainer(fqName); + // Try to find in a source JAR + Optional url = classpathResourceContainer + .flatMap(file -> project.sourceContainer(file)) + .map(file -> { + try { + return TypeUrlProviderFromContainerUrl.JAR_SOURCE_URL_PROVIDER.url(file, fqName); + } catch (Exception e) { + throw new IllegalStateException(e); + } + }); + + + if (!url.isPresent()) { + // Try Source folder + url = classpathResourceContainer + .flatMap(file -> sourceFromSourceFolder(fqName, project.getClasspath()).map(p -> { + try { + return p.toUri().toURL(); + } catch (MalformedURLException e) { + throw new IllegalStateException(e); + } + })); + } + return url; + } + + /** * Creates link to source file defining the type passed with it's fully qualified name * @param project Java project in the context of which source file link is calculated @@ -44,12 +116,12 @@ public interface SourceLinks { * @return the link URL optional */ Optional sourceLinkUrlForClasspathResource(IJavaProject project, String path); - + /** - * Creates link to a file specified by it's path + * Creates link to a file specified by it's path * @param path the resource path * @return the link URL optional */ Optional sourceLinkForResourcePath(Path path); - + } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java index 22d2c3c4b..54eab45f3 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java @@ -11,32 +11,24 @@ package org.springframework.ide.vscode.boot.java.links; import java.io.File; -import java.net.URLEncoder; import java.nio.file.Path; import java.util.Optional; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.util.text.Region; -import com.google.common.base.Supplier; -import com.google.common.base.Suppliers; - /** * VSCode specific source links implementation - * + * * @author Alex Boyko * */ public class VSCodeSourceLinks extends AbstractSourceLinks { - - private static Supplier LOG = Suppliers.memoize(() -> LoggerFactory.getLogger(AbstractSourceLinks.class)); - public VSCodeSourceLinks(BootJavaLanguageServerComponents server) { - super(server); + public VSCodeSourceLinks(CompilationUnitCache cuCache) { + super(cuCache); } @Override @@ -63,41 +55,8 @@ public class VSCodeSourceLinks extends AbstractSourceLinks { } @Override - protected Optional jarUrl(IJavaProject project, String fqName, File jarFile) { - try { - int lastDotIndex = fqName.lastIndexOf('.'); - String packageName = fqName.substring(0, lastDotIndex); - String typeName = fqName.substring(lastDotIndex + 1); - String jarFileName = jarFile.getName(); - StringBuilder sb = new StringBuilder(); - sb.append("jdt://contents/"); - sb.append(jarFileName); - sb.append("/"); - sb.append(packageName); - sb.append("/"); - sb.append(typeName); - sb.append(CLASS); - sb.append("?"); - - StringBuilder query = new StringBuilder(); - query.append("="); - query.append(project.getElementName()); - query.append("/"); - String convertedPath = jarFile.toString().replace(File.separator, "\\/"); - query.append(convertedPath); - query.append("<"); - query.append(packageName); - query.append("("); - query.append(typeName); - query.append(CLASS); - - sb.append(URLEncoder.encode(query.toString(), "UTF8")); - - return Optional.of(sb.toString()); - } catch (Throwable t) { - LOG.get().warn("Failed creating source URI for jar " + jarFile + " type " + fqName + " in the context of project " + project.getElementName(), t); - } - return Optional.empty(); + protected Optional jarLinkUrl(IJavaProject project, String fqName, File jarFile) { + return Optional.ofNullable(JdtJavaDocumentUriProvider.uri(project, fqName)).map(uri -> uri.toString()); } } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java index d580cc581..a5bab7e44 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java @@ -27,10 +27,8 @@ import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; import org.springframework.ide.vscode.boot.java.autowired.AutowiredHoverProvider; import org.springframework.ide.vscode.boot.java.handlers.HoverProvider; -import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.java.utils.ASTUtils; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; @@ -51,10 +49,10 @@ public abstract class AbstractInjectedIntoHoverProvider implements HoverProvider private static final int MAX_INLINE_BEANS_STRING_LENGTH = 60; private static final String INLINE_BEANS_STRING_SEPARATOR = " "; - protected BootJavaLanguageServerComponents server; + private SourceLinks sourceLinks; - public AbstractInjectedIntoHoverProvider(BootJavaLanguageServerComponents server) { - this.server = server; + public AbstractInjectedIntoHoverProvider(SourceLinks sourceLinks) { + this.sourceLinks = sourceLinks; } @Override @@ -149,18 +147,17 @@ public abstract class AbstractInjectedIntoHoverProvider implements HoverProvider } if (!injectedBeans.isEmpty()) { - SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks(server); hover.append("**"); hover.append(LiveHoverUtils.createBeansTitleMarkdown(sourceLinks, project, injectedBeans, BEANS_PREFIX_MARKDOWN, MAX_INLINE_BEANS_STRING_LENGTH, INLINE_BEANS_STRING_SEPARATOR)); hover.append("**\n"); hover.append(injectedBeans.stream() - .map(b -> "- " + LiveHoverUtils.showBeanWithResource(server, b, " ", project)) + .map(b -> "- " + LiveHoverUtils.showBeanWithResource(sourceLinks, b, " ", project)) .collect(Collectors.joining("\n"))); hover.append("\n \n"); } List wiredBeans = findWiredBeans(project, app, relevantBeans, astNode); if (!wiredBeans.isEmpty()) { - AutowiredHoverProvider.createHoverContentForBeans(server, project, hover, wiredBeans); + AutowiredHoverProvider.createHoverContentForBeans(sourceLinks, project, hover, wiredBeans); } hover.append("Bean id: `"); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java index 0ccc773b3..c13ab5b42 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java @@ -17,8 +17,8 @@ import java.util.Optional; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.MethodDeclaration; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; import org.springframework.ide.vscode.boot.java.autowired.AutowiredHoverProvider; +import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.java.utils.ASTUtils; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean; @@ -27,8 +27,8 @@ import org.springframework.ide.vscode.commons.util.Optionals; public class BeanInjectedIntoHoverProvider extends AbstractInjectedIntoHoverProvider { - public BeanInjectedIntoHoverProvider(BootJavaLanguageServerComponents server) { - super(server); + public BeanInjectedIntoHoverProvider(SourceLinks sourceLinks) { + super(sourceLinks); } @Override diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java index 981a45c00..76d555d63 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java @@ -28,8 +28,8 @@ import org.eclipse.lsp4j.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.boot.java.Annotations; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; import org.springframework.ide.vscode.boot.java.annotations.AnnotationHierarchies; +import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.java.utils.ASTUtils; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean; @@ -44,8 +44,8 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP private static Logger LOG = LoggerFactory.getLogger(ComponentInjectionsHoverProvider.class); - public ComponentInjectionsHoverProvider(BootJavaLanguageServerComponents server) { - super(server); + public ComponentInjectionsHoverProvider(SourceLinks sourceLinks) { + super(sourceLinks); } @Override diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java index 74298bb0a..75c0ba6e3 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java @@ -20,8 +20,6 @@ import java.util.stream.Collectors; import org.eclipse.lsp4j.CodeLens; import org.eclipse.lsp4j.Command; import org.eclipse.lsp4j.Range; -import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; -import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.java.utils.SpringResource; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; @@ -47,7 +45,7 @@ public class LiveHoverUtils { return buf.toString(); } - public static String showBeanWithResource(BootJavaLanguageServerComponents server, LiveBean bean, String indentStr, IJavaProject project) { + public static String showBeanWithResource(SourceLinks sourceLinks, LiveBean bean, String indentStr, IJavaProject project) { String newline = " \n"+indentStr; //Note: the double space before newline makes markdown see it as a real line break if (bean == CANT_MATCH_PROPER_BEAN) { @@ -59,7 +57,6 @@ public class LiveHoverUtils { buf.append('`'); buf.append(bean.getId()); buf.append('`'); - SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks(server); if (type != null) { // Try creating a URL link to open source for the type buf.append(newline); @@ -126,33 +123,6 @@ public class LiveHoverUtils { return true; } - public static String showBeanIdAndTypeInline(BootJavaLanguageServerComponents server, IJavaProject project, LiveBean bean) { - String id = bean.getId(); - String type = bean.getType(true); - SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks(server); - String displayType = type; - if (type != null) { - int lastDotIdx = type.lastIndexOf('.'); - if (lastDotIdx >= 0 && lastDotIdx < type.length() - 1) { - displayType = "`" + type.substring(lastDotIdx + 1) + "`"; - } - Optional url = sourceLinks.sourceLinkUrlForFQName(project, type); - if (url.isPresent()) { - displayType = Renderables.link(displayType, url.get()).toMarkdown(); - } - } - StringBuilder sb = new StringBuilder(); - sb.append('`'); - sb.append(id); - sb.append('`'); - if (displayType != null) { - sb.append(' '); - sb.append(displayType); - } - return sb.toString(); - } - - public static String showResource(SourceLinks sourceLinks, String resource, IJavaProject project) { return new SpringResource(sourceLinks, resource, project).toMarkdown(); } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java index 5ab5ea222..0a39bc172 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java @@ -22,23 +22,27 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import java.util.function.Function; import java.util.stream.Stream; +import org.apache.commons.io.IOUtils; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.ASTParser; import org.eclipse.jdt.core.dom.CompilationUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.java.IClasspathUtil; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; -import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.text.TextDocument; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -public final class CompilationUnitCache { +public final class CompilationUnitCache implements DocumentContentProvider { + + private static final Logger logger = LoggerFactory.getLogger(CompilationUnitCache.class); private static final long CU_ACCESS_EXPIRATION = 1; private JavaProjectFinder projectFinder; @@ -46,13 +50,15 @@ public final class CompilationUnitCache { private Cache uriToCu; private Cache> projectToDocs; private ProjectObserver.Listener projectListener; + private SimpleTextDocumentService documents; private ReadLock readLock; private WriteLock writeLock; - public CompilationUnitCache(JavaProjectFinder projectFinder, SimpleTextDocumentService documentService, ProjectObserver projectObserver) { + public CompilationUnitCache(JavaProjectFinder projectFinder, SimpleTextDocumentService documents, ProjectObserver projectObserver) { this.projectFinder = projectFinder; this.projectObserver = projectObserver; + this.documents = documents; projectListener = ProjectObserver.onAny(this::invalidateProject); // PT 154618835 - Avoid retaining the CU in the cache as it consumes memory if it hasn't been @@ -66,9 +72,9 @@ public final class CompilationUnitCache { readLock = lock.readLock(); writeLock = lock.writeLock(); - if (documentService != null) { - documentService.onDidChangeContent(doc -> invalidateCuForJavaFile(doc.getDocument().getId().getUri())); - documentService.onDidClose(doc -> invalidateCuForJavaFile(doc.getId().getUri())); + if (documents != null) { + documents.onDidChangeContent(doc -> invalidateCuForJavaFile(doc.getDocument().getId().getUri())); + documents.onDidClose(doc -> invalidateCuForJavaFile(doc.getId().getUri())); } if (this.projectObserver != null) { @@ -90,10 +96,14 @@ public final class CompilationUnitCache { * not pass of AST nodes to helper functions that work aynchronously or store AST nodes or ITypeBindings * for later use. The JDT ASTs are not thread safe! */ + @Deprecated public T withCompilationUnit(TextDocument document, Function requestor) { - URI uri = URI.create(document.getUri()); IJavaProject project = projectFinder.find(document.getId()).orElse(null); + URI uri = URI.create(document.getUri()); + return withCompilationUnit(project, uri, requestor); + } + public T withCompilationUnit(IJavaProject project, URI uri, Function requestor) { if (project != null) { readLock.lock(); @@ -101,15 +111,15 @@ public final class CompilationUnitCache { try { cu = uriToCu.get(uri, () -> { - CompilationUnit cUnit = parse(document, project); - projectToDocs.get(project, () -> new HashSet<>()).add(URI.create(document.getUri())); + CompilationUnit cUnit = parse(uri.toString(), fetchContent(uri).toCharArray(), project); + projectToDocs.get(project, () -> new HashSet<>()).add(uri); return cUnit; }); if (cu != null) { - projectToDocs.get(project, () -> new HashSet<>()).add(URI.create(document.getUri())); + projectToDocs.get(project, () -> new HashSet<>()).add(uri); } } catch (Exception e) { - Log.log(e); + logger.error("", e); } finally { readLock.unlock(); } @@ -121,7 +131,7 @@ public final class CompilationUnitCache { } } catch (Exception e) { - Log.log(e); + logger.error("", e); } } } @@ -129,6 +139,7 @@ public final class CompilationUnitCache { return requestor.apply(null); } + private void invalidateCuForJavaFile(String uriStr) { URI uri = URI.create(uriStr); writeLock.lock(); @@ -140,13 +151,19 @@ public final class CompilationUnitCache { } public static CompilationUnit parse(TextDocument document, IJavaProject project) throws Exception { - String[] classpathEntries = getClasspathEntries(document, project); + String[] classpathEntries = getClasspathEntries(project); String docURI = document.getUri(); String unitName = docURI.substring(docURI.lastIndexOf("/")); char[] source = document.get(0, document.getLength()).toCharArray(); return parse(source, docURI, unitName, classpathEntries); } - + + public static CompilationUnit parse(String uri, char[] source, IJavaProject project) throws Exception { + String[] classpathEntries = getClasspathEntries(project); + String unitName = uri.substring(uri.lastIndexOf("/")); + return parse(source, uri, unitName, classpathEntries); + } + public static CompilationUnit parse(char[] source, String docURI, String unitName, String[] classpathEntries) throws Exception { ASTParser parser = ASTParser.newParser(AST.JLS10); Map options = JavaCore.getOptions(); @@ -168,7 +185,7 @@ public final class CompilationUnitCache { return cu; } - private static String[] getClasspathEntries(TextDocument document, IJavaProject project) throws Exception { + private static String[] getClasspathEntries(IJavaProject project) throws Exception { if (project == null) { return new String[0]; } else { @@ -192,4 +209,16 @@ public final class CompilationUnitCache { } } } + + @Override + public String fetchContent(URI uri) throws Exception { + if (documents != null) { + TextDocument document = documents.get(uri.toString()); + if (document != null) { + return document.get(0, document.getLength()); + } + } + return IOUtils.toString(uri); + + } } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/DocumentContentProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/DocumentContentProvider.java new file mode 100644 index 000000000..1b9375f2e --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/DocumentContentProvider.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2018 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.utils; + +import java.net.URI; + +@FunctionalInterface +public interface DocumentContentProvider { + + String fetchContent(URI uri) throws Exception; + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveChangeDetectionWatchdog.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveChangeDetectionWatchdog.java index 7314408f3..095120b96 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveChangeDetectionWatchdog.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveChangeDetectionWatchdog.java @@ -35,7 +35,6 @@ import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents import org.springframework.ide.vscode.boot.java.handlers.RunningAppMatcher; import org.springframework.ide.vscode.boot.java.handlers.RunningAppProvider; import org.springframework.ide.vscode.boot.java.links.SourceLinks; -import org.springframework.ide.vscode.boot.java.links.VSCodeSourceLinks; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean; import org.springframework.ide.vscode.commons.java.IJavaProject; @@ -72,7 +71,8 @@ public class SpringLiveChangeDetectionWatchdog { ProjectObserver projectObserver, RunningAppProvider runningAppProvider, JavaProjectFinder projectFinder, - Duration pollingInterval + Duration pollingInterval, + SourceLinks sourceLinks ) { this.observedProjects = new HashSet<>(); @@ -82,7 +82,7 @@ public class SpringLiveChangeDetectionWatchdog { this.POLLING_INTERVAL_MILLISECONDS = pollingInterval == null ? DEFAULT_INTERVAL.toMillis() : pollingInterval.toMillis(); this.changeHistory = new ChangeDetectionHistory(); - this.sourceLinks = new VSCodeSourceLinks(bootJavaLanguageServerComponents); + this.sourceLinks = sourceLinks; if (projectObserver != null) { projectObserver.addListener(new Listener() { diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java index 5d01a2086..48edecf36 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java @@ -15,6 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.boot.configurationmetadata.ValueHint; +import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.metadata.types.TypeUtil; @@ -120,10 +121,10 @@ public class StsValueHint { public Renderable getDescription() { return description; } - + private static Renderable javaDocSnippet(IJavaProject project, IJavaElement je) { return Renderables.lazy(() -> { - SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks(null); + SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks((BootJavaLanguageServerComponents)null); return PropertyDocUtils.documentJavaElement(sourceLinks, project, je); }); } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java index ce73a5e29..57b7bd094 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java @@ -37,6 +37,7 @@ import javax.inject.Provider; import org.springframework.boot.convert.DurationStyle; import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.boot.metadata.ResourceHintProvider; @@ -657,7 +658,7 @@ public class TypeUtil { //TODO: handle type parameters. if (typeFromIndex != null) { - SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks(null); + SourceLinks sourceLinks = SourceLinkFactory.createSourceLinks((BootJavaLanguageServerComponents)null); IJavaProject project = getJavaProject(); ArrayList properties = new ArrayList<>(); getGetterMethods(typeFromIndex).forEach(m -> { diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/PropertyDocUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/PropertyDocUtils.java index 65b8c0a56..13bea2162 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/PropertyDocUtils.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/PropertyDocUtils.java @@ -12,7 +12,6 @@ package org.springframework.ide.vscode.boot.metadata.util; import java.util.Optional; -import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; import org.springframework.ide.vscode.boot.java.links.SourceLinks; import org.springframework.ide.vscode.commons.java.IJavaElement; import org.springframework.ide.vscode.commons.java.IJavaProject; @@ -27,15 +26,15 @@ import com.google.common.collect.ImmutableList.Builder; /** * Boot properties documentation info utils - * + * * @author Alex Boyko * */ public class PropertyDocUtils { - + /** * Generates documentation for boot property coming from java element - * + * * @param sourceLinks * @param project * @param je @@ -48,10 +47,10 @@ public class PropertyDocUtils { renderableBuilder.add(Renderables.paragraph(javadoc == null ? Renderables.NO_DESCRIPTION: javadoc.getRenderable())); return Renderables.concat(renderableBuilder.build()); } - + /** * Generates documentation for the value of some Java type. Includes signature, javadoc, link to container type. - * + * * @param sourceLinks * @param project * @param je @@ -66,7 +65,7 @@ public class PropertyDocUtils { IType containingType = je instanceof IType ? (IType) je : ((IMember)je).getDeclaringType(); if (je != null) { String type = containingType.getFullyQualifiedName(); - Optional url = SourceLinkFactory.createSourceLinks(null).sourceLinkUrlForFQName(project, type); + Optional url = sourceLinks.sourceLinkUrlForFQName(project, type); renderableBuilder.add(Renderables.lineBreak()); if (url.isPresent()) { renderableBuilder.add(Renderables.link(type, url.get())); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesDefinitionCalculator.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesDefinitionCalculator.java new file mode 100644 index 000000000..6338d7cac --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesDefinitionCalculator.java @@ -0,0 +1,237 @@ +/******************************************************************************* + * Copyright (c) 2018 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.properties.hover; + +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.eclipse.lsp4j.Location; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ide.vscode.boot.java.links.JavaElementLocationProvider; +import org.springframework.ide.vscode.boot.metadata.PropertyInfo; +import org.springframework.ide.vscode.boot.metadata.PropertyInfo.PropertySource; +import org.springframework.ide.vscode.boot.metadata.types.TypeUtil; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IMember; +import org.springframework.ide.vscode.commons.java.IMethod; +import org.springframework.ide.vscode.commons.java.IType; +import org.springframework.ide.vscode.commons.util.FuzzyMap; +import org.springframework.ide.vscode.commons.util.StringUtil; +import org.springframework.ide.vscode.commons.util.text.IDocument; +import org.springframework.ide.vscode.java.properties.parser.PropertiesAst.Key; +import org.springframework.ide.vscode.java.properties.parser.PropertiesAst.Node; +import org.springframework.ide.vscode.java.properties.parser.PropertiesAst.Value; + +import com.google.common.collect.ImmutableList; + +public class PropertiesDefinitionCalculator { + + private static final Logger log = LoggerFactory.getLogger(PropertiesDefinitionCalculator.class); + + final private PropertyFinder propertyFinder; + final private IJavaProject project; + final private JavaElementLocationProvider javaElementLocationProvider; + + public PropertiesDefinitionCalculator(JavaElementLocationProvider javaElementLocationProvider, FuzzyMap index, TypeUtil typeUtil, IDocument doc, int offset) { + this.javaElementLocationProvider = javaElementLocationProvider; + this.propertyFinder = new PropertyFinder(index, typeUtil, doc, offset); + this.project = typeUtil.getJavaProject(); + } + + public List calculate() { + Node node = propertyFinder.findNode(); + if (node instanceof Key) { + Collection propertyJavaElements = getPropertyJavaElements(((Key) node).decode()); + return getPropertyDefintion(propertyJavaElements); + } else if (node instanceof Value) { + Value value = (Value) node; + Key key = value.getParent().getKey(); + + String javaTypeFqName = getPropertyJavaTypeFqName(key.decode()); + + if (javaTypeFqName != null) { + + // Class reference value link + if ("java.lang.Class".equals(javaTypeFqName)) { + IType javaType = project.findType(value.decode()); + if (javaType != null) { + Location location = findLocation(javaType); + if (location != null) { + return ImmutableList.of(location); + } + } + } + + IType javaType = project.findType(javaTypeFqName); + if (javaType != null) { + // Enum value link + if (javaType.isEnum()) { + String enumValue = StringUtil.hyphensToUpperCase(StringUtil.camelCaseToHyphens(value.decode())); + ImmutableList.Builder list = ImmutableList.builder(); + javaType.getFields().forEach(field -> { + if (field.getElementName().equals(enumValue)) { + Location location = findLocation(field); + if (location != null) { + list.add(location); + } + } + }); + return list.build(); + } + } + + } + + + } + return ImmutableList.of(); + } + + private List getPropertyDefintion(Collection propertyJavaElements) { + return propertyJavaElements.stream().map(this::findLocation).filter(Objects::nonNull).collect(Collectors.toList()); + } + + private Location findLocation(IMember element) { + return javaElementLocationProvider.findLocation(project, element); + } + + private String getPropertyJavaTypeFqName(String propertyKey) { + PropertyInfo best = propertyFinder.findBestHoverMatch(propertyKey); + if (best != null) { + String type = best.getType(); + // Trim down generic type if present + int idx = type == null ? -1 : type.indexOf('<'); + return idx < 0 ? type : type.substring(0, idx); + } + return null; + } + + private Collection getPropertyJavaElements(String propertyKey) { + PropertyInfo best = propertyFinder.findBestHoverMatch(propertyKey); + if (best != null) { + List sources = best.getSources(); + if (sources != null) { + ImmutableList.Builder elements = ImmutableList.builder(); + for (PropertySource source : sources) { + String typeName = source.getSourceType(); + if (typeName!=null) { + IType type = project.findType(typeName); + IMethod method = null; + if (type!=null) { + String methodSig = source.getSourceMethod(); + if (methodSig!=null) { + method = getMethod(type, methodSig); + } else { + method = getSetter(type, best); + } + } + if (method!=null) { + elements.add(method); + } else if (type!=null) { + elements.add(type); + } + } + } + return elements.build(); + } + } + return ImmutableList.of(); + } + + private IMethod getMethod(IType type, String methodSig) { + String name = getMethodName(methodSig); + //TODO: This code assumes 0 arguments, which is the case currently for all + // 'real' data in spring jars. + IMethod m = type.getMethod(name, Stream.empty()); + if (m!=null) { + return m; + } + //try find a method with the same name. + return type.getMethods() + .filter(meth -> name.equals(meth.getElementName())) + .findFirst() + .orElse(null); + } + + private static String getMethodName(String methodSig) { + String name; + int nameEnd = methodSig.indexOf('('); + if (nameEnd>=0) { + name = methodSig.substring(0, nameEnd); + int space = name.lastIndexOf(' '); + if (space >= 0) { + name = name.substring(space + 1); + } + } else { + name = methodSig; + } + return name; + } + + /** + * Attempt to find corresponding setter method for a given property. + * @return setter method, or null if not found. + */ + private IMethod getSetter(IType type, PropertyInfo propertyInfo) { + try { + String propName = propertyInfo.getName(); + String setterName = "set" + +Character.toUpperCase(propName.charAt(0)) + +toCamelCase(propName.substring(1)); + String sloppySetterName = setterName.toLowerCase(); + + IMethod sloppyMatch = null; + for (IMethod m : type.getMethods().collect(Collectors.toList())) { + String mname = m.getElementName(); + if (setterName.equals(mname)) { + //found 'exact' name match... done + return m; + } else if (mname.toLowerCase().equals(sloppySetterName)) { + sloppyMatch = m; + } + } + return sloppyMatch; + } catch (Exception e) { + log.error("", e); + return null; + } + } + + /** + * Convert hyphened name to camel case name. It is + * safe to call this on an already camel-cased name. + */ + private String toCamelCase(String name) { + if (name.isEmpty()) { + return name; + } else { + StringBuilder camel = new StringBuilder(); + char[] chars = name.toCharArray(); + for (int i = 0; i < chars.length; i++) { + char c = chars[i]; + if (c=='-') { + i++; + if (i index; - private TypeUtil typeUtil; - private IDocument doc; - private int offset; - private AntlrParser parser; - + + private PropertyFinder propertyFinder; + PropertiesHoverCalculator(FuzzyMap index, TypeUtil typeUtil, IDocument doc, int offset) { - this.index = index; - this.typeUtil = typeUtil; - this.doc = doc; - this.offset = offset; - this.parser = new AntlrParser(); + this.propertyFinder = new PropertyFinder(index, typeUtil, doc, offset); } - + Tuple2 calculate() { - ParseResults parseResults = parser.parse(doc.get()); - Node node = parseResults.ast.findNode(offset); + Node node = propertyFinder.findNode(); if (node instanceof Value) { return getValueHover((Value)node); } else if (node instanceof Key) { @@ -74,35 +60,24 @@ class PropertiesHoverCalculator { } return null; } - - private DocumentRegion createRegion(IDocument doc, Node value) { - // Trim trailing spaces (there is no leading white space already) - int length = value.getLength(); - try { - length = doc.get(value.getOffset(), value.getLength()).length(); - } catch (BadLocationException e) { - // ignore - } - return new DocumentRegion(doc, value.getOffset(), value.getOffset() + length); - } - + private Tuple2 getPropertyHover(Key property) { - PropertyInfo best = findBestHoverMatch(property.decode()); + PropertyInfo best = propertyFinder.findBestHoverMatch(property.decode()); if (best == null) { return null; } else { Renderable renderable = InformationTemplates.createHover(best); - DocumentRegion region = createRegion(doc, property); + DocumentRegion region = propertyFinder.createRegion(property); return Tuples.of(renderable, region.asRegion()); } } - + private Tuple2 getValueHover(Value value) { - DocumentRegion valueRegion = createRegion(doc, value).trimStart(SPACES).trimEnd(SPACES); - if (valueRegion.getStart() <= offset && offset < valueRegion.getEnd()) { + DocumentRegion valueRegion = propertyFinder.createRegion(value).trimStart(SPACES).trimEnd(SPACES); + if (valueRegion.getStart() <= propertyFinder.offset && propertyFinder.offset < valueRegion.getEnd()) { String valueString = valueRegion.toString(); String propertyName = value.getParent().getKey().decode(); - Type type = getValueType(index, typeUtil, propertyName); + Type type = getValueType(propertyFinder.index, propertyFinder.typeUtil, propertyName); if (TypeUtil.isSequencable(type)) { //It is useful to provide content assist for the values in the list when entering a list type = TypeUtil.getDomainType(type); @@ -110,14 +85,14 @@ class PropertiesHoverCalculator { if (TypeUtil.isClass(type)) { //Special case. We want to provide hoverinfos more liberally than what's suggested for completions (i.e. even class names //that are not suggested by the hints because they do not meet subtyping constraints should be hoverable and linkable! - StsValueHint hint = StsValueHint.className(valueString, typeUtil); + StsValueHint hint = StsValueHint.className(valueString, propertyFinder.typeUtil); if (hint!=null) { return Tuples.of(createRenderable(hint), valueRegion.asRegion()); } } //Hack: pretend to invoke content-assist at the end of the value text. This should provide hints applicable to that value // then show hoverinfo based on that. That way we can avoid duplication a lot of similar logic to compute hoverinfos and hyperlinks. - Collection hints = getValueHints(index, typeUtil, valueString, propertyName, EnumCaseMode.ALIASED); + Collection hints = getValueHints(propertyFinder.index, propertyFinder.typeUtil, valueString, propertyName, EnumCaseMode.ALIASED); if (hints!=null) { Optional hint = hints.stream().filter(h -> valueString.equals(h.getValue())).findFirst(); if (hint.isPresent()) { @@ -127,7 +102,7 @@ class PropertiesHoverCalculator { } return null; } - + private Renderable createRenderable(StsValueHint hint) { Renderable description = hint.getDescription(); try { @@ -151,36 +126,4 @@ class PropertiesHoverCalculator { return description; } - /** - * Search known properties for the best 'match' to show as hover data. - */ - private PropertyInfo findBestHoverMatch(String propName) { - PropertyInfo propertyInfo = index.get(propName); - if (propertyInfo == null) { - propertyInfo = SpringPropertyIndex.findLongestValidProperty(index, propName); - } - return propertyInfo; -// //TODO: optimize, should be able to use index's treemap to find this without iterating all entries. -// PropertyInfo best = null; -// int bestCommonPrefixLen = 0; //We try to pick property with longest common prefix -// int bestExtraLen = Integer.MAX_VALUE; -// for (PropertyInfo candidate : index) { -// int commonPrefixLen = StringUtil.commonPrefixLength(propName, candidate.getId()); -// int extraLen = candidate.getId().length()-commonPrefixLen; -// if (commonPrefixLen==propName.length() && extraLen==0) { -// //exact match found, can stop searching for better matches -// return candidate; -// } -// //candidate is better if... -// if (commonPrefixLen>bestCommonPrefixLen // it has a longer common prefix -// || commonPrefixLen==bestCommonPrefixLen && extraLen index; + final TypeUtil typeUtil; + final IDocument doc; + final int offset; + final AntlrParser parser; + + PropertyFinder(FuzzyMap index, TypeUtil typeUtil, IDocument doc, int offset) { + this.index = index; + this.typeUtil = typeUtil; + this.doc = doc; + this.offset = offset; + this.parser = new AntlrParser(); + } + + Node findNode() { + ParseResults parseResults = parser.parse(doc.get()); + return parseResults.ast.findNode(offset); + } + + DocumentRegion createRegion(Node value) { + // Trim trailing spaces (there is no leading white space already) + int length = value.getLength(); + try { + length = doc.get(value.getOffset(), value.getLength()).length(); + } catch (BadLocationException e) { + // ignore + } + return new DocumentRegion(doc, value.getOffset(), value.getOffset() + length); + } + + /** + * Search known properties for the best 'match' to show as hover data. + */ + PropertyInfo findBestHoverMatch(String propName) { + PropertyInfo propertyInfo = index.get(propName); + if (propertyInfo == null) { + propertyInfo = SpringPropertyIndex.findLongestValidProperty(index, propName); + } + return propertyInfo; +// //TODO: optimize, should be able to use index's treemap to find this without iterating all entries. +// PropertyInfo best = null; +// int bestCommonPrefixLen = 0; //We try to pick property with longest common prefix +// int bestExtraLen = Integer.MAX_VALUE; +// for (PropertyInfo candidate : index) { +// int commonPrefixLen = StringUtil.commonPrefixLength(propName, candidate.getId()); +// int extraLen = candidate.getId().length()-commonPrefixLen; +// if (commonPrefixLen==propName.length() && extraLen==0) { +// //exact match found, can stop searching for better matches +// return candidate; +// } +// //candidate is better if... +// if (commonPrefixLen>bestCommonPrefixLen // it has a longer common prefix +// || commonPrefixLen==bestCommonPrefixLen && extraLen url = new VSCodeSourceLinks(null).sourceLinkUrlForFQName(project, "com.example.EmptyBoot15WebAppApplication"); + Optional url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null)).sourceLinkUrlForFQName(project, "com.example.EmptyBoot15WebAppApplication"); assertTrue(url.isPresent()); Path projectPath = Paths.get(project.pom().getParent()); URI uri = URI.create(url.get()); - + // Use File to get rid of the fragment parts of the URL. The URL may have fragments that indicate line and column numbers uri = new File(uri.getPath()).toURI(); @@ -72,7 +73,7 @@ public class VSCodeSourceLinksTest { @Test public void testJarUrl() throws Exception { MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app"); - Optional url = new VSCodeSourceLinks(null).sourceLinkUrlForFQName(project, "org.springframework.boot.autoconfigure.SpringBootApplication"); + Optional url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null)).sourceLinkUrlForFQName(project, "org.springframework.boot.autoconfigure.SpringBootApplication"); assertTrue(url.isPresent()); String headerPart = url.get().substring(0, url.get().indexOf('?')); assertEquals("jdt://contents/spring-boot-autoconfigure-1.5.8.RELEASE.jar/org.springframework.boot.autoconfigure/SpringBootApplication.class", headerPart); @@ -83,7 +84,7 @@ public class VSCodeSourceLinksTest { @Test public void testJarUrlInnerType() throws Exception { MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app"); - Optional url = new VSCodeSourceLinks(null).sourceLinkUrlForFQName(project, "org.springframework.web.client.RestTemplate$AcceptHeaderRequestCallback"); + Optional url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null)).sourceLinkUrlForFQName(project, "org.springframework.web.client.RestTemplate$AcceptHeaderRequestCallback"); assertTrue(url.isPresent()); String headerPart = url.get().substring(0, url.get().indexOf('?')); assertEquals("jdt://contents/spring-web-4.3.12.RELEASE.jar/org.springframework.web.client/RestTemplate$AcceptHeaderRequestCallback.class", headerPart); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java index 22fd6f9c0..7e7886a80 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java @@ -29,11 +29,15 @@ import org.springframework.ide.vscode.boot.app.BootLanguageServerParams; import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest; import org.springframework.ide.vscode.boot.editor.harness.PropertyIndexHarness; import org.springframework.ide.vscode.boot.java.handlers.RunningAppProvider; +import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; +import org.springframework.ide.vscode.boot.java.links.SourceLinks; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.boot.java.value.ValueCompletionProcessor; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; +import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.maven.java.MavenJavaProject; import org.springframework.ide.vscode.commons.util.text.LanguageId; import org.springframework.ide.vscode.languageserver.testharness.Editor; @@ -90,6 +94,11 @@ public class ValueCompletionTest { null ); } + + @Bean SourceLinks sourceLinks(SimpleTextDocumentService documents, CompilationUnitCache cuCache) { + return SourceLinkFactory.NO_SOURCE_LINKS; + } + } @Before diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java index 537176254..a72f4d2d3 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java @@ -16,14 +16,30 @@ import static org.springframework.ide.vscode.boot.properties.reconcile.Applicati import static org.springframework.ide.vscode.languageserver.testharness.ClasspathTestUtil.getOutputFolder; import static org.springframework.ide.vscode.languageserver.testharness.TestAsserts.assertContains; +import java.net.URI; +import java.net.URL; import java.nio.charset.Charset; import java.nio.file.Path; import java.time.Duration; +import java.util.Arrays; import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; +import org.eclipse.jdt.core.dom.ASTVisitor; +import org.eclipse.jdt.core.dom.AbstractTypeDeclaration; +import org.eclipse.jdt.core.dom.EnumConstantDeclaration; +import org.eclipse.jdt.core.dom.EnumDeclaration; +import org.eclipse.jdt.core.dom.MethodDeclaration; +import org.eclipse.jdt.core.dom.SimpleName; +import org.eclipse.jdt.core.dom.SingleVariableDeclaration; +import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.lsp4j.CompletionItem; import org.eclipse.lsp4j.Diagnostic; -import org.junit.Before; +import org.eclipse.lsp4j.Location; +import org.eclipse.lsp4j.Range; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,22 +47,28 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.ide.vscode.boot.app.BootLanguageServerInitializer; import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest; import org.springframework.ide.vscode.boot.bootiful.PropertyEditorTestConf; import org.springframework.ide.vscode.boot.editor.harness.AbstractPropsEditorTest; import org.springframework.ide.vscode.boot.editor.harness.StyledStringMatcher; +import org.springframework.ide.vscode.boot.java.links.JavaDocumentUriProvider; +import org.springframework.ide.vscode.boot.java.links.SourceLinks; +import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.boot.metadata.CachingValueProvider; import org.springframework.ide.vscode.boot.metadata.PropertiesLoader; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.IType; +import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.maven.java.MavenJavaProject; +import org.springframework.ide.vscode.commons.util.BadLocationException; import org.springframework.ide.vscode.commons.util.text.LanguageId; +import org.springframework.ide.vscode.commons.util.text.TextDocument; import org.springframework.ide.vscode.languageserver.testharness.Editor; import org.springframework.ide.vscode.project.harness.ProjectsHarness.ProjectCustomizer; import org.springframework.test.context.junit4.SpringRunner; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; /** @@ -59,6 +81,15 @@ import com.google.common.io.Files; @Import(PropertyEditorTestConf.class) public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { + @Autowired + CompilationUnitCache cuCache; + + @Autowired + SimpleTextDocumentService docService; + + @Autowired + JavaDocumentUriProvider javaDocumentUriProvider; + @Configuration static class TestConf { @Bean LanguageId defaultLanguageId() { return LanguageId.BOOT_PROPERTIES; @@ -275,7 +306,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertContains("\"name\": \"foo.counter\"", Files.toString(metadataFile.toFile(), Charset.forName("UTF8"))); } - @Ignore @Test public void testHyperlinkTargets() throws Exception { + @Test public void testHyperlinkTargets() throws Exception { System.out.println(">>> testHyperlinkTargets"); IJavaProject p = createPredefinedMavenProject("tricky-getters-boot-1.3.1-app"); useProject(p); @@ -286,20 +317,260 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { "flyway.init-sqls=a,b,c\n" ); - editor.assertLinkTargets("server", - "org.springframework.boot.autoconfigure.web.ServerProperties.setPort(Integer)" + assertLinkTargets(editor, "server", p, + method("org.springframework.boot.autoconfigure.web.ServerProperties", "setPort", "java.lang.Integer")); + + assertLinkTargets(editor, "data", p, + method("org.springframework.boot.autoconfigure.jdbc.DataSourceConfigMetadata", "hikariDataSource"), + method("org.springframework.boot.autoconfigure.jdbc.DataSourceConfigMetadata", "tomcatDataSource"), + method("org.springframework.boot.autoconfigure.jdbc.DataSourceConfigMetadata", "dbcpDataSource") ); - editor.assertLinkTargets("data", - "org.springframework.boot.autoconfigure.jdbc.DataSourceConfigMetadata.hikariDataSource()", - "org.springframework.boot.autoconfigure.jdbc.DataSourceConfigMetadata.tomcatDataSource()", - "org.springframework.boot.autoconfigure.jdbc.DataSourceConfigMetadata.dbcpDataSource()" - ); - editor.assertLinkTargets("flyway", - "org.springframework.boot.autoconfigure.flyway.FlywayProperties.setInitSqls(List)"); + + assertLinkTargets(editor, "flyway", p, method("org.springframework.boot.autoconfigure.flyway.FlywayProperties", "setInitSqls", "java.util.List")); System.out.println("<<< testHyperlinkTargets"); } - @Ignore @Test public void testHyperlinkTargetsLoggingLevel() throws Exception { + void assertLinkTargets(Editor editor, String hoverOver, IJavaProject project, JavaMethod... methods) throws Exception { + Set expectedLocations = Arrays.stream(methods).map(method -> { + try { + return getLocation(project, method); + } catch (Exception e) { + throw new IllegalStateException(e); + } + }).collect(Collectors.toSet()); + + editor.assertLinkTargets(hoverOver, expectedLocations); + } + + void assertLinkTargets(Editor editor, String hoverOver, IJavaProject project, String typeFqName) throws Exception { + + Location expectedLocation = getLocation(project, typeFqName); + + System.out.println("Expected Location: " + expectedLocation); + + editor.assertLinkTargets(hoverOver, ImmutableSet.of(expectedLocation)); + } + + void assertLinkTargets(Editor editor, String hoverOver, IJavaProject project, JavaField field) throws Exception { + + Location expectedLocation = getLocation(project, field); + + System.out.println("Expected Location: " + expectedLocation); + + editor.assertLinkTargets(hoverOver, ImmutableSet.of(expectedLocation)); + } + + static private JavaMethod method(String fqClassName, String methodName, String... params) { + return new JavaMethod(fqClassName, methodName, params); + } + + static private JavaField field(String fqClassName, String name) { + return new JavaField(fqClassName, name); + } + + static class JavaMethod { + public final String fqName; + public final String methodName; + public final String[] params; + public JavaMethod(String fqClassName, String methodName, String... params) { + this.fqName = fqClassName; + this.methodName = methodName; + this.params = params; + } + @Override + public String toString() { + return "JavaMethod [fqName=" + fqName + ", methodName=" + methodName + ", params=" + Arrays.toString(params) + + "]"; + } + } + + static class JavaField { + public final String fqName; + public final String fieldName; + public JavaField(String fqName, String fieldName) { + super(); + this.fqName = fqName; + this.fieldName = fieldName; + } + @Override + public String toString() { + return "JavaField [fqName=" + fqName + ", fieldName=" + fieldName + "]"; + } + } + + private Location getLocation(IJavaProject project, String fqName) throws Exception { + Location loc = new Location(); + Optional sourceUrl = SourceLinks.source(project, fqName); + if (sourceUrl.isPresent()) { + + URI docUri = javaDocumentUriProvider.docUri(project, fqName); + loc.setUri(docUri.toString()); + + String typeName = fqName.substring(fqName.lastIndexOf('.') + 1); + URI sourceUri = sourceUrl.get().toURI(); + Range r = cuCache.withCompilationUnit(project, sourceUri, (cu) -> { + try { + TextDocument doc = new TextDocument(sourceUrl.get().toString(), LanguageId.JAVA); + doc.setText(cuCache.fetchContent(sourceUri)); + AtomicReference range = new AtomicReference<>(null); + cu.accept(new ASTVisitor() { + + private boolean proceessTypeNode(TextDocument doc, String typeName, + AtomicReference range, AbstractTypeDeclaration node) { + SimpleName nameNode = node.getName(); + if (nameNode.getIdentifier().equals(typeName)) { + try { + range.set(doc.toRange(nameNode.getStartPosition(), nameNode.getLength())); + return false; + } catch (BadLocationException e) { + throw new IllegalStateException(e); + } + } + return true; + } + + @Override + public boolean visit(TypeDeclaration node) { + return proceessTypeNode(doc, typeName, range, node); + } + + @Override + public boolean visit(EnumDeclaration node) { + return proceessTypeNode(doc, typeName, range, node); + } + + }); + return range.get(); + } catch (Exception e) { + throw new IllegalStateException(e); + } + }); + if (r == null) { + throw new IllegalStateException("Couldn't find " + fqName); + } + loc.setRange(r); + } + return loc; + } + + private Location getLocation(IJavaProject project, JavaMethod method) throws Exception { + Location loc = new Location(); + Optional sourceUrl = SourceLinks.source(project, method.fqName); + if (sourceUrl.isPresent()) { + + URI docUri = javaDocumentUriProvider.docUri(project, method.fqName); + loc.setUri(docUri.toString()); + + URI sourceUri = sourceUrl.get().toURI(); + Range r = cuCache.withCompilationUnit(project, sourceUri, (cu) -> { + try { + AtomicReference range = new AtomicReference<>(null); + TextDocument doc = new TextDocument(sourceUrl.get().toString(), LanguageId.JAVA); + doc.setText(cuCache.fetchContent(sourceUri)); + cu.accept(new ASTVisitor() { + + @Override + public boolean visit(MethodDeclaration node) { + SimpleName nameNode = node.getName(); + if (nameNode.getIdentifier().equals(method.methodName)) { + if (node.parameters().size() != method.params.length) { + return false; + } + int i = 0; + for (Object _p : node.parameters()) { + if (_p instanceof SingleVariableDeclaration) { + SingleVariableDeclaration p = (SingleVariableDeclaration) _p; + String fqName = p.getType().resolveBinding().getErasure().getQualifiedName(); + if (!fqName.equals(method.params[i++])) { + return false; + } + } else { + return false; + } + } + try { + range.set(doc.toRange(nameNode.getStartPosition(), nameNode.getLength())); + } catch (BadLocationException e) { + throw new IllegalStateException(e); + } + } + return false; + } + + }); + return range.get(); + } catch (Exception e) { + throw new IllegalStateException(e); + } + }); + if (r == null) { + throw new IllegalStateException("Couldn't find " + method); + } + loc.setRange(r); + } + return loc; + } + + private Location getLocation(IJavaProject project, JavaField field) throws Exception { + Location loc = new Location(); + + Optional sourceUrl = SourceLinks.source(project, field.fqName); + if (sourceUrl.isPresent()) { + + URI sourceUri = sourceUrl.get().toURI(); + + URI docUri = javaDocumentUriProvider.docUri(project, field.fqName); + loc.setUri(docUri.toString()); + + Range r = cuCache.withCompilationUnit(project, sourceUri, (cu) -> { + try { + AtomicReference range = new AtomicReference<>(null); + TextDocument doc = new TextDocument(sourceUrl.get().toString(), LanguageId.JAVA); + doc.setText(cuCache.fetchContent(sourceUri)); + cu.accept(new ASTVisitor() { + + boolean foundType = false; + + @Override + public boolean visit(EnumConstantDeclaration node) { + if (foundType) { + SimpleName nameNode = node.getName(); + if (nameNode.getIdentifier().equals(field.fieldName)) { + try { + range.set(doc.toRange(nameNode.getStartPosition(), nameNode.getLength())); + } catch (BadLocationException e) { + throw new IllegalStateException(e); + } + } + } + return true; + } + + @Override + public boolean visit(EnumDeclaration node) { + if (node.getName().getIdentifier() + .equals(field.fqName.substring(field.fqName.lastIndexOf('.') + 1))) { + foundType = true; + return true; + } + return false; + } + + }); + return range.get(); + } catch (Exception e) { + throw new IllegalStateException(e); + } + }); + if (r == null) { + throw new IllegalStateException("Couldn't find " + field); + } + loc.setRange(r); + } + return loc; + } + + @Test public void testHyperlinkTargetsLoggingLevel() throws Exception { System.out.println(">>> testHyperlinkTargetsLoggingLevel"); IJavaProject p = createPredefinedMavenProject("tricky-getters-boot-1.3.1-app"); @@ -308,9 +579,8 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { Editor editor = newEditor( "logging.level.com.acme=INFO\n" ); - editor.assertLinkTargets("level", - "org.springframework.boot.logging.LoggingApplicationListener" - ); + + assertLinkTargets(editor, "level", p, "org.springframework.boot.logging.LoggingApplicationListener"); System.out.println("<<< testHyperlinkTargetsLoggingLevel"); } @@ -1422,16 +1692,17 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { ); } - @Ignore @Test public void testClassReferenceInValueLink() throws Exception { + @Test public void testClassReferenceInValueLink() throws Exception { Editor editor; - useProject(createPredefinedMavenProject("empty-boot-1.3.0-with-mongo")); + MavenJavaProject project = createPredefinedMavenProject("empty-boot-1.3.0-with-mongo"); + useProject(project); editor = newEditor( "#stuff\n" + "spring.data.mongodb.field-naming-strategy=org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy\n" + "#more stuff" ); - editor.assertLinkTargets("org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy", "org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy"); + assertLinkTargets(editor, "org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy", project, "org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy"); //Linking should also work for types that aren't valid based on the constraints editor = newEditor( @@ -1439,7 +1710,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { "spring.data.mongodb.field-naming-strategy=java.lang.String\n" + "#more stuff" ); - editor.assertLinkTargets("java.lang.String", "java.lang.String"); + assertLinkTargets(editor, "java.lang.String", project, "java.lang.String"); } @Test public void testCommaListReconcile() throws Exception { @@ -1601,9 +1872,9 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { editor.assertHoverContains("red", "Hot and delicious"); } - - @Ignore @Test public void testEnumInValueLink() throws Exception { - useProject(createPredefinedMavenProject("enums-boot-1.3.2-app")); + @Test public void testEnumInValueLink() throws Exception { + MavenJavaProject project = createPredefinedMavenProject("enums-boot-1.3.2-app"); + useProject(project); data("my.background", "demo.Color", null, "Color to use as default background."); Editor editor; @@ -1611,12 +1882,25 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { editor = newEditor( "my.background: RED" ); - editor.assertLinkTargets("RED", "demo.Color.RED"); + assertLinkTargets(editor, "RED", project, field("demo.Color", "RED")); editor = newEditor( "my.background=red" ); - editor.assertLinkTargets("red", "demo.Color.RED"); + assertLinkTargets(editor, "red", project, field("demo.Color", "RED")); + } + + @Test public void testEnumInPojoField() throws Exception { + MavenJavaProject project = createPredefinedMavenProject("enum-def-nav"); + useProject(project); + + Editor editor; + + editor = newEditor( + "my.screen.background=green" + ); + assertLinkTargets(editor, "background", project, method("com.example.demo.MyProperties$Screen", "getScreen")); + assertLinkTargets(editor, "green", project, field("com.example.demo.Color", "GREEN")); } @Test public void testNoHoverForUnrecognizedProperty() throws Exception { diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01e67997377a393fd672c7dcde9dccbedf0cb1e9 GIT binary patch literal 48337 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/mvnw.cmd new file mode 100644 index 000000000..e5cfb0ae9 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/mvnw.cmd @@ -0,0 +1,161 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/pom.xml new file mode 100644 index 000000000..51f900ed3 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + com.example + enum-def-nav + 0.0.1-SNAPSHOT + jar + + enum-def-nav + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.1.0.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/Color.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/Color.java new file mode 100644 index 000000000..8bfa72d60 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/Color.java @@ -0,0 +1,7 @@ +package com.example.demo; + +public enum Color { + RED, + GREEN, + BLUE +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/EnumDefNavApplication.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/EnumDefNavApplication.java new file mode 100644 index 000000000..22f0f7d7b --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/EnumDefNavApplication.java @@ -0,0 +1,12 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class EnumDefNavApplication { + + public static void main(String[] args) { + SpringApplication.run(EnumDefNavApplication.class, args); + } +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/MyProperties.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/MyProperties.java new file mode 100644 index 000000000..b531d6683 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/main/java/com/example/demo/MyProperties.java @@ -0,0 +1,65 @@ +package com.example.demo; + +import java.util.List; +import java.util.Map; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("my") +public class MyProperties { + + public static class Screen { + private Color foreground; + private Color background; + public Color getForeground() { + return foreground; + } + public void setForeground(Color foreground) { + this.foreground = foreground; + } + public Color getBackground() { + return background; + } + public void setBackground(Color background) { + this.background = background; + } + } + + private Screen screen; + private Screen[] screenArray; + private List screenList; + private Map screenMap; + + public Screen getScreen() { + return screen; + } + + public void setScreen(Screen screen) { + this.screen = screen; + } + + public Screen[] getScreenArray() { + return screenArray; + } + + public void setScreenArray(Screen[] screenArray) { + this.screenArray = screenArray; + } + + public List getScreenList() { + return screenList; + } + + public void setScreenList(List screenList) { + this.screenList = screenList; + } + + public Map getScreenMap() { + return screenMap; + } + + public void setScreenMap(Map screenMap) { + this.screenMap = screenMap; + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/test/java/com/example/demo/EnumDefNavApplicationTests.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/test/java/com/example/demo/EnumDefNavApplicationTests.java new file mode 100644 index 000000000..f5b8fbd63 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enum-def-nav/src/test/java/com/example/demo/EnumDefNavApplicationTests.java @@ -0,0 +1,16 @@ +package com.example.demo; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class EnumDefNavApplicationTests { + + @Test + public void contextLoads() { + } + +}