Merge pull request #20 from taooceros/workspace

taooceros · web-flow · commit 8b131557791b · 2025-03-30T17:14:30.000-05:00
Support workspace
diff --git a/Flow.Plugin.VSCodeWorkspaces.csproj b/Flow.Plugin.VSCodeWorkspaces.csproj
@@ -7,7 +7,7 @@
 		<AssemblyName>Flow.Plugin.VSCodeWorkspaces</AssemblyName>
 		<OutputType>Library</OutputType>
 		<Version>1.0</Version>
-		<useWPF>true</useWPF>
+		<UseWpf>true</UseWpf>
 		<Platforms>x64</Platforms>
 		<AppendRuntimeIdentifierToOutputPath>False</AppendRuntimeIdentifierToOutputPath>
 		<LangVersion>latest</LangVersion>
diff --git a/Main.cs b/Main.cs
@@ -19,15 +19,15 @@ namespace Flow.Plugin.VSCodeWorkspaces
 
     public class Main : IPlugin, IPluginI18n, ISettingProvider, IContextMenu
     {
-        internal static PluginInitContext _context { get; private set; }
+        internal static PluginInitContext Context { get; private set; }
 
         private static Settings _settings;
 
         public string Name => GetTranslatedPluginTitle();
 
         public string Description => GetTranslatedPluginDescription();
 
-        private VSCodeInstance defaultInstalce;
+        private VSCodeInstance _defaultInstance;
 
         private readonly VSCodeWorkspacesApi _workspacesApi = new();
 
@@ -36,13 +36,13 @@ public class Main : IPlugin, IPluginI18n, ISettingProvider, IContextMenu
         public List<Result> Query(Query query)
         {
             var results = new List<Result>();
-            var workspaces = new List<VSCodeWorkspace>();
+            var workspaces = new List<VsCodeWorkspace>();
 
             // User defined extra workspaces
-            if (defaultInstalce != null)
+            if (_defaultInstance != null)
             {
                 workspaces.AddRange(_settings.CustomWorkspaces.Select(uri =>
-                    VSCodeWorkspacesApi.ParseVSCodeUri(uri, defaultInstalce)));
+                    VSCodeWorkspacesApi.ParseVSCodeUri(uri, _defaultInstance)));
             }
 
             // Search opened workspaces
@@ -95,9 +95,9 @@ public List<Result> Query(Query query)
                             }
                             catch (Win32Exception)
                             {
-                                var name = $"{_context.CurrentPluginMetadata.Name}";
+                                var name = $"{Context.CurrentPluginMetadata.Name}";
                                 string msg = Resources.OpenFail;
-                                _context.API.ShowMsg(name, msg, string.Empty);
+                                Context.API.ShowMsg(name, msg, string.Empty);
                                 hide = false;
                             }
 
@@ -113,7 +113,7 @@ public List<Result> Query(Query query)
             {
                 results = results.Where(r =>
                 {
-                    r.Score = _context.API.FuzzySearch(query.Search, r.Title).Score;
+                    r.Score = Context.API.FuzzySearch(query.Search, r.Title).Score;
                     return r.Score > 0;
                 }).ToList();
             }
@@ -122,20 +122,20 @@ public List<Result> Query(Query query)
             return results;
         }
 
-        private Result CreateWorkspaceResult(VSCodeWorkspace ws)
+        private static Result CreateWorkspaceResult(VsCodeWorkspace ws)
         {
             var title = $"{ws.FolderName}";
             var typeWorkspace = ws.WorkspaceTypeToString();
 
-            if (ws.TypeWorkspace != TypeWorkspace.Local)
+            if (ws.WorkspaceLocation != WorkspaceLocation.Local)
             {
-                title = ws.Lable != null
-                    ? $"{ws.Lable}"
+                title = ws.Label != null
+                    ? $"{ws.Label}"
                     : $"{title}{(ws.ExtraInfo != null ? $" - {ws.ExtraInfo}" : string.Empty)} ({typeWorkspace})";
             }
 
             var tooltip =
-                $"{Resources.Workspace}{(ws.TypeWorkspace != TypeWorkspace.Local ? $" {Resources.In} {typeWorkspace}" : string.Empty)}: {SystemPath.RealPath(ws.RelativePath)}";
+                $"{Resources.Workspace}{(ws.WorkspaceLocation != WorkspaceLocation.Local ? $" {Resources.In} {typeWorkspace}" : string.Empty)}: {SystemPath.RealPath(ws.RelativePath)}";
 
             return new Result
             {
@@ -150,7 +150,7 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)
                         var modifierKeys = c.SpecialKeyState.ToModifierKeys();
                         if (modifierKeys == System.Windows.Input.ModifierKeys.Control)
                         {
-                            _context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));
+                            Context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));
                             return true;
                         }
 
