Send a range array to Format method

Author: Kapil Borle

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -1202,33 +1202,19 @@ private async Task<Tuple<string, Range>> Format(
             FormattingOptions options,
             Range range)
         {
-
-            // TODO Get settings
-            // TODO Update settings to store code formatting settings
             var scriptFile = editorSession.Workspace.GetFile(documentUri);
             var pssaSettings = currentSettings.CodeFormatting.GetPSSASettingsHashTable(
                 options.TabSize,
                 options.InsertSpaces);
 
-            // TODO raise an error event incase format returns null;
+            // TODO raise an error event in case format returns null;
             string formattedScript;
             Range editRange;
-            int sl, sc, el, ec;
-            if (range == null)
-            {
-                sl = -1;
-                sc = -1;
-                el = -1;
-                ec = -1;
-            }
-            else
-            {
-                sl = range.Start.Line + 1;
-                sc = range.Start.Character + 1;
-                el = range.End.Line + 1;
-                ec = range.End.Character + 1;
-            }
-
+            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
@@ -1249,10 +1235,7 @@ private async Task<Tuple<string, Range>> Format(
             formattedScript = await editorSession.AnalysisService.Format(
                 scriptFile.Contents,
                 pssaSettings,
-                sl,
-                sc,
-                el,
-                ec);
+                rangeList);
             formattedScript = formattedScript ?? scriptFile.Contents;
             return Tuple.Create(formattedScript, editRange);
         }

src/PowerShellEditorServices/Analysis/AnalysisService.cs

@@ -254,40 +254,25 @@ public IEnumerable<string> GetPSScriptAnalyzerRules()
         public async Task<string> Format(
             string scriptDefinition,
             Hashtable settings,
-            int startLineNumber = -1,
-            int startColumnNumber = -1,
-            int endLineNumber = -1,
-            int endColumnNumber = -1)
+            int[] rangeList)
         {
             // we cannot use Range type therefore this workaround of using -1 default value
             if (!hasScriptAnalyzerModule)
             {
                 return null;
             }
 
-            Dictionary<string, object> argsDict;
-
-            // this is a workaround till range formatter is enable in script analyzer
-            if (startLineNumber == -1)
-            {
-                argsDict = new Dictionary<string, object> {
+            var argsDict = new Dictionary<string, object> {
                     {"ScriptDefinition", scriptDefinition},
                     {"Settings", settings}
-                };
-            }
-            else
+            };
+            if (rangeList != null)
             {
-                argsDict = new Dictionary<string, object> {
-                    {"ScriptDefinition", scriptDefinition},
-                    {"Settings", settings},
-                    {"StartLineNumber", startLineNumber},
-                    {"StartColumnNumber", startColumnNumber},
-                    {"EndLineNumber", endLineNumber},
-                    {"EndColumnNumber", endColumnNumber}
-                };
+                argsDict.Add("Range", rangeList);
             }
+
             var result = await InvokePowerShellAsync("Invoke-Formatter", argsDict);
-            return result?.Select(r => r.ImmediateBaseObject as string).FirstOrDefault();
+            return result?.Select(r => r?.ImmediateBaseObject as string).FirstOrDefault();
         }
 
         /// <summary>