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-08-03 11:48:24 -07:00
parent 55e83baf85 3ec72082eb
commit 77769dee76
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
View File

@@ -64,6 +64,7 @@ public class BoshEditorTest {
LanguageId.BOSH_DEPLOYMENT
);
harness.intialize(null);
System.setProperty("lsp.yaml.completions.errors.disable", "false");
}
@Test public void toplevelV2PropertyNamesKnown() throws Exception {

6
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshLanguageServerTest.java
View File

@@ -52,7 +52,11 @@ public class BoshLanguageServerTest {
}
private void assertExpectedInitResult(InitializeResult initResult) {
assertThat(initResult.getCapabilities().getCompletionProvider().getResolveProvider()).isTrue();
if (Boolean.getBoolean("lsp.lazy.completions.disable")) {
assertThat(initResult.getCapabilities().getCompletionProvider().getResolveProvider()).isFalse();
} else {
assertThat(initResult.getCapabilities().getCompletionProvider().getResolveProvider()).isTrue();
}
assertThat(initResult.getCapabilities().getTextDocumentSync().getLeft()).isEqualTo(TextDocumentSyncKind.Incremental);
}