1.14.0.0

Author: tanchekwei

WorkspaceLauncherForVSCode/Classes/CountTracker.cs

@@ -1,21 +1,39 @@
 using System;
 using System.Collections.Generic;
+using WorkspaceLauncherForVSCode.Enums;
 
 namespace WorkspaceLauncherForVSCode.Classes;
+
 public class CountTracker
 {
   private readonly Dictionary<CountType, int> _counts = new();
-
-  public event EventHandler<CountType>? CountChanged;
-
+  private readonly Dictionary<VisualStudioCodeRemoteType, int> _vscodeRemoteCounts = new();
+  private readonly Dictionary<WorkspaceType, int> _vscodeLocalCounts = new();
   public int this[CountType type] => _counts.TryGetValue(type, out var count) ? count : 0;
+  public int this[VisualStudioCodeRemoteType remoteType] => _vscodeRemoteCounts.TryGetValue(remoteType, out var count) ? count : 0;
+  public int this[WorkspaceType localType] => _vscodeLocalCounts.TryGetValue(localType, out var count) ? count : 0;
 
   public void Update(CountType type, int value)
   {
     if (!_counts.TryGetValue(type, out var oldValue) || oldValue != value)
     {
       _counts[type] = value;
-      CountChanged?.Invoke(this, type);
+    }
+  }
+
+  public void Update(VisualStudioCodeRemoteType remoteType, int value)
+  {
+    if (!_vscodeRemoteCounts.TryGetValue(remoteType, out var oldValue) || oldValue != value)
+    {
+      _vscodeRemoteCounts[remoteType] = value;
+    }
+  }
+
+  public void Update(WorkspaceType localType, int value)
+  {
+    if (!_vscodeLocalCounts.TryGetValue(localType, out var oldValue) || oldValue != value)
+    {
+      _vscodeLocalCounts[localType] = value;
     }
   }
 }

WorkspaceLauncherForVSCode/Classes/CountType.cs

@@ -1,4 +1,5 @@
 namespace WorkspaceLauncherForVSCode.Classes;
+
 public enum CountType
 {
     Total,

WorkspaceLauncherForVSCode/Classes/VisualStudioCodeRemoteUri.cs

@@ -1,10 +1,9 @@
 using System;
+using System.Net;
 using System.Text;
 using System.Text.Json;
-using System.Net;
 using WorkspaceLauncherForVSCode.Enums;
 using WorkspaceLauncherForVSCode.Helpers;
-using ABI.System;
 
 namespace WorkspaceLauncherForVSCode.Classes;
 
@@ -13,7 +12,7 @@ public class VisualStudioCodeRemoteUri
     public const string Scheme = Constant.VscodeRemoteScheme;
     public string Uri { get; }
     public string TypeStr { get; }
-    public VisualStudioCodeRemoteType? Type { get;  }
+    public VisualStudioCodeRemoteType? Type { get; }
     public string InfoRaw { get; }
     public string InfoDecoded { get; }
     public JsonElement? InfoJson { get; }
@@ -38,7 +37,7 @@ public VisualStudioCodeRemoteUri(string uri)
         var path = firstSlash == -1 ? "/" : withoutScheme.Substring(firstSlash);
 
         // Handle encoded `+` (for codespaces)
-        string remoteType = null, remoteInfoRaw = null;
+        string remoteType = string.Empty, remoteInfoRaw = string.Empty;
 
         if (beforePath.Contains('+'))
         {

WorkspaceLauncherForVSCode/Classes/VisualStudioCodeWorkspace.cs

@@ -137,7 +137,7 @@ public void SetVSCodeMetadata()
     /// Gets the details of the workspace.
     /// </summary>
     /// <returns>An array of details elements containing information about the workspace.</returns>
-    public void SetVSMetadata()
+    public static void SetVSMetadata()
     {
     }
 }

WorkspaceLauncherForVSCode/Classes/VisualStudioCodeWorkspaceSerializerContext.cs

@@ -1,9 +1,12 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using WorkspaceLauncherForVSCode.Services.VisualStudio.Models;
 
 namespace WorkspaceLauncherForVSCode.Classes
 {
     [JsonSerializable(typeof(List<VisualStudioCodeWorkspace>))]
+    [JsonSerializable(typeof(VisualStudioCodeInstance), TypeInfoPropertyName = "VSCodeInstance")]
+    [JsonSerializable(typeof(VisualStudioInstance), TypeInfoPropertyName = "VSInstance")]
     internal sealed partial class VisualStudioCodeWorkspaceSerializerContext : JsonSerializerContext
     {
     }

WorkspaceLauncherForVSCode/Commands/OpenSolutionCommand.cs

@@ -50,6 +50,11 @@ public override CommandResult Invoke()
             return CommandResult.Dismiss();
         }
 
+        if (page != null)
+        {
+            Task.Run(() => page.UpdateFrequencyAsync(Workspace.Path));
+        }
+
         OpenWindows.Instance.UpdateVisualStudioWindowsList();
         var visualStudioWindows = OpenWindows.Instance.Windows;
         var matchedElevatedVisualStudioWindows = new List<Window>();
@@ -65,6 +70,10 @@ public override CommandResult Invoke()
             }
             else
             {
+                if (window.Process.Process == null)
+                {
+                    continue;
+                }
                 string? commandLine = NativeProcessCommandLine.GetCommandLine(window.Process.Process);
                 string? solutionPath = NativeProcessCommandLine.ExtractSolutionPath(commandLine);
                 if (solutionPath == Workspace.WindowsPath)
@@ -77,22 +86,17 @@ public override CommandResult Invoke()
 
         //if (matchedElevatedVisualStudioWindows.Count > 0)
         //{
-            // TODO: Waiting on https://github.com/microsoft/PowerToys/pull/38025 for GotoPage support.
-            // Since we can't retrieve the command line from elevated processes, we can't determine their solution path.
-            // If any elevated Visual Studio windows have a title that contains the solution name,
-            // consider navigating to a selection page to let the user choose which window to switch to or reopen the solution.
+        // TODO: Waiting on https://github.com/microsoft/PowerToys/pull/38025 for GotoPage support.
+        // Since we can't retrieve the command line from elevated processes, we can't determine their solution path.
+        // If any elevated Visual Studio windows have a title that contains the solution name,
+        // consider navigating to a selection page to let the user choose which window to switch to or reopen the solution.
         //}
 
         if (Workspace.VSInstance != null)
         {
             OpenInShellHelper.OpenInShell(Workspace.VSInstance.InstancePath, Workspace.Path, runAs: _elevated ? OpenInShellHelper.ShellRunAsType.Administrator : OpenInShellHelper.ShellRunAsType.None);
         }
 
-        if (page != null)
-        {
-            Task.Run(() => page.UpdateFrequencyAsync(Workspace.Path));
-        }
-
         return PageCommandResultHandler.HandleCommandResult(page);
     }
 }