@@ -160,17 +160,21 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)
                             UseShellExecute = true,
                             WindowStyle = ProcessWindowStyle.Hidden,
                         };
-                        process.ArgumentList.Add("--folder-uri");
+
+                        process.ArgumentList.Add(ws.WorkspaceType == WorkspaceType.Workspace
+                            ? "--file-uri"
+                            : "--folder-uri");
+
                         process.ArgumentList.Add(ws.Path);
 
                         Process.Start(process);
                         return true;
                     }
                     catch (Win32Exception)
                     {
-                        var name = $"{_context.CurrentPluginMetadata.Name}";
+                        var name = $"{Context.CurrentPluginMetadata.Name}";
                         string msg = Resources.OpenFail;
-                        _context.API.ShowMsg(name, msg, string.Empty);
+                        Context.API.ShowMsg(name, msg, string.Empty);
                     }
 
                     return false;
@@ -181,17 +185,17 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)
 
         public void Init(PluginInitContext context)
         {
-            _context = context;
+            Context = context;
             _settings = context.API.LoadSettingJsonStorage<Settings>();
 
             VSCodeInstances.LoadVSCodeInstances();
 
             // Prefer stable version, or the first one we got
-            defaultInstalce = VSCodeInstances.Instances.Find(e => e.VSCodeVersion == VSCodeVersion.Stable) ??
+            _defaultInstance = VSCodeInstances.Instances.Find(e => e.VSCodeVersion == VSCodeVersion.Stable) ??
                               VSCodeInstances.Instances.FirstOrDefault();
         }
 
-        public Control CreateSettingPanel() => new SettingsView(_context, _settings);
+        public Control CreateSettingPanel() => new SettingsView(Context, _settings);
 
         public void OnCultureInfoChanged(CultureInfo newCulture)
         {
@@ -211,7 +215,7 @@ public string GetTranslatedPluginDescription()
         public List<Result> LoadContextMenus(Result selectedResult)
         {
             List<Result> results = new();
-            if (selectedResult.ContextData is VSCodeWorkspace ws && ws.TypeWorkspace == TypeWorkspace.Local)
+            if (selectedResult.ContextData is VsCodeWorkspace ws && ws.WorkspaceLocation == WorkspaceLocation.Local)
             {
                 results.Add(new Result
                 {
@@ -221,7 +225,7 @@ public List<Result> LoadContextMenus(Result selectedResult)
                     TitleToolTip = Resources.OpenFolderSubTitle,
                     Action = c =>
                     {
-                        _context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));
+                        Context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));
                         return true;
                     },
                     ContextData = ws,
diff --git a/RemoteMachinesHelper/VSCodeRemoteMachinesApi.cs b/RemoteMachinesHelper/VSCodeRemoteMachinesApi.cs
@@ -61,7 +61,7 @@ public List<VSCodeRemoteMachine> Machines
                         catch (Exception ex)
                         {
                             var message = $"Failed to deserialize ${vscode_settings}";
-                            Main._context.API.LogException("VSCodeWorkSpaces", message, ex);
+                            Main.Context.API.LogException("VSCodeWorkSpaces", message, ex);
                         }
                     }
                 }
diff --git a/SettingsView.xaml.cs b/SettingsView.xaml.cs
@@ -41,8 +41,8 @@ private void ButtonAdd_Click(object sender, RoutedEventArgs e)
                 var uri = addUri.Text;
 
                 // System.Uri fails to parse vscode-remote://XXX+YYY URIs, skip them
