From 42536de1dd446fd9ff734cc09cc95814ecfadc0b Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 1 Feb 2020 23:00:02 +0900 Subject: [PATCH 1/2] Check _analysisService is null _analysisService is possibly null --- .../TextDocument/Handlers/TextDocumentHandler.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs index e9f844386..0b2734a6a 100644 --- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs +++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs @@ -65,7 +65,10 @@ public Task Handle(DidChangeTextDocumentParams notification, CancellationT #pragma warning disable CS4014 // Kick off script diagnostics without blocking the response // TODO: Get all recently edited files in the workspace - _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { changedFile }); + if (_analysisService != null) + { + _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { changedFile }); + } #pragma warning restore CS4014 return Unit.Task; } @@ -94,7 +97,10 @@ public Task Handle(DidOpenTextDocumentParams notification, CancellationTok #pragma warning disable CS4014 // Kick off script diagnostics without blocking the response // TODO: Get all recently edited files in the workspace - _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { openedFile }); + if (_analysisService != null) + { + _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { openedFile }); + } #pragma warning restore CS4014 _logger.LogTrace("Finished opening document."); From 1bd9b29cec0f4488f5a1e5654353b037c6d80040 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 1 Feb 2020 23:19:00 +0900 Subject: [PATCH 2/2] ditto --- .../Services/TextDocument/Handlers/TextDocumentHandler.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs index 0b2734a6a..0a8b6a98d 100644 --- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs +++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs @@ -123,7 +123,10 @@ public Task Handle(DidCloseTextDocumentParams notification, CancellationTo if (fileToClose != null) { _workspaceService.CloseFile(fileToClose); - _analysisService.ClearMarkers(fileToClose); + if (_analysisService != null) + { + _analysisService.ClearMarkers(fileToClose); + } } _logger.LogTrace("Finished closing document.");