Merge pull request #516 from kapilmb/update-formatter

Add request handlers for document formatting

Author: daviwil

src/PowerShellEditorServices.Protocol/LanguageServer/Formatting.cs

@@ -0,0 +1,95 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using Microsoft.PowerShell.EditorServices.Protocol.MessageProtocol;
+
+namespace Microsoft.PowerShell.EditorServices.Protocol.LanguageServer
+{
+    public class DocumentFormattingRequest
+    {
+        public static readonly RequestType<DocumentFormattingParams, TextEdit[], object, TextDocumentRegistrationOptions> Type = RequestType<DocumentFormattingParams, TextEdit[], object, TextDocumentRegistrationOptions>.Create("textDocument/formatting");
+    }
+
+    public class DocumentRangeFormattingRequest
+    {
+        public static readonly RequestType<DocumentRangeFormattingParams, TextEdit[], object, TextDocumentRegistrationOptions> Type = RequestType<DocumentRangeFormattingParams, TextEdit[], object, TextDocumentRegistrationOptions>.Create("textDocument/rangeFormatting");
+
+    }
+
+    public class DocumentOnTypeFormattingRequest
+    {
+        public static readonly RequestType<DocumentOnTypeFormattingRequest, TextEdit[], object, TextDocumentRegistrationOptions> Type = RequestType<DocumentOnTypeFormattingRequest, TextEdit[], object, TextDocumentRegistrationOptions>.Create("textDocument/onTypeFormatting");
+
+    }
+
+    public class DocumentRangeFormattingParams
+    {
+        /// <summary>
+        /// The document to format.
+        /// </summary>
+        public TextDocumentIdentifier TextDocument { get; set; }
+
+        /// <summary>
+        /// The range to format.
+        /// </summary>
+        /// <returns></returns>
+        public Range Range { get; set; }
+
+        /// <summary>
+        /// The format options.
+        /// </summary>
+        public FormattingOptions Options { get; set; }
+    }
+
+    public class DocumentOnTypeFormattingParams
+    {
+        /// <summary>
+        /// The document to format.
+        /// </summary>
+        public TextDocumentIdentifier TextDocument { get; set; }
+
+        /// <summary>
+        /// The position at which this request was sent.
+        /// </summary>
+        public Position Position { get; set; }
+
+        /// <summary>
+        /// The character that has been typed.
+        /// </summary>
+        public string ch { get; set; }
+
+        /// <summary>
+        /// The format options.
+        /// </summary>
+        public FormattingOptions options { get; set; }
+    }
+
+    public class DocumentFormattingParams
+    {
+        /// <summary>
+        /// The document to format.
+        /// </summary>
+        public TextDocumentIdentifier TextDocument { get; set; }
+
+        /// <summary>
+        /// The format options.
+        /// </summary>
+        public FormattingOptions options { get; set; }
+    }
+
+    public class FormattingOptions
+    {
+        /// <summary>
+        /// Size of a tab in spaces.
+        /// </summary>
+        public int TabSize { get; set; }
+
+        /// <summary>
+        /// Prefer spaces over tabs.
+        /// </summary>
+        public bool InsertSpaces { get; set; }
+    }
+}
+

src/PowerShellEditorServices.Protocol/LanguageServer/Hover.cs

@@ -23,7 +23,7 @@ public class Hover
     {
         public MarkedString[] Contents { get; set; }
 
-        public Range? Range { get; set; }
+        public Range Range { get; set; }
     }
 
     public class HoverRequest

src/PowerShellEditorServices.Protocol/LanguageServer/ScriptFileMarkersRequest.cs

@@ -237,7 +237,7 @@ public class TextDocumentChangeEvent
         /// Gets or sets the Range where the document was changed.  Will
         /// be null if the server's TextDocumentSyncKind is Full.
         /// </summary>
-        public Range? Range { get; set; }
+        public Range Range { get; set; }
 
         /// <summary>
         /// Gets or sets the length of the Range being replaced in the
@@ -267,7 +267,7 @@ public class Position
     }
 
     [DebuggerDisplay("Start = {Start.Line}:{Start.Character}, End = {End.Line}:{End.Character}")]
-    public struct Range
+    public class Range
     {
         /// <summary>
         /// Gets or sets the starting position of the range.

src/PowerShellEditorServices.Protocol/LanguageServer/TextDocument.cs

@@ -104,6 +104,10 @@ public void Start()
             this.messageHandlers.SetRequestHandler(HoverRequest.Type, this.HandleHoverRequest);
             this.messageHandlers.SetRequestHandler(WorkspaceSymbolRequest.Type, this.HandleWorkspaceSymbolRequest);
             this.messageHandlers.SetRequestHandler(CodeActionRequest.Type, this.HandleCodeActionRequest);
+            this.messageHandlers.SetRequestHandler(DocumentFormattingRequest.Type, this.HandleDocumentFormattingRequest);
+            this.messageHandlers.SetRequestHandler(
+                DocumentRangeFormattingRequest.Type,
+                this.HandleDocumentRangeFormattingRequest);
 
             this.messageHandlers.SetRequestHandler(ShowOnlineHelpRequest.Type, this.HandleShowOnlineHelpRequest);
             this.messageHandlers.SetRequestHandler(ExpandAliasRequest.Type, this.HandleExpandAliasRequest);
@@ -123,7 +127,6 @@ public void Start()
             this.messageHandlers.SetRequestHandler(GetPSSARulesRequest.Type, this.HandleGetPSSARulesRequest);
             this.messageHandlers.SetRequestHandler(SetPSSARulesRequest.Type, this.HandleSetPSSARulesRequest);
 
-            this.messageHandlers.SetRequestHandler(ScriptFileMarkersRequest.Type, this.HandleScriptFileMarkersRequest);
             this.messageHandlers.SetRequestHandler(ScriptRegionRequest.Type, this.HandleGetFormatScriptRegionRequest);
 
             this.messageHandlers.SetRequestHandler(GetPSHostProcessesRequest.Type, this.HandleGetPSHostProcessesRequest);
@@ -200,7 +203,8 @@ await requestContext.SendResult(
                         SignatureHelpProvider = new SignatureHelpOptions
                         {
                             TriggerCharacters = new string[] { " " } // TODO: Other characters here?
-                        }
+                        },
+                        DocumentFormattingProvider = false
                     }
                 });
         }
