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

Merge branch 'boot-2.2.0'

Browse Source
This commit is contained in:
Kris De Volder
2019-04-10 10:18:52 -07:00
parent 350560b850 6a8de04f6a
commit 67f87d7d86
24 changed files with 411 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,11 +143,12 @@ public class BootLanguagServerBootApp {
}
@Bean Yaml yaml() {
//TODO: Yaml is not re-entrant. So its a bit fishy to create a 're-usable' bean for this!
return new Yaml();
}
@Bean YamlASTProvider yamlAstProvider(Yaml yaml) {
return new YamlParser(yaml);
@Bean YamlASTProvider yamlAstProvider() {
return new YamlParser();
}
@Bean YamlStructureProvider yamlStructureProvider() {

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

@@ -11,9 +11,7 @@
package org.springframework.ide.vscode.boot.app;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Component
@ConfigurationProperties("languageserver.boot")
public class BootLsConfigProperties {

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

@@ -167,8 +167,7 @@ public class ValuePropertyReferencesProvider implements ReferenceProvider {
try {
String fileContent = FileUtils.readFileToString(new File(filePath));
Yaml yaml = new Yaml();
YamlASTProvider parser = new YamlParser(yaml);
YamlASTProvider parser = new YamlParser();
URI docURI = Paths.get(filePath).toUri();
TextDocument doc = new TextDocument(docURI.toString(), null);