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

Merge branch 'master' of github.com:spring-projects/sts4

Browse Source
This commit is contained in:
Kris De Volder
2017-07-19 15:34:22 -07:00
parent 47dcb094c5 5c2acfd3d8
commit b5deeeaa55
12 changed files with 619 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java
View File

@@ -20,9 +20,15 @@ public class Main {
SimpleLanguageServer server = new ManifestYamlLanguageServer();
public static void main(String[] args) throws IOException, InterruptedException {
File logfile = File.createTempFile("manifest-yaml-language-server", ".log");
File logfile = null;
if (System.getProperty("org.slf4j.simpleLogger.logFile") == null) {
logfile = File.createTempFile("manifest-yaml-language-server", ".log");
System.setProperty("org.slf4j.simpleLogger.logFile", logfile.toString());
} else {
logfile = new File(System.getProperty("org.slf4j.simpleLogger.logFile"));
}
System.err.println("Redirecting log output to: "+logfile);
System.setProperty("org.slf4j.simpleLogger.logFile", logfile.toString());
LaunguageServerApp.start(ManifestYamlLanguageServer::new);
}
}

5
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java
View File

@@ -56,6 +56,7 @@ import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvid
import org.yaml.snakeyaml.Yaml;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
public class ManifestYamlLanguageServer extends SimpleLanguageServer {
@@ -66,7 +67,7 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer {
private final CfClientConfig cfClientConfig;
private final LazyCompletionResolver completionResolver = new LazyCompletionResolver(); //Set to null to disable lazy resolving
private final LanguageId FALLBACK_YML_ID = LanguageId.of("yml");
private final ImmutableSet<LanguageId> FALLBACK_YML_IDS = ImmutableSet.of(LanguageId.of("yml"), LanguageId.of("yaml"));
final private ClientParamsProvider defaultClientParamsProvider;
public ManifestYamlLanguageServer() {
@@ -181,7 +182,7 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer {
private void validateOnDocumentChange(IReconcileEngine engine, TextDocument doc) {
if (LanguageId.CF_MANIFEST.equals(doc.getLanguageId())
|| FALLBACK_YML_ID.equals(doc.getLanguageId())) {
|| FALLBACK_YML_IDS.contains(doc.getLanguageId())) {
//
// this FALLBACK_YML_ID got introduced to workaround a limitation in LSP4E, which sets the file extension as language ID to the document
//