From b21776a685c68c12f7b1fff824abf76e8d4023ed Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Tue, 23 Jul 2019 18:36:30 -0700 Subject: [PATCH 1/3] Backport 5f9d89a722b70f48f92b6d26dffdff256cd974bb --- .../Server/LanguageServer.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs index d582a7084..e1084096a 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs @@ -1379,6 +1379,11 @@ protected async Task HandleDocumentFormattingRequest( DocumentFormattingParams formattingParams, RequestContext requestContext) { + if (this.editorSession.AnalysisService == null) + { + return await requestContext.SendError("Script analysis is not enabled in this session"); + } + var result = await Format( formattingParams.TextDocument.Uri, formattingParams.options, @@ -1398,6 +1403,11 @@ protected async Task HandleDocumentRangeFormattingRequest( DocumentRangeFormattingParams formattingParams, RequestContext requestContext) { + if (this.editorSession.AnalysisService == null) + { + return await requestContext.SendError("Script analysis is not enabled in this session"); + } + var result = await Format( formattingParams.TextDocument.Uri, formattingParams.Options, From 4df51e0e77309e7a148875306a82ae8c7f51e732 Mon Sep 17 00:00:00 2001 From: Rob Holt Date: Fri, 26 Jul 2019 09:14:13 -0700 Subject: [PATCH 2/3] Fix async abuse --- .../Server/LanguageServer.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs index e1084096a..509fc9e66 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs @@ -1381,7 +1381,8 @@ protected async Task HandleDocumentFormattingRequest( { if (this.editorSession.AnalysisService == null) { - return await requestContext.SendError("Script analysis is not enabled in this session"); + await requestContext.SendError("Script analysis is not enabled in this session"); + return; } var result = await Format( @@ -1405,7 +1406,8 @@ protected async Task HandleDocumentRangeFormattingRequest( { if (this.editorSession.AnalysisService == null) { - return await requestContext.SendError("Script analysis is not enabled in this session"); + await requestContext.SendError("Script analysis is not enabled in this session"); + return } var result = await Format( From c2b8fc1f12b94721ea54f1d1f41456fac30255de Mon Sep 17 00:00:00 2001 From: Rob Holt Date: Fri, 26 Jul 2019 10:07:03 -0700 Subject: [PATCH 3/3] Add semicolon --- src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs index 509fc9e66..ba9d13271 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs @@ -1407,7 +1407,7 @@ protected async Task HandleDocumentRangeFormattingRequest( if (this.editorSession.AnalysisService == null) { await requestContext.SendError("Script analysis is not enabled in this session"); - return + return; } var result = await Format(