Skip to content

Commit 9d89848

Browse files
committed
Update list on tagTypes setting changed
1 parent 2b85b5c commit 9d89848

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

WorkspaceLauncherForVSCode/Classes/SettingsManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public class SettingsManager : JsonSettingsManager
5151
private readonly ToggleSetting _showTypeTag = new(
5252
Namespaced(nameof(_showTypeTag)),
5353
Resource.setting_tagType_option_type_label,
54-
"Show the 'Type' tag (Workspace/Folder)",
55-
false);
54+
"Show the 'Type' tag (Workspace/WSL/Codespaces/Dev Container/SSH Remote/Attached Container)",
55+
true);
5656

5757
private readonly ToggleSetting _showTargetTag = new(
5858
Namespaced(nameof(_showTargetTag)),

WorkspaceLauncherForVSCode/Listeners/SettingsListener.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class SettingsListener
1616
private SearchBy _previousSearchBy;
1717
private SecondaryCommand _previousVsSecondaryCommand;
1818
private SecondaryCommand _previousVscodeSecondaryCommand;
19+
private TagType _previousTagTypes;
1920

2021
public event EventHandler? InstanceSettingsChanged;
2122
public event EventHandler? PageSettingsChanged;
@@ -28,6 +29,7 @@ public SettingsListener(SettingsManager settingsManager)
2829
_previousEnableVisualStudio = _settingsManager.EnableVisualStudio;
2930
_previousVsSecondaryCommand = _settingsManager.VSSecondaryCommand;
3031
_previousVscodeSecondaryCommand = _settingsManager.VSCodeSecondaryCommand;
32+
_previousTagTypes = _settingsManager.TagTypes;
3133
_settingsManager.Settings.SettingsChanged += OnSettingsChanged;
3234
}
3335

@@ -38,8 +40,9 @@ private void OnSettingsChanged(object? sender, Settings e)
3840
var currentEnableVisualStudio = _settingsManager.EnableVisualStudio;
3941
var currentVsSecondaryCommand = _settingsManager.VSSecondaryCommand;
4042
var currentVscodeSecondaryCommand = _settingsManager.VSCodeSecondaryCommand;
43+
var currentTagTypes = _settingsManager.TagTypes;
4144

42-
if (currentEditions != _previousEditions || currentVsSecondaryCommand != _previousVsSecondaryCommand || currentVscodeSecondaryCommand != _previousVscodeSecondaryCommand)
45+
if (currentEditions != _previousEditions || currentVsSecondaryCommand != _previousVsSecondaryCommand || currentVscodeSecondaryCommand != _previousVscodeSecondaryCommand || currentTagTypes != _previousTagTypes)
4346
{
4447
InstanceSettingsChanged?.Invoke(this, EventArgs.Empty);
4548
_previousEditions = currentEditions;

WorkspaceLauncherForVSCode/Workspaces/WorkspaceItemFactory.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,18 @@ public static ListItem Create(
8080
};
8181
if (settingsManager.TagTypes.HasFlag(TagType.Type))
8282
{
83-
tags.Add(new Tag(workspace.WorkspaceTypeString));
8483
if (workspace.VsCodeRemoteType != null)
8584
{
8685
tags.Add(new Tag(workspace.VsCodeRemoteType.ToDisplayName()));
8786
}
87+
else if (workspace.VsCodeRemoteTypeStr != null)
88+
{
89+
tags.Add(new Tag(workspace.VsCodeRemoteTypeStr));
90+
}
91+
else if (workspace.WorkspaceType == WorkspaceType.Workspace)
92+
{
93+
tags.Add(new Tag(nameof(WorkspaceType.Workspace)));
94+
}
8895
}
8996
if (settingsManager.TagTypes.HasFlag(TagType.Target))
9097
{
@@ -93,15 +100,6 @@ public static ListItem Create(
93100
tags.Add(new Tag(name));
94101
}
95102
}
96-
97-
if (workspace.VsCodeRemoteType != null)
98-
{
99-
tags.Add(new Tag(workspace.VsCodeRemoteType.ToDisplayName()));
100-
}
101-
else if (workspace.VsCodeRemoteTypeStr != null)
102-
{
103-
tags.Add(new Tag(workspace.VsCodeRemoteTypeStr));
104-
}
105103
else
106104
{
107105
if (settingsManager.VSCodeSecondaryCommand == SecondaryCommand.OpenAsAdministrator)

0 commit comments

Comments
 (0)