WorkspaceLauncherForVSCode/Commands/SwitchWindowCommand.cs

@@ -14,7 +14,7 @@
 
 namespace WorkspaceLauncherForVSCode.Commands;
 
-internal partial class SwitchWindowCommand : InvokableCommand
+internal sealed partial class SwitchWindowCommand : InvokableCommand
 {
     private readonly Window _window;
 

WorkspaceLauncherForVSCode/Components/OpenWindows.cs

@@ -47,9 +47,9 @@ private bool VisualStudioWindowEnumerationCallBack(IntPtr hwnd, IntPtr lParam)
                 newWindow.ClassName != "Windows.UI.Core.CoreWindow" &&
                 !newWindow.IsCloaked)
             {
-                if (string.Equals(newWindow.Process?.Process.ProcessName, "devenv", StringComparison.OrdinalIgnoreCase))
+                if (newWindow.Process?.Process != null && string.Equals(newWindow.Process.Process.ProcessName, "devenv", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (newWindow.Process?.Process is Process proc && IsProcessElevated(proc.Id))
+                    if (newWindow.Process.Process is Process proc && IsProcessElevated(proc.Id))
                     {
                         newWindow.IsProcessElevated = true;
                     }
@@ -60,7 +60,7 @@ private bool VisualStudioWindowEnumerationCallBack(IntPtr hwnd, IntPtr lParam)
             return true;
         }
 
-        private bool IsProcessElevated(int processId)
+        private static bool IsProcessElevated(int processId)
         {
             IntPtr hProcess = NativeMethods.OpenProcess(0x1000 /* PROCESS_QUERY_INFORMATION */, false, processId);
             if (hProcess == IntPtr.Zero)
@@ -72,7 +72,7 @@ private bool IsProcessElevated(int processId)
                 if (!NativeMethods.OpenProcessToken(hProcess, 0x0008 /* TOKEN_QUERY */, out hToken))
                     return false;
 
-                uint tokenInfoLength = (uint)Marshal.SizeOf(typeof(int));
+                uint tokenInfoLength = (uint)Marshal.SizeOf<int>();
                 IntPtr elevationPtr = Marshal.AllocHGlobal((int)tokenInfoLength);
                 try
                 {

WorkspaceLauncherForVSCode/Components/Window.cs

@@ -72,7 +72,8 @@ internal void SwitchToWindow()
 
         public override string ToString()
         {
-            return Title + " (" + processInfo.Process.ProcessName?.ToUpper(CultureInfo.CurrentCulture) + ")";
+            var processName = processInfo.Process?.ProcessName?.ToUpper(CultureInfo.CurrentCulture) ?? "N/A";
+            return Title + " (" + processName + ")";
         }
 
         internal WindowSizeState GetWindowSizeState()

WorkspaceLauncherForVSCode/Components/WindowProcess.cs

@@ -9,13 +9,14 @@ namespace WorkspaceLauncherForVSCode.Components
 {
     internal sealed class WindowProcess
     {
-        private uint processId;
+        private readonly uint processId;
         private readonly Process? process;
         internal uint ProcessId => processId;
         internal Process? Process => process;
         internal WindowProcess(IntPtr hwnd)
         {
-            _ = NativeMethods.GetWindowThreadProcessId(hwnd, out var processId);
+            _ = NativeMethods.GetWindowThreadProcessId(hwnd, out var pid);
+            processId = pid;
             process = Process.GetProcessById((int)processId);
         }
     }