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

Fix broken XML property name CA and hyperlink

Browse Source
This commit is contained in:
BoykoAlex
2019-05-12 19:04:24 -04:00
parent 812c2cab44
commit a593cfbab7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/completions/PropertyNameCompletionProposalProvider.java
View File

@@ -17,6 +17,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.eclipse.lsp4j.CompletionItemKind;
import org.eclipse.lsp4xml.dom.DOMAttr;
@@ -32,8 +33,6 @@ import org.springframework.ide.vscode.commons.util.Renderable;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import reactor.core.publisher.Flux;
/**
* @author Martin Lippert
*/
@@ -65,10 +64,9 @@ public class PropertyNameCompletionProposalProvider implements XMLCompletionProv
String beanClass = identifyBeanClass(node);
if (beanClass != null && beanClass.length() > 0) {
final String searchPrefix = prefix;
propertyNameCandidateMethods(project, beanClass)
return propertyNameCandidateMethods(project, beanClass)
.filter(method -> getPropertyName(method).startsWith(searchPrefix))
.map(method -> createProposal(method, doc, offset, tokenOffset, tokenEnd))
.toStream()
.collect(Collectors.toList());
}
};
@@ -124,9 +122,10 @@ public class PropertyNameCompletionProposalProvider implements XMLCompletionProv
return methodName;
}
public static Flux<IMethod> propertyNameCandidateMethods(IJavaProject project, String beanClassFqName) {
public static Stream<IMethod> propertyNameCandidateMethods(IJavaProject project, String beanClassFqName) {
return project.getIndex().allSuperTypesOf(beanClassFqName, true)
.flatMap(type -> Flux.fromStream(type.getMethods()))
.toStream()
.flatMap(type -> type.getMethods())
.filter(PropertyNameCompletionProposalProvider::isPropertyWriteMethod);
}

3
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/hyperlinks/PropertyNameHyperlinkProvider.java
View File

@@ -45,7 +45,8 @@ public class PropertyNameHyperlinkProvider implements XMLHyperlinkProvider {
return PropertyNameCompletionProposalProvider.propertyNameCandidateMethods(project, beanClass)
.filter(method -> propertyName.equals(PropertyNameCompletionProposalProvider.getPropertyName(method)))
.map(method -> locationProvider.findLocation(project, method))
.blockFirst();
.findFirst()
.orElse(null);
}
}
return null;