Merge pull request #28 from halvarsson/fix-ps51-format-script

fix Format() on Powershell 5.1
ironmansoftware · Feb 27, 2023 · 38a3fe1 · 38a3fe1
2 parents 76e35bc + 82dc474
commit 38a3fe1
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/ShowEditorCommand.cs b/ShowEditorCommand.cs
@@ -192,12 +192,18 @@ private void Format()
                 {
                     var previousCursorPosition = textEditor.CursorPosition;
                     var previousTopRow = textEditor.TopRow;
-                    var formatted = InvokeCommand.InvokeScript("Invoke-Formatter -ScriptDefinition $args[0]", formatValue).FirstOrDefault();
-                    if (formatted != null)
+                    using (var powerShell = PowerShell.Create(RunspaceMode.CurrentRunspace))
                     {
-                        textEditor.Text = formatted.BaseObject as string;
-                        textEditor.CursorPosition = previousCursorPosition;
-                        textEditor.TopRow = previousTopRow;
+                        powerShell.AddCommand("Invoke-Formatter");
+                        powerShell.AddParameter("ScriptDefinition", formatValue);
+                        var result = powerShell.Invoke();
+                        var formatted = result.FirstOrDefault();
+                        if (formatted != null)
+                        {
+                            textEditor.Text = formatted.BaseObject as string;
+                            textEditor.CursorPosition = previousCursorPosition;
+                            textEditor.TopRow = previousTopRow;
+                        }
                     }
                 }
             }