From e83059c1b4616a9bba58a0a2b2db6a9fd58dc6f7 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 20 Apr 2017 12:09:52 -0700 Subject: [PATCH] Fix NPEs causing test failures These happen for language-server that don't have any quickfixes. --- .../commons/languageserver/util/SimpleLanguageServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java index a3db5cc8a..9d75106e6 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java @@ -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 )));