@@ -292,19 +296,6 @@ await requestContext.SendResult(new ScriptRegionRequestResult
             });
         }
 
-        private async Task HandleScriptFileMarkersRequest(
-            ScriptFileMarkerRequestParams requestParams,
-            RequestContext<ScriptFileMarkerRequestResultParams> requestContext)
-        {
-            var markers = await editorSession.AnalysisService.GetSemanticMarkersAsync(
-                editorSession.Workspace.GetFile(requestParams.fileUri),
-                AnalysisService.GetPSSASettingsHashtable(requestParams.settings));
-            await requestContext.SendResult(new ScriptFileMarkerRequestResultParams
-            {
-                markers = markers
-            });
-        }
-
         private async Task HandleGetPSSARulesRequest(
             object param,
             RequestContext<object> requestContext)
@@ -541,7 +532,7 @@ protected Task HandleDidChangeTextDocumentNotification(
 
                 changedFile.ApplyChange(
                     GetFileChangeDetails(
-                        textChange.Range.Value,
+                        textChange.Range,
                         textChange.Text));
 
                 changedFiles.Add(changedFile);
@@ -873,7 +864,7 @@ await editorSession
                         textDocumentPositionParams.Position.Character + 1);
 
             List<MarkedString> symbolInfo = new List<MarkedString>();
-            Range? symbolRange = null;
+            Range symbolRange = null;
 
             if (symbolDetails != null)
             {
@@ -1155,7 +1146,45 @@ await requestContext.SendResult(
                 codeActionCommands.ToArray());
         }
 
-       protected Task HandleEvaluateRequest(
+        protected async Task HandleDocumentFormattingRequest(
+            DocumentFormattingParams formattingParams,
+            RequestContext<TextEdit[]> requestContext)
+        {
+            var result = await Format(
+                formattingParams.TextDocument.Uri,
+                formattingParams.options,
+                null);
+
+            await requestContext.SendResult(new TextEdit[1]
+            {
+                new TextEdit
+                {
+                    NewText = result.Item1,
+                    Range = result.Item2
+                },
+            });
+        }
+
+        protected async Task HandleDocumentRangeFormattingRequest(
+            DocumentRangeFormattingParams formattingParams,
+            RequestContext<TextEdit[]> requestContext)
+        {
+            var result = await Format(
+                formattingParams.TextDocument.Uri,
+                formattingParams.Options,
+                formattingParams.Range);
+
+            await requestContext.SendResult(new TextEdit[1]
+            {
+                new TextEdit
+                {
+                    NewText = result.Item1,
+                    Range = result.Item2
+                },
+            });
+        }
+
+        protected Task HandleEvaluateRequest(
             DebugAdapterMessages.EvaluateRequestArguments evaluateParams,
             RequestContext<DebugAdapterMessages.EvaluateResponseBody> requestContext)
         {
@@ -1193,6 +1222,49 @@ protected Task HandleEvaluateRequest(
 
         #region Event Handlers
 
+        private async Task<Tuple<string, Range>> Format(
+            string documentUri,
+            FormattingOptions options,
+            Range range)
+        {
+            var scriptFile = editorSession.Workspace.GetFile(documentUri);
+            var pssaSettings = currentSettings.CodeFormatting.GetPSSASettingsHashTable(
+                options.TabSize,
+                options.InsertSpaces);
+
+            // TODO raise an error event in case format returns null;
+            string formattedScript;
+            Range editRange;
+            var rangeList = range == null ? null : new int[] {
+                range.Start.Line + 1,
+                range.Start.Character + 1,
+                range.End.Line + 1,
+                range.End.Character + 1};
+            var extent = scriptFile.ScriptAst.Extent;
+
+            // todo create an extension for converting range to script extent
+            editRange = new Range
+            {
+                Start = new Position
+                {
+                    Line = extent.StartLineNumber - 1,
+                    Character = extent.StartColumnNumber - 1
+                },
+                End = new Position
+                {
+                    Line = extent.EndLineNumber - 1,
+                    Character = extent.EndColumnNumber - 1
+                }
+            };
+
+            formattedScript = await editorSession.AnalysisService.Format(
+                scriptFile.Contents,
+                pssaSettings,
+                rangeList);
+            formattedScript = formattedScript ?? scriptFile.Contents;
+            return Tuple.Create(formattedScript, editRange);
+        }
+
         private async void PowerShellContext_RunspaceChanged(object sender, Session.RunspaceChangedEventArgs e)
         {
             await this.messageSender.SendEvent(