-                var type = ParseVSCodeUri.GetTypeWorkspace(uri).TypeWorkspace;
-                if (!type.HasValue || type.Value == TypeWorkspace.Local)
+                var type = ParseVSCodeUri.GetTypeWorkspace(uri).workspaceLocation;
+                if (!type.HasValue || type.Value == WorkspaceLocation.Local)
                 {
                     // Converts file paths to proper URI
                     uri = new Uri(uri).AbsoluteUri;
diff --git a/WorkspacesHelper/ParseVSCodeUri.cs b/WorkspacesHelper/ParseVSCodeUri.cs
@@ -18,15 +18,15 @@ public class ParseVSCodeUri
 
         private static readonly Regex DevContainerWorkspace = new Regex(@"^vscode-remote://dev-container\+(.+?(?=\/))(.+)$", RegexOptions.Compiled);
 
-        public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) GetTypeWorkspace(string uri)
+        public static (WorkspaceLocation? workspaceLocation, string MachineName, string Path) GetTypeWorkspace(string uri)
         {
             if (LocalWorkspace.IsMatch(uri))
             {
                 var match = LocalWorkspace.Match(uri);
 
                 if (match.Groups.Count > 1)
                 {
-                    return (TypeWorkspace.Local, null, match.Groups[1].Value);
+                    return (WorkspaceLocation.Local, null, match.Groups[1].Value);
                 }
             }
             else if (RemoteSSHWorkspace.IsMatch(uri))
@@ -35,7 +35,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge
 
                 if (match.Groups.Count > 1)
                 {
-                    return (TypeWorkspace.RemoteSSH, match.Groups[1].Value, match.Groups[2].Value);
+                    return (WorkspaceLocation.RemoteSSH, match.Groups[1].Value, match.Groups[2].Value);
                 }
             }
             else if (RemoteWSLWorkspace.IsMatch(uri))
@@ -44,7 +44,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge
 
                 if (match.Groups.Count > 1)
                 {
-                    return (TypeWorkspace.RemoteWSL, match.Groups[1].Value, match.Groups[2].Value);
+                    return (WorkspaceLocation.RemoteWSL, match.Groups[1].Value, match.Groups[2].Value);
                 }
             }
             else if (CodespacesWorkspace.IsMatch(uri))
@@ -53,7 +53,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge
 
                 if (match.Groups.Count > 1)
                 {
-                    return (TypeWorkspace.Codespaces, null, match.Groups[2].Value);
+                    return (WorkspaceLocation.Codespaces, null, match.Groups[2].Value);
                 }
             }
             else if (DevContainerWorkspace.IsMatch(uri))
@@ -62,7 +62,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge
 
                 if (match.Groups.Count > 1)
                 {
-                    return (TypeWorkspace.DevContainer, null, match.Groups[2].Value);
+                    return (WorkspaceLocation.DevContainer, null, match.Groups[2].Value);
                 }
             }
 
diff --git a/WorkspacesHelper/VSCodeWorkspace.cs b/WorkspacesHelper/VSCodeWorkspace.cs
@@ -8,38 +8,40 @@
 
 namespace Flow.Plugin.VSCodeWorkspaces.WorkspacesHelper
 {
-    public record VSCodeWorkspace
+    public record VsCodeWorkspace
     {
         public PathString Path { get; init; }
 
         public PathString RelativePath { get; init; }
 
         public PathString FolderName { get; init; }
         
-        public string Lable { get; init; }
+        public string Label { get; init; }
 
         public string ExtraInfo { get; init; }
 
-        public TypeWorkspace TypeWorkspace { get; init; }
+        public WorkspaceLocation WorkspaceLocation { get; init; }
+        
+        public WorkspaceType WorkspaceType { get; init; }
 
         public VSCodeInstance VSCodeInstance { get; init; }
 
         public string WorkspaceTypeToString()
         {
-            return TypeWorkspace switch
+            return WorkspaceLocation switch
             {
-                TypeWorkspace.Local => Resources.TypeWorkspaceLocal,
-                TypeWorkspace.Codespaces => "Codespaces",
-                TypeWorkspace.RemoteContainers => Resources.TypeWorkspaceContainer,
-                TypeWorkspace.RemoteSSH => "SSH",
-                TypeWorkspace.RemoteWSL => "WSL",
-                TypeWorkspace.DevContainer => Resources.TypeWorkspaceDevContainer,
+                WorkspaceLocation.Local => Resources.TypeWorkspaceLocal,
+                WorkspaceLocation.Codespaces => "Codespaces",
+                WorkspaceLocation.RemoteContainers => Resources.TypeWorkspaceContainer,
+                WorkspaceLocation.RemoteSSH => "SSH",
+                WorkspaceLocation.RemoteWSL => "WSL",
+                WorkspaceLocation.DevContainer => Resources.TypeWorkspaceDevContainer,
                 _ => string.Empty
             };
         }
     }
 
-    public enum TypeWorkspace
+    public enum WorkspaceLocation
     {
         Local = 1,
         Codespaces = 2,
@@ -48,4 +50,10 @@ public enum TypeWorkspace
         RemoteContainers = 5,
         DevContainer = 6,
     }
+
+    public enum WorkspaceType
+    {
+        Folder = 1,
+        Workspace = 2,
+    }
 }
