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 
Conflicts:
	headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
This commit is contained in:
Kris De Volder
2017-10-31 14:36:27 -07:00
parent 3a350af728 abfd198bf5
commit 71cbda64dd
13 changed files with 419 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
View File

@@ -133,7 +133,7 @@ public class LanguageServerHarness<S extends SimpleLanguageServer> {
this.defaultLanguageId = defaultLanguageId;
}
public static final Duration HIGHLIGHTS_TIMEOUT = Duration.ofMillis(6_000); //TODO: why does it need to be this long, that's fishy!
public static final Duration HIGHLIGHTS_TIMEOUT = Duration.ofMillis(1_000); //TODO: why does it need to be this long, that's fishy!
public LanguageServerHarness(Callable<S> factory) throws Exception {
this(factory, LanguageId.PLAINTEXT);
@@ -520,7 +520,7 @@ public class LanguageServerHarness<S extends SimpleLanguageServer> {
return 1;
}
protected String createTempUri() throws Exception {
public String createTempUri() throws Exception {
return File.createTempFile("workingcopy", getFileExtension()).toURI().toString();
}