Merge pull request #19 from JonahFintzDev/18-workspaces-arent-getting-populated-maybe-because-of-user-setup-installation

JonahFintzDev · web-flow · commit 9a55929ab2e8 · 2025-05-27T11:39:12.000+02:00
feat: improve performance and add support for custom vs code install …
diff --git a/VsCode/Classes/VSCodeHandler.cs b/VsCode/Classes/VSCodeHandler.cs
@@ -30,11 +30,79 @@ public static void LoadInstances(string preferredEdition)
         AddInstance("VS Code - Insiders", Path.Combine(appdataProgramFilesPath, "Programs", "Microsoft VS Code Insiders", "Code - Insiders.exe"), insiderStoragePath, VSCodeInstallationType.User, VSCodeType.Insider);
         AddInstance("VS Code - Insiders [System]", Path.Combine(programsFolderPathBase, "Microsoft VS Code Insiders", "Code - Insiders.exe"), insiderStoragePath, VSCodeInstallationType.System, VSCodeType.Insider);
 
+        // search for custom installations in PATH environment variable
+        try
+        {
+            var pathEnv = Environment.GetEnvironmentVariable("PATH");
+            if (!string.IsNullOrEmpty(pathEnv))
+            {
+                var paths = pathEnv.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var dir in paths)
+                {
+
+                    // get parent directory of the current directory
+                    if (string.IsNullOrEmpty(dir) || !Directory.Exists(dir))
+                    {
+                        continue;
+                    }
+                    var parentDir = Path.GetDirectoryName(dir) ?? dir;
+                    try
+                    {
+                        var codeExe = Path.Combine(parentDir, "code.exe");
+                        var codeInsidersExe = Path.Combine(parentDir, "Code - Insiders.exe");
+
+                        if (File.Exists(codeExe))
+                        {
+                            AddInstance("VS Code [Custom]", codeExe, defaultStoragePath, VSCodeInstallationType.User, VSCodeType.Default);
+                        }
+                        if (File.Exists(codeInsidersExe))
+                        {
+                            AddInstance("VS Code - Insiders [Custom]", codeInsidersExe, insiderStoragePath, VSCodeInstallationType.User, VSCodeType.Insider);
+                        }
+                    }
+                    catch
+                    {
+                        // ignore any errors while checking for custom installations
+                    }
+                }
+            }
+        }
+        catch
+        {
+            // ignore invalid PATH entries
+        }
 
         if (preferredEdition == "Insider")
         {
-            // Reverse the order of the instances
-            Instances.Reverse();
+            // sort instances to have insiders first
+            Instances.Sort((x, y) =>
+            {
+                if (x.VSCodeType == VSCodeType.Insider && y.VSCodeType != VSCodeType.Insider)
+                {
+                    return -1;
+                }
+                else if (x.VSCodeType != VSCodeType.Insider && y.VSCodeType == VSCodeType.Insider)
+                {
+                    return 1;
+                }
+                return 0;
+            });
+        }
+        else
+        {
+            // sort instances to have default first
+            Instances.Sort((x, y) =>
+            {
+                if (x.VSCodeType == VSCodeType.Default && y.VSCodeType != VSCodeType.Default)
+                {
+                    return -1;
+                }
+                else if (x.VSCodeType != VSCodeType.Default && y.VSCodeType == VSCodeType.Default)
+                {
+                    return 1;
+                }
+                return 0;
+            });
         }
     }
 
