Refactor command result handling

Author: tanchekwei

WorkspaceLauncherForVSCode/Commands/OpenSolutionCommand.cs

@@ -13,7 +13,7 @@ namespace WorkspaceLauncherForVSCode.Commands;
 public partial class OpenSolutionCommand : InvokableCommand, IHasWorkspace
 {
     public VisualStudioCodeWorkspace Workspace { get; set; }
-    private readonly VisualStudioCodePage page;
+    private readonly VisualStudioCodePage? page;
     private readonly CommandResultType commandResult;
     private readonly bool _elevated;
 
@@ -62,30 +62,21 @@ public override CommandResult Invoke()
             if (window.Title.Contains(solutionName))
             {
                 window.SwitchToWindow();
-                return CommandResult.Dismiss();
+                return PageCommandResultHandler.HandleCommandResult(CommandResultType.Dismiss, page);
             }
         }
 
-        OpenInShellHelper.OpenInShell(Workspace.VSInstance.InstancePath, Workspace.Path, runAs: _elevated ? OpenInShellHelper.ShellRunAsType.Administrator : OpenInShellHelper.ShellRunAsType.None);
-
-        // Update frequency
-        Task.Run(() => page.UpdateFrequencyAsync(Workspace.Path));
+        if (Workspace.VSInstance != null)
+        {
+            OpenInShellHelper.OpenInShell(Workspace.VSInstance.InstancePath, Workspace.Path, runAs: _elevated ? OpenInShellHelper.ShellRunAsType.Administrator : OpenInShellHelper.ShellRunAsType.None);
+        }
 
-        switch (commandResult)
+        if (page != null)
         {
-            case CommandResultType.GoBack:
-                return CommandResult.GoBack();
-            case CommandResultType.KeepOpen:
-                // reset search text
-                page.UpdateSearchText(page.SearchText, "");
-                page.SearchText = "";
-                return CommandResult.KeepOpen();
-            case CommandResultType.Dismiss:
-                page.UpdateSearchText(page.SearchText, "");
-                page.SearchText = "";
-                return CommandResult.Dismiss();
-            default:
-                return CommandResult.Dismiss();
+            // Update frequency
+            Task.Run(() => page.UpdateFrequencyAsync(Workspace.Path));
         }
+
+        return PageCommandResultHandler.HandleCommandResult(commandResult, page);
     }
 }

WorkspaceLauncherForVSCode/Commands/OpenVisualStudioCodeCommand.cs

@@ -3,11 +3,10 @@
 using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.System.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using WorkspaceLauncherForVSCode.Commands;
 using WorkspaceLauncherForVSCode.Enums;
 using WorkspaceLauncherForVSCode.Interfaces;
 
-namespace WorkspaceLauncherForVSCode;
+namespace WorkspaceLauncherForVSCode.Commands;
 
 /// <summary>
 /// Command to open a Visual Studio Code workspace.
@@ -87,21 +86,6 @@ public override CommandResult Invoke()
         // Update frequency
         Task.Run(() => page.UpdateFrequencyAsync(Workspace.Path));
 
-        switch (commandResult)
-        {
-            case CommandResultType.GoBack:
-                return CommandResult.GoBack();
-            case CommandResultType.KeepOpen:
-                // reset search text
-                page.UpdateSearchText(page.SearchText, "");
-                page.SearchText = "";
-                return CommandResult.KeepOpen();
-            case CommandResultType.Dismiss:
-                page.UpdateSearchText(page.SearchText, "");
-                page.SearchText = "";
-                return CommandResult.Dismiss();
-            default:
-                return CommandResult.Dismiss();
-        }
+        return PageCommandResultHandler.HandleCommandResult(commandResult, page);
     }
 }

WorkspaceLauncherForVSCode/Commands/PageCommandResultHandler.cs

@@ -0,0 +1,29 @@
+// Modifications copyright (c) 2025 tanchekwei
+// Licensed under the MIT License. See the LICENSE file in the project root for details.
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using WorkspaceLauncherForVSCode.Enums;
+
+namespace WorkspaceLauncherForVSCode.Commands;
+
+public static class PageCommandResultHandler
+{
+    public static CommandResult HandleCommandResult(CommandResultType resultType, VisualStudioCodePage? page)
+    {
+        if (page != null)
+        {
+            // reset search text
+            if (!string.IsNullOrEmpty(page.SearchText))
+            {
+                page.UpdateSearchText(page.SearchText, "");
+                page.SearchText = "";
+            }
+        }
+
+        return resultType switch
+        {
+            CommandResultType.GoBack => CommandResult.GoBack(),
+            CommandResultType.KeepOpen => CommandResult.KeepOpen(),
+            _ => CommandResult.Dismiss(),
+        };
+    }
+}