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

Fix NPEs causing test failures

Browse Source 
These happen for language-server that don't
have any quickfixes.
This commit is contained in:
Kris De Volder
2017-04-20 12:09:52 -07:00
parent 0ca361f098
commit e83059c1b4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,9 +148,9 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl
}
this.hasCompletionSnippetSupport = safeGet(false, () -> params.getCapabilities().getTextDocument().getCompletion().getCompletionItem().getSnippetSupport());
this.hasExecuteCommandSupport = safeGet(false, () -> params.getCapabilities().getWorkspace().getExecuteCommand()!=null);
Log.info("workspaceRoot = "+workspaceRoot);
Log.info("hasCompletionSnippetSupport = "+hasCompletionSnippetSupport);
Log.info("hasExecuteCommandSupport = "+hasExecuteCommandSupport);
Log.debug("workspaceRoot = "+workspaceRoot);
Log.debug("hasCompletionSnippetSupport = "+hasCompletionSnippetSupport);
Log.debug("hasExecuteCommandSupport = "+hasExecuteCommandSupport);
InitializeResult result = new InitializeResult();
@@ -217,7 +217,7 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl
if (hasDocumentSymbolHandler()) {
c.setDocumentSymbolProvider(true);
}
if (hasExecuteCommandSupport && quickfixRegistry.hasFixes()) {
if (hasExecuteCommandSupport && hasQuickFixes()) {
c.setExecuteCommandProvider(new ExecuteCommandOptions(ImmutableList.of(
CODE_ACTION_COMMAND_ID
)));