@@ -50,6 +118,11 @@ private static void AddInstance(string name, string path, string storagePath, VS
     {
         if (File.Exists(path))
         {
+            // check if there is already an instance with the same executable path
+            if (Instances.Exists(instance => instance.ExecutablePath.Equals(path, StringComparison.OrdinalIgnoreCase)))
+            {
+                return; // Instance already exists
+            }
             Instances.Add(new VSCodeInstance(name, path, storagePath, type, codeType));
         }
     }
diff --git a/VsCode/Classes/VSCodeInstance.cs b/VsCode/Classes/VSCodeInstance.cs
@@ -31,6 +31,7 @@ internal class VSCodeInstance
     public string StoragePath;
     public VSCodeInstallationType InstallationType;
     public VSCodeType VSCodeType;
+    public IconInfo Icon;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="VSCodeInstance"/> class.
@@ -47,13 +48,15 @@ public VSCodeInstance(string name, string executablePath, string storagePath, VS
         this.StoragePath = storagePath;
         this.InstallationType = installationType;
         this.VSCodeType = type;
+        this.Icon = GetIcon();
+
     }
 
     /// <summary>
     /// Gets the icon associated with the VS Code instance.
     /// </summary>
     /// <returns>An icon representing the VS Code instance.</returns>
-    public IIconInfo GetIcon()
+    private IconInfo GetIcon()
     {
         switch (VSCodeType)
         {
diff --git a/VsCode/Classes/VSCodeWorkspace.cs b/VsCode/Classes/VSCodeWorkspace.cs
@@ -23,6 +23,10 @@ internal class VSCodeWorkspace
     public VSCodeInstance Instance;
     public string Path;
     public VSCodeWorkspaceType VSCodeWorkspaceType;
+    public string WorkspaceName = "";
+    public string VSTypeString = "";
+    public string WorkspaceTypeString = "";
+    public DetailsElement[] Details = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="VSCodeWorkspace"/> class.
@@ -34,72 +38,76 @@ public VSCodeWorkspace(VSCodeInstance instance, string path, VSCodeWorkspaceType
         this.Path = path;
         this.Instance = instance;
         this.VSCodeWorkspaceType = vsCodeWorkspaceType;
+
+        SetName();
+        SetVSType();
+        SetWorkspaceType();
+        SetMetadata();
     }
 
     /// <summary>
-    /// Gets the name of the workspace.
+    /// Sets the name of the workspace.
     /// </summary>
     /// <returns>The name of the workspace.</returns>
-    public string GetName()
+    public void SetName()
     {
-        string workspaceName = "";
+        WorkspaceName = "";
 
         // split name by / and get last part
         var nameParts = Uri.UnescapeDataString(Path).Split('/');
         if (nameParts.Length == 0)
         {
-            return workspaceName;
+            return;
         }
 
-        workspaceName = nameParts[nameParts.Length - 1];
+        WorkspaceName = nameParts[nameParts.Length - 1];
 
         if (VSCodeWorkspaceType == VSCodeWorkspaceType.Workspace)
         {
             // remove .code-workspace
-            workspaceName = workspaceName.Replace(".code-workspace", "");
+            WorkspaceName = WorkspaceName.Replace(".code-workspace", "");
 
             // if the workspace name is "workspace", use the folder name instead
-            if (workspaceName == "workspace" && nameParts.Length >= 2)
+            if (WorkspaceName == "workspace" && nameParts.Length >= 2)
             {
-                workspaceName = nameParts[nameParts.Length - 2];
+                WorkspaceName = nameParts[nameParts.Length - 2];
             }
         }
-
-        return workspaceName;
     }
 
     /// <summary>
     /// Determines the type of the workspace (e.g., Local, WSL, Remote).
     /// </summary>
     /// <returns>The type of the workspace as a string.</returns>
-    public string GetVSType()
+    public void SetVSType()
     {
         if (Path.StartsWith("vscode-remote://wsl", System.StringComparison.OrdinalIgnoreCase))
         {
-            return "WSL";
+            VSTypeString = "WSL";
         }
         else if (Path.StartsWith("vscode-remote://", System.StringComparison.OrdinalIgnoreCase))
         {
-            return "Remote";
+            VSTypeString = "Remote";
         }
-
-        return "";
     }
 
     /// <summary>
-    /// Gets the workspace type (e.g., Workspace, Folder).
+    /// Sets the workspace type (e.g., Workspace, Folder).
     /// </summary>
     /// <returns>The type of the workspace as a string.</returns>
-    public string GetWorkspaceType()
+    public void SetWorkspaceType()
     {
         switch (VSCodeWorkspaceType)
         {
             case VSCodeWorkspaceType.Workspace:
-                return "Workspace";
+                WorkspaceTypeString = "Workspace";
+                break;
             case VSCodeWorkspaceType.Folder:
-                return "Folder";
+                WorkspaceTypeString = "Folder";
+                break;
             default:
-                return "Unknown Type";
+                WorkspaceTypeString = "Unknown Type";
+                break;
         }
     }
 
@@ -108,15 +116,15 @@ public string GetWorkspaceType()
     /// Gets the details of the workspace.
     /// </summary>
     /// <returns>An array of details elements containing information about the workspace.</returns>
-    public DetailsElement[] GetMetadata()
+    public void SetMetadata()
     {
-        var typeTags = new List<Tag>() { new Tag(GetWorkspaceType()) };
-        if (GetVSType() != "")
+        var typeTags = new List<Tag>() { new Tag(WorkspaceTypeString) };
+        if (VSTypeString != "")
         {
-            typeTags.Add(new Tag(GetVSType()));
+            typeTags.Add(new Tag(VSTypeString));
         }
 
-        return new List<DetailsElement>(){
+        Details = new List<DetailsElement>(){
             new DetailsElement()
             {
                 Key = Resource.item_details_target,
diff --git a/VsCode/CmdPalVsCode.csproj b/VsCode/CmdPalVsCode.csproj
@@ -195,7 +195,7 @@
     <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <AppxPackageDir>I:\Freelancer\RiderProjects\CommandPaletteVSCode\AppPackages\</AppxPackageDir>
+    <AppxPackageDir>G:\.net\CommandPaletteVSCode\AppPackages\</AppxPackageDir>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/VsCode/Commands/OpenVsCodeCommand.cs b/VsCode/Commands/OpenVsCodeCommand.cs
@@ -47,6 +47,8 @@ public override CommandResult Invoke()
         page.UpdateSearchText(page.SearchText, "");
         page.SearchText = "";
 
-        return CommandResult.Hide();
+        VSCodePage.LoadItems = true;
+
+        return CommandResult.GoHome();
     }
 }
diff --git a/VsCode/Package.appxmanifest b/VsCode/Package.appxmanifest
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="JonahFintzDEV.602808C55E867"
 	  Publisher="CN=240FD63B-E96D-4F79-A6D2-BFC6E6AD6C10"
-	  Version="1.4.2.0" />
+	  Version="1.5.0.0" />
 	
 	<Properties>
     <DisplayName>Command Palette - VS Code</DisplayName>
diff --git a/VsCode/Pages/VSCodePage.cs b/VsCode/Pages/VSCodePage.cs

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ internal class VSCodeWorkspace`
`23`	`23`	`public VSCodeInstance Instance;`
`24`	`24`	`public string Path;`
`25`	`25`	`public VSCodeWorkspaceType VSCodeWorkspaceType;`
	`26`	`+ public string WorkspaceName = "";`
	`27`	`+ public string VSTypeString = "";`
	`28`	`+ public string WorkspaceTypeString = "";`
	`29`	`+ public DetailsElement[] Details = [];`
`26`	`30`
`27`	`31`	`/// <summary>`
`28`	`32`	`/// Initializes a new instance of the <see cref="VSCodeWorkspace"/> class.`
`@@ -34,72 +38,76 @@ public VSCodeWorkspace(VSCodeInstance instance, string path, VSCodeWorkspaceType`
`34`	`38`	`this.Path = path;`
`35`	`39`	`this.Instance = instance;`
`36`	`40`	`this.VSCodeWorkspaceType = vsCodeWorkspaceType;`
	`41`	`+`
	`42`	`+ SetName();`
	`43`	`+ SetVSType();`
	`44`	`+ SetWorkspaceType();`
	`45`	`+ SetMetadata();`
`37`	`46`	`}`
`38`	`47`
`39`	`48`	`/// <summary>`
`40`		`- /// Gets the name of the workspace.`
	`49`	`+ /// Sets the name of the workspace.`
`41`	`50`	`/// </summary>`
`42`	`51`	`/// <returns>The name of the workspace.</returns>`
`43`		`- public string GetName()`
	`52`	`+ public void SetName()`
`44`	`53`	`{`
`45`		`- string workspaceName = "";`
	`54`	`+ WorkspaceName = "";`
`46`	`55`
`47`	`56`	`// split name by / and get last part`
`48`	`57`	`var nameParts = Uri.UnescapeDataString(Path).Split('/');`
`49`	`58`	`if (nameParts.Length == 0)`
`50`	`59`	`{`
`51`		`- return workspaceName;`
	`60`	`+ return;`
`52`	`61`	`}`
`53`	`62`
`54`		`- workspaceName = nameParts[nameParts.Length - 1];`
	`63`	`+ WorkspaceName = nameParts[nameParts.Length - 1];`
`55`	`64`
`56`	`65`	`if (VSCodeWorkspaceType == VSCodeWorkspaceType.Workspace)`
`57`	`66`	`{`
`58`	`67`	`// remove .code-workspace`
`59`		`- workspaceName = workspaceName.Replace(".code-workspace", "");`
	`68`	`+ WorkspaceName = WorkspaceName.Replace(".code-workspace", "");`
`60`	`69`
`61`	`70`	`// if the workspace name is "workspace", use the folder name instead`
`62`		`- if (workspaceName == "workspace" && nameParts.Length >= 2)`
	`71`	`+ if (WorkspaceName == "workspace" && nameParts.Length >= 2)`
`63`	`72`	`{`
`64`		`- workspaceName = nameParts[nameParts.Length - 2];`
	`73`	`+ WorkspaceName = nameParts[nameParts.Length - 2];`
`65`	`74`	`}`
`66`	`75`	`}`
`67`		`-`
`68`		`- return workspaceName;`
`69`	`76`	`}`
`70`	`77`
`71`	`78`	`/// <summary>`
`72`	`79`	`/// Determines the type of the workspace (e.g., Local, WSL, Remote).`
`73`	`80`	`/// </summary>`
`74`	`81`	`/// <returns>The type of the workspace as a string.</returns>`
`75`		`- public string GetVSType()`
	`82`	`+ public void SetVSType()`
`76`	`83`	`{`
`77`	`84`	`if (Path.StartsWith("vscode-remote://wsl", System.StringComparison.OrdinalIgnoreCase))`
`78`	`85`	`{`
`79`		`- return "WSL";`
	`86`	`+ VSTypeString = "WSL";`
`80`	`87`	`}`
`81`	`88`	`else if (Path.StartsWith("vscode-remote://", System.StringComparison.OrdinalIgnoreCase))`
`82`	`89`	`{`
`83`		`- return "Remote";`
	`90`	`+ VSTypeString = "Remote";`
`84`	`91`	`}`
`85`		`-`
`86`		`- return "";`
`87`	`92`	`}`
`88`	`93`
`89`	`94`	`/// <summary>`
`90`		`- /// Gets the workspace type (e.g., Workspace, Folder).`
	`95`	`+ /// Sets the workspace type (e.g., Workspace, Folder).`
`91`	`96`	`/// </summary>`
`92`	`97`	`/// <returns>The type of the workspace as a string.</returns>`
`93`		`- public string GetWorkspaceType()`
	`98`	`+ public void SetWorkspaceType()`
`94`	`99`	`{`
`95`	`100`	`switch (VSCodeWorkspaceType)`
`96`	`101`	`{`
`97`	`102`	`case VSCodeWorkspaceType.Workspace:`
`98`		`- return "Workspace";`
	`103`	`+ WorkspaceTypeString = "Workspace";`
	`104`	`+ break;`
`99`	`105`	`case VSCodeWorkspaceType.Folder:`
`100`		`- return "Folder";`
	`106`	`+ WorkspaceTypeString = "Folder";`
	`107`	`+ break;`
`101`	`108`	`default:`
`102`		`- return "Unknown Type";`
	`109`	`+ WorkspaceTypeString = "Unknown Type";`
	`110`	`+ break;`
`103`	`111`	`}`
`104`	`112`	`}`
`105`	`113`
`@@ -108,15 +116,15 @@ public string GetWorkspaceType()`
`108`	`116`	`/// Gets the details of the workspace.`
`109`	`117`	`/// </summary>`
`110`	`118`	`/// <returns>An array of details elements containing information about the workspace.</returns>`
`111`		`- public DetailsElement[] GetMetadata()`
	`119`	`+ public void SetMetadata()`
`112`	`120`	`{`
`113`		`- var typeTags = new List<Tag>() { new Tag(GetWorkspaceType()) };`
`114`		`- if (GetVSType() != "")`
	`121`	`+ var typeTags = new List<Tag>() { new Tag(WorkspaceTypeString) };`
	`122`	`+ if (VSTypeString != "")`
`115`	`123`	`{`
`116`		`- typeTags.Add(new Tag(GetVSType()));`
	`124`	`+ typeTags.Add(new Tag(VSTypeString));`
`117`	`125`	`}`
`118`	`126`
`119`		`- return new List<DetailsElement>(){`
	`127`	`+ Details = new List<DetailsElement>(){`
`120`	`128`	`new DetailsElement()`
`121`	`129`	`{`
`122`	`130`	`Key = Resource.item_details_target,`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ public override CommandResult Invoke()`
`47`	`47`	`page.UpdateSearchText(page.SearchText, "");`
`48`	`48`	`page.SearchText = "";`
`49`	`49`
`50`		`- return CommandResult.Hide();`
	`50`	`+ VSCodePage.LoadItems = true;`
	`51`	`+`
	`52`	`+ return CommandResult.GoHome();`
`51`	`53`	`}`
`52`	`54`	`}`