FallbackWorkspaceItem retrieves items from the VisualStudioCodePage's ListItem cache

Author: tanchekwei

WorkspaceLauncherForVSCode/Pages/FallbackWorkspaceItem.cs

@@ -12,29 +12,17 @@ namespace WorkspaceLauncherForVSCode.Pages;
 internal sealed partial class FallbackWorkspaceItem : FallbackCommandItem
 {
     private readonly VisualStudioCodePage _page;
-    private readonly SettingsManager _settingsManager;
-    private readonly WorkspaceStorage _workspaceStorage;
-    private readonly CommandContextItem _refreshWorkspacesCommandContextItem;
-    private readonly IPinService _pinService;
     private readonly int _index;
 
     public FallbackWorkspaceItem(
         VisualStudioCodePage page,
-        SettingsManager settingsManager,
-        WorkspaceStorage workspaceStorage,
-        CommandContextItem refreshWorkspacesCommandContextItem,
-        IPinService pinService,
         int index)
         : base(new NoOpCommand(),
         $"{Constant.VisualStudioCodeDisplayName} fallback result no. {index + 1}",
         $"{Package.Current.Id.Name}.{nameof(FallbackWorkspaceItem)}.{index}")
     {
         Icon = Classes.Icon.VisualStudioAndVisualStudioCode;
         _page = page;
-        _settingsManager = settingsManager;
-        _workspaceStorage = workspaceStorage;
-        _refreshWorkspacesCommandContextItem = refreshWorkspacesCommandContextItem;
-        _pinService = pinService;
         _index = index;
     }
 
@@ -58,17 +46,12 @@ public override void UpdateQuery(string query)
         }
 
         var best = filtered[_index];
-        var isVSSolution = best.WorkspaceType == WorkspaceType.Solution || best.WorkspaceType == WorkspaceType.Solution2026;
-        var (command, icon, _, _, moreCommands) = isVSSolution
-            ? WorkspaceItemFactory.CreateSolutionComponents(best, _page, _settingsManager, _page.VSCodeService.GetVisualStudioInstances())
-            : WorkspaceItemFactory.CreateVSCodeComponents(best, _page, _settingsManager);
+        var listItem = _page.GetOrCreateListItem(best);
 
-        WorkspaceItemFactory.AddCommonCommands(moreCommands, best, _settingsManager, _refreshWorkspacesCommandContextItem, _pinService);
-
-        Title = best.Name ?? string.Empty;
-        Subtitle = best.WindowsPath ?? string.Empty;
-        Icon = icon;
-        Command = command;
-        MoreCommands = moreCommands.ToArray();
+        Title = listItem.Title;
+        Subtitle = listItem.Subtitle;
+        Icon = listItem.Icon;
+        Command = listItem.Command;
+        MoreCommands = listItem.MoreCommands;
     }
 }

WorkspaceLauncherForVSCode/Pages/VisualStudioCodePage.cs

@@ -268,42 +268,45 @@ public override void LoadMore()
         RaiseItemsChanged(_visibleItems.Count);
     }
 
-    private ListItem GetOrCreateListItem(VisualStudioCodeWorkspace workspace, bool isTopLevelPinCommand = false)
+    public ListItem GetOrCreateListItem(VisualStudioCodeWorkspace workspace, bool isTopLevelPinCommand = false)
     {
-        if (!_listItemCache.TryGetValue(workspace.Id, out var listItem))
-        {
-            listItem = WorkspaceItemFactory.Create(workspace, this, _workspaceStorage, _settingsManager, _refreshWorkspacesCommandContextItem, _pinService, _visualStudioInstanceList);
-            _listItemCache[workspace.Id] = listItem;
-        }
-        if (isTopLevelPinCommand)
+        lock (_itemsLock)
         {
-            var newMoreCommands = new List<ICommandContextItem>();
-            if (listItem.MoreCommands != null)
+            if (!_listItemCache.TryGetValue(workspace.Id, out var listItem))
+            {
+                listItem = WorkspaceItemFactory.Create(workspace, this, _workspaceStorage, _settingsManager, _refreshWorkspacesCommandContextItem, _pinService, _visualStudioInstanceList);
+                _listItemCache[workspace.Id] = listItem;
+            }
+            if (isTopLevelPinCommand)
             {
-                foreach (var mc in listItem.MoreCommands)
+                var newMoreCommands = new List<ICommandContextItem>();
+                if (listItem.MoreCommands != null)
                 {
-                    if (mc is CommandContextItem cci)
+                    foreach (var mc in listItem.MoreCommands)
                     {
-                        if (cci.Command is HelpPage || cci.Command is RefreshWorkspacesCommand || cci.Command is PinWorkspaceCommand)
+                        if (mc is CommandContextItem cci)
                         {
-                            continue;
+                            if (cci.Command is HelpPage || cci.Command is RefreshWorkspacesCommand || cci.Command is PinWorkspaceCommand)
+                            {
+                                continue;
+                            }
+                            newMoreCommands.Add(cci);
                         }
-                        newMoreCommands.Add(cci);
                     }
                 }
-            }
 
-            return new ListItem(listItem.Command)
-            {
-                Title = listItem.Title,
-                Subtitle = listItem.Subtitle,
-                Details = listItem.Details,
-                Icon = listItem.Icon,
-                Tags = listItem.Tags,
-                MoreCommands = newMoreCommands.ToArray()
-            };
+                return new ListItem(listItem.Command)
+                {
+                    Title = listItem.Title,
+                    Subtitle = listItem.Subtitle,
+                    Details = listItem.Details,
+                    Icon = listItem.Icon,
+                    Tags = listItem.Tags,
+                    MoreCommands = newMoreCommands.ToArray()
+                };
+            }
+            return listItem;
         }
-        return listItem;
     }
 
     private async Task RefreshWorkspacesAsync(bool isUserInitiated, bool isBackground = false)

WorkspaceLauncherForVSCode/WorkspaceLauncherForVSCodeCommandsProvider.cs

@@ -48,15 +48,11 @@ public WorkspaceLauncherForVSCodeCommandsProvider(
             var refreshCommandContextItem = new CommandContextItem(refreshWorkspacesCommand);
             _fallbacks = new IFallbackCommandItem[_settingsManager.FallbackCount + Constant.FallbackIndex.StartOfDynamicFallback];
             _fallbacks[Constant.FallbackIndex.OpenInVisualStudioCode] = new FallbackOpenRecentVisualStudioCodeItem(_page);
-            for (int i = Constant.FallbackIndex.StartOfDynamicFallback, j = 0; i < _fallbacks.Length; i++, j++)
+            for (int i = Constant.FallbackIndex.StartOfDynamicFallback, fallbackResultIndex = 0; i < _fallbacks.Length; i++, fallbackResultIndex++)
             {
                 _fallbacks[i] = new FallbackWorkspaceItem(
                     _page,
-                    _settingsManager,
-                    workspaceStorage,
-                    refreshCommandContextItem,
-                    pinService,
-                    j); // index start with 0
+                    fallbackResultIndex); // index start with 0
             }
         }
         catch (Exception ex)