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

Merge branch 'master' into lsp4j-snapshot

Browse Source
This commit is contained in:
Kris De Volder
2016-11-07 17:48:49 -08:00
parent af64ba01d3 2fbd7110ae
commit 8cc18cb546
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
View File

@@ -25,7 +25,7 @@ import org.springframework.ide.vscode.commons.util.StringUtil;
*/
public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
final private int MAX_COMPLETIONS = 10;
private final static int MAX_COMPLETIONS = 20;
final static Logger logger = LoggerFactory.getLogger(VscodeCompletionEngineAdapter.class);
@@ -117,5 +117,4 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
//The tricky part is that we have to probably remember infos about the unresolved elements somehow so we can resolve later.
return Futures.of(unresolved);
}
}

1
vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
View File

@@ -13,6 +13,7 @@ package org.springframework.ide.vscode.manifest.yaml;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.ide.vscode.commons.languageserver.completion.VscodeCompletionEngineAdapter;
import org.springframework.ide.vscode.languageserver.testharness.Editor;
import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
import org.springframework.ide.vscode.manifest.yaml.ManifestYamlLanguageServer;