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

Adjustments for CodeLens for boot hints

Browse Source
This commit is contained in:
BoykoAlex
2018-08-17 13:12:20 -04:00
parent 638dcfa994
commit d1e960f3fa
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,7 @@ public class AutowiredHoverProvider implements HoverProvider {
List<LiveBean> autowiredBeans) {
hover.append("**Autowired `");
hover.append(definedBean.getId());
hover.append("` &rarr; ");
hover.append("` &larr; ");
if (LiveHoverUtils.doBeansFitInline(autowiredBeans, MAX_INLINE_BEANS_STRING_LENGTH - definedBean.getId().length(),
INLINE_BEANS_STRING_SEPARATOR)) {
hover.append(autowiredBeans.stream().map(b -> LiveHoverUtils.showBeanInline(server, project, b))

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

@@ -11,7 +11,7 @@
package org.springframework.ide.vscode.boot.java.handlers;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Optional;
import org.eclipse.jdt.core.dom.ASTNode;
@@ -92,7 +92,7 @@ public class BootJavaHoverProvider implements HoverHandler {
public CodeLens[] getLiveHoverHints(final TextDocument document, final SpringBootApp[] runningBootApps) {
return server.getCompilationUnitCache().withCompilationUnit(document, cu -> {
Collection<CodeLens> result = new HashSet<>();
Collection<CodeLens> result = new LinkedHashSet<>();
try {
if (cu != null) {
cu.accept(new ASTVisitor() {

14
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
View File

@@ -176,7 +176,7 @@ public class AutowiredHoverProviderTest {
editor.assertHighlights("@Component", "@Inject");
editor.assertTrimmedHover("@Inject",
"**Autowired `autowiredClass` &rarr; `dependencyA`**\n" +
"**Autowired `autowiredClass` &larr; `dependencyA`**\n" +
"- Bean: `dependencyA` \n" +
" Type: `com.example.DependencyA` \n" +
" Resource: `" + Paths.get("com/example/DependencyA.class") + "`\n" +
@@ -231,7 +231,7 @@ public class AutowiredHoverProviderTest {
editor.assertHighlights("@Component", "@Autowired");
editor.assertTrimmedHover("@Autowired",
"**Autowired `autowiredClass` &rarr; `dependencyA` `dependencyB`**\n" +
"**Autowired `autowiredClass` &larr; `dependencyA` `dependencyB`**\n" +
"- Bean: `dependencyA` \n" +
" Type: `com.example.DependencyA` \n" +
" Resource: `" + Paths.get("com/example/DependencyA.class") + "`\n" +
@@ -382,11 +382,11 @@ public class AutowiredHoverProviderTest {
Editor editor = harness.newEditor(LanguageId.JAVA, FOO_IMPL_CONTENTS);
editor.assertHighlights("@Component", "@Autowired", "@Autowired");
editor.assertHoverContains("@Autowired", 1,
"**Autowired `defaultFoo` &rarr; `superBean`**\n" +
"**Autowired `defaultFoo` &larr; `superBean`**\n" +
"- Bean: `superBean` \n" +
" Type: `com.example.FooImplementation`");
editor.assertHoverContains("@Autowired", 2,
"**Autowired `defaultFoo` &rarr; `scheduler`**\n" +
"**Autowired `defaultFoo` &larr; `scheduler`**\n" +
"- Bean: `scheduler` \n" +
" Type: `org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler`");
}
@@ -436,7 +436,7 @@ public class AutowiredHoverProviderTest {
);
editor.assertHighlights("@Controller", "@Autowired");
editor.assertHoverContains("@Autowired",
"**Autowired `myController` &rarr; `restTemplate`**\n" +
"**Autowired `myController` &larr; `restTemplate`**\n" +
"- Bean: `restTemplate` \n" +
" Type: `org.springframework.web.client.RestTemplate`"
);
@@ -493,7 +493,7 @@ public class AutowiredHoverProviderTest {
editor.assertHighlights("@Component", "SomeComponent");
editor.assertTrimmedHover("SomeComponent", 2,
"**Autowired `someComponent` &rarr; `dependencyA` `dependencyB`**\n" +
"**Autowired `someComponent` &larr; `dependencyA` `dependencyB`**\n" +
"- Bean: `dependencyA` \n" +
" Type: `com.example.DependencyA`\n" +
"- Bean: `dependencyB` \n" +
@@ -644,7 +644,7 @@ public class AutowiredHoverProviderTest {
editor.assertHighlights("@Component", "@Autowired");
editor.assertTrimmedHover("@Autowired", 1,
"**Autowired `anotherComponent` &rarr; `anonymousBeanFactory`**\n" +
"**Autowired `anotherComponent` &larr; `anonymousBeanFactory`**\n" +
"- Bean: `anonymousBeanFactory` \n" +
" Type: `com.example.SomeComponent$1`\n" +
" \n" +

4
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ComponentInjectionsHoverProviderTest.java
View File

@@ -499,7 +499,7 @@ public class ComponentInjectionsHoverProviderTest {
editor.assertHighlights("@Component", "AutowiredClass");
editor.assertTrimmedHover("@Component",
"**Injected `autowiredClass` &rarr; _not injected anywhere_** \n" +
"**Autowired `autowiredClass` &rarr; `dependencyA` `dependencyB`**\n" +
"**Autowired `autowiredClass` &larr; `dependencyA` `dependencyB`**\n" +
"- Bean: `dependencyA` \n" +
" Type: `com.example.DependencyA` \n" +
" Resource: `com/example/DependencyA.class`\n" +
@@ -555,7 +555,7 @@ public class ComponentInjectionsHoverProviderTest {
editor.assertHighlights("@Component", "@Autowired");
editor.assertTrimmedHover("@Component",
"**Injected `autowiredClass` &rarr; _not injected anywhere_** \n" +
"**Autowired `autowiredClass` &rarr; `dependencyA` `dependencyB`**\n" +
"**Autowired `autowiredClass` &larr; `dependencyA` `dependencyB`**\n" +
"- Bean: `dependencyA` \n" +
" Type: `com.example.DependencyA`\n" +
"- Bean: `dependencyB` \n" +