diff --git a/WorkspacesHelper/VSCodeWorkspacesApi.cs b/WorkspacesHelper/VSCodeWorkspacesApi.cs
diff --git a/plugin.json b/plugin.json

Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,15 @@ namespace Flow.Plugin.VSCodeWorkspaces`
`19`	`19`
`20`	`20`	`public class Main : IPlugin, IPluginI18n, ISettingProvider, IContextMenu`
`21`	`21`	`{`
`22`		`- internal static PluginInitContext _context { get; private set; }`
	`22`	`+ internal static PluginInitContext Context { get; private set; }`
`23`	`23`
`24`	`24`	`private static Settings _settings;`
`25`	`25`
`26`	`26`	`public string Name => GetTranslatedPluginTitle();`
`27`	`27`
`28`	`28`	`public string Description => GetTranslatedPluginDescription();`
`29`	`29`
`30`		`- private VSCodeInstance defaultInstalce;`
	`30`	`+ private VSCodeInstance _defaultInstance;`
`31`	`31`
`32`	`32`	`private readonly VSCodeWorkspacesApi _workspacesApi = new();`
`33`	`33`
`@@ -36,13 +36,13 @@ public class Main : IPlugin, IPluginI18n, ISettingProvider, IContextMenu`
`36`	`36`	`public List<Result> Query(Query query)`
`37`	`37`	`{`
`38`	`38`	`var results = new List<Result>();`
`39`		`- var workspaces = new List<VSCodeWorkspace>();`
	`39`	`+ var workspaces = new List<VsCodeWorkspace>();`
`40`	`40`
`41`	`41`	`// User defined extra workspaces`
`42`		`- if (defaultInstalce != null)`
	`42`	`+ if (_defaultInstance != null)`
`43`	`43`	`{`
`44`	`44`	`workspaces.AddRange(_settings.CustomWorkspaces.Select(uri =>`
`45`		`- VSCodeWorkspacesApi.ParseVSCodeUri(uri, defaultInstalce)));`
	`45`	`+ VSCodeWorkspacesApi.ParseVSCodeUri(uri, _defaultInstance)));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// Search opened workspaces`
`@@ -95,9 +95,9 @@ public List<Result> Query(Query query)`
`95`	`95`	`}`
`96`	`96`	`catch (Win32Exception)`
`97`	`97`	`{`
`98`		`- var name = $"{_context.CurrentPluginMetadata.Name}";`
	`98`	`+ var name = $"{Context.CurrentPluginMetadata.Name}";`
`99`	`99`	`string msg = Resources.OpenFail;`
`100`		`- _context.API.ShowMsg(name, msg, string.Empty);`
	`100`	`+ Context.API.ShowMsg(name, msg, string.Empty);`
`101`	`101`	`hide = false;`
`102`	`102`	`}`
`103`	`103`
`@@ -113,7 +113,7 @@ public List<Result> Query(Query query)`
`113`	`113`	`{`
`114`	`114`	`results = results.Where(r =>`
`115`	`115`	`{`
`116`		`- r.Score = _context.API.FuzzySearch(query.Search, r.Title).Score;`
	`116`	`+ r.Score = Context.API.FuzzySearch(query.Search, r.Title).Score;`
`117`	`117`	`return r.Score > 0;`
`118`	`118`	`}).ToList();`
`119`	`119`	`}`
`@@ -122,20 +122,20 @@ public List<Result> Query(Query query)`
`122`	`122`	`return results;`
`123`	`123`	`}`
`124`	`124`
`125`		`- private Result CreateWorkspaceResult(VSCodeWorkspace ws)`
	`125`	`+ private static Result CreateWorkspaceResult(VsCodeWorkspace ws)`
`126`	`126`	`{`
`127`	`127`	`var title = $"{ws.FolderName}";`
`128`	`128`	`var typeWorkspace = ws.WorkspaceTypeToString();`
`129`	`129`
`130`		`- if (ws.TypeWorkspace != TypeWorkspace.Local)`
	`130`	`+ if (ws.WorkspaceLocation != WorkspaceLocation.Local)`
`131`	`131`	`{`
`132`		`- title = ws.Lable != null`
`133`		`- ? $"{ws.Lable}"`
	`132`	`+ title = ws.Label != null`
	`133`	`+ ? $"{ws.Label}"`
`134`	`134`	`: $"{title}{(ws.ExtraInfo != null ? $" - {ws.ExtraInfo}" : string.Empty)} ({typeWorkspace})";`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`var tooltip =`
`138`		`- $"{Resources.Workspace}{(ws.TypeWorkspace != TypeWorkspace.Local ? $" {Resources.In} {typeWorkspace}" : string.Empty)}: {SystemPath.RealPath(ws.RelativePath)}";`
	`138`	`+ $"{Resources.Workspace}{(ws.WorkspaceLocation != WorkspaceLocation.Local ? $" {Resources.In} {typeWorkspace}" : string.Empty)}: {SystemPath.RealPath(ws.RelativePath)}";`
`139`	`139`
`140`	`140`	`return new Result`
`141`	`141`	`{`
`@@ -150,7 +150,7 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)`
`150`	`150`	`var modifierKeys = c.SpecialKeyState.ToModifierKeys();`
`151`	`151`	`if (modifierKeys == System.Windows.Input.ModifierKeys.Control)`
`152`	`152`	`{`
`153`		`- _context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));`
	`153`	`+ Context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));`
`154`	`154`	`return true;`
`155`	`155`	`}`
`156`	`156`
`@@ -160,17 +160,21 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)`
`160`	`160`	`UseShellExecute = true,`
`161`	`161`	`WindowStyle = ProcessWindowStyle.Hidden,`
`162`	`162`	`};`
`163`		`- process.ArgumentList.Add("--folder-uri");`
	`163`	`+`
	`164`	`+ process.ArgumentList.Add(ws.WorkspaceType == WorkspaceType.Workspace`
	`165`	`+ ? "--file-uri"`
	`166`	`+ : "--folder-uri");`
	`167`	`+`
`164`	`168`	`process.ArgumentList.Add(ws.Path);`
`165`	`169`
`166`	`170`	`Process.Start(process);`
`167`	`171`	`return true;`
`168`	`172`	`}`
`169`	`173`	`catch (Win32Exception)`
`170`	`174`	`{`
`171`		`- var name = $"{_context.CurrentPluginMetadata.Name}";`
	`175`	`+ var name = $"{Context.CurrentPluginMetadata.Name}";`
`172`	`176`	`string msg = Resources.OpenFail;`
`173`		`- _context.API.ShowMsg(name, msg, string.Empty);`
	`177`	`+ Context.API.ShowMsg(name, msg, string.Empty);`
`174`	`178`	`}`
`175`	`179`
`176`	`180`	`return false;`
`@@ -181,17 +185,17 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)`
`181`	`185`
`182`	`186`	`public void Init(PluginInitContext context)`
`183`	`187`	`{`
`184`		`- _context = context;`
	`188`	`+ Context = context;`
`185`	`189`	`_settings = context.API.LoadSettingJsonStorage<Settings>();`
`186`	`190`
`187`	`191`	`VSCodeInstances.LoadVSCodeInstances();`
`188`	`192`
`189`	`193`	`// Prefer stable version, or the first one we got`
`190`		`- defaultInstalce = VSCodeInstances.Instances.Find(e => e.VSCodeVersion == VSCodeVersion.Stable) ??`
	`194`	`+ _defaultInstance = VSCodeInstances.Instances.Find(e => e.VSCodeVersion == VSCodeVersion.Stable) ??`
`191`	`195`	`VSCodeInstances.Instances.FirstOrDefault();`
`192`	`196`	`}`
`193`	`197`
`194`		`- public Control CreateSettingPanel() => new SettingsView(_context, _settings);`
	`198`	`+ public Control CreateSettingPanel() => new SettingsView(Context, _settings);`
`195`	`199`
`196`	`200`	`public void OnCultureInfoChanged(CultureInfo newCulture)`
`197`	`201`	`{`
`@@ -211,7 +215,7 @@ public string GetTranslatedPluginDescription()`
`211`	`215`	`public List<Result> LoadContextMenus(Result selectedResult)`
`212`	`216`	`{`
`213`	`217`	`List<Result> results = new();`
`214`		`- if (selectedResult.ContextData is VSCodeWorkspace ws && ws.TypeWorkspace == TypeWorkspace.Local)`
	`218`	`+ if (selectedResult.ContextData is VsCodeWorkspace ws && ws.WorkspaceLocation == WorkspaceLocation.Local)`
`215`	`219`	`{`
`216`	`220`	`results.Add(new Result`
`217`	`221`	`{`
`@@ -221,7 +225,7 @@ public List<Result> LoadContextMenus(Result selectedResult)`
`221`	`225`	`TitleToolTip = Resources.OpenFolderSubTitle,`
`222`	`226`	`Action = c =>`
`223`	`227`	`{`
`224`		`- _context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));`
	`228`	`+ Context.API.OpenDirectory(SystemPath.RealPath(ws.RelativePath));`
`225`	`229`	`return true;`
`226`	`230`	`},`
`227`	`231`	`ContextData = ws,`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public List<VSCodeRemoteMachine> Machines`
`61`	`61`	`catch (Exception ex)`
`62`	`62`	`{`
`63`	`63`	`var message = $"Failed to deserialize ${vscode_settings}";`
`64`		`- Main._context.API.LogException("VSCodeWorkSpaces", message, ex);`
	`64`	`+ Main.Context.API.LogException("VSCodeWorkSpaces", message, ex);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ public class ParseVSCodeUri`
`18`	`18`
`19`	`19`	`private static readonly Regex DevContainerWorkspace = new Regex(@"^vscode-remote://dev-container\+(.+?(?=\/))(.+)$", RegexOptions.Compiled);`
`20`	`20`
`21`		`- public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) GetTypeWorkspace(string uri)`
	`21`	`+ public static (WorkspaceLocation? workspaceLocation, string MachineName, string Path) GetTypeWorkspace(string uri)`
`22`	`22`	`{`
`23`	`23`	`if (LocalWorkspace.IsMatch(uri))`
`24`	`24`	`{`
`25`	`25`	`var match = LocalWorkspace.Match(uri);`
`26`	`26`
`27`	`27`	`if (match.Groups.Count > 1)`
`28`	`28`	`{`
`29`		`- return (TypeWorkspace.Local, null, match.Groups[1].Value);`
	`29`	`+ return (WorkspaceLocation.Local, null, match.Groups[1].Value);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`else if (RemoteSSHWorkspace.IsMatch(uri))`
`@@ -35,7 +35,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge`
`35`	`35`
`36`	`36`	`if (match.Groups.Count > 1)`
`37`	`37`	`{`
`38`		`- return (TypeWorkspace.RemoteSSH, match.Groups[1].Value, match.Groups[2].Value);`
	`38`	`+ return (WorkspaceLocation.RemoteSSH, match.Groups[1].Value, match.Groups[2].Value);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`else if (RemoteWSLWorkspace.IsMatch(uri))`
`@@ -44,7 +44,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge`
`44`	`44`
`45`	`45`	`if (match.Groups.Count > 1)`
`46`	`46`	`{`
`47`		`- return (TypeWorkspace.RemoteWSL, match.Groups[1].Value, match.Groups[2].Value);`
	`47`	`+ return (WorkspaceLocation.RemoteWSL, match.Groups[1].Value, match.Groups[2].Value);`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`else if (CodespacesWorkspace.IsMatch(uri))`
`@@ -53,7 +53,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge`
`53`	`53`
`54`	`54`	`if (match.Groups.Count > 1)`
`55`	`55`	`{`
`56`		`- return (TypeWorkspace.Codespaces, null, match.Groups[2].Value);`
	`56`	`+ return (WorkspaceLocation.Codespaces, null, match.Groups[2].Value);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`else if (DevContainerWorkspace.IsMatch(uri))`
`@@ -62,7 +62,7 @@ public static (TypeWorkspace? TypeWorkspace, string MachineName, string Path) Ge`
`62`	`62`
`63`	`63`	`if (match.Groups.Count > 1)`
`64`	`64`	`{`
`65`		`- return (TypeWorkspace.DevContainer, null, match.Groups[2].Value);`
	`65`	`+ return (WorkspaceLocation.DevContainer, null, match.Groups[2].Value);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`