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

Make some LanguageServerComponents optional

Browse Source
This commit is contained in:
Kris De Volder
2018-02-14 13:51:40 -08:00
parent aa78fe0dcc
commit 9d89229cea
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/composable/ComposableLanguageServer.java
View File

@@ -41,16 +41,20 @@ public class ComposableLanguageServer<C extends LanguageServerComponents> implem
SimpleTextDocumentService documents = server.getTextDocumentService();
IReconcileEngine reconcileEngine = components.getReconcileEngine();
documents.onDidChangeContent(params -> {
TextDocument doc = params.getDocument();
server.validateWith(doc.getId(), reconcileEngine);
});
if (reconcileEngine!=null) {
documents.onDidChangeContent(params -> {
TextDocument doc = params.getDocument();
server.validateWith(doc.getId(), reconcileEngine);
});
}
ICompletionEngine completionEngine = components.getCompletionEngine();
completionEngineAdapter = server.createCompletionEngineAdapter(server, completionEngine);
completionEngineAdapter.setMaxCompletions(100);
documents.onCompletion(completionEngineAdapter::getCompletions);
documents.onCompletionResolve(completionEngineAdapter::resolveCompletion);
if (completionEngine!=null) {
completionEngineAdapter = server.createCompletionEngineAdapter(server, completionEngine);
completionEngineAdapter.setMaxCompletions(100);
documents.onCompletion(completionEngineAdapter::getCompletions);
documents.onCompletionResolve(completionEngineAdapter::resolveCompletion);
}
HoverInfoProvider hoverInfoProvider = components.getHoverProvider();
hoverEngine = new VscodeHoverEngineAdapter(server, hoverInfoProvider);
@@ -62,7 +66,9 @@ public class ComposableLanguageServer<C extends LanguageServerComponents> implem
}
public void setMaxCompletionsNumber(int number) {
completionEngineAdapter.setMaxCompletions(number);
if (completionEngineAdapter!=null) {
completionEngineAdapter.setMaxCompletions(number);
}
}
public void setHoverType(HoverType type) {

8
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/composable/LanguageServerComponents.java
View File

@@ -16,8 +16,12 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcil
public interface LanguageServerComponents {
IReconcileEngine getReconcileEngine();
ICompletionEngine getCompletionEngine();
default IReconcileEngine getReconcileEngine() {
return null;
}
default ICompletionEngine getCompletionEngine() {
return null;
}
HoverInfoProvider getHoverProvider();
}