Skip to content

Commit 2b85b5c

Browse files
tanchekweitanchekwei
committed
Remove prefer edition setting
1 parent 2acb43c commit 2b85b5c

File tree

7 files changed

+7
-44
lines changed

7 files changed

+7
-44
lines changed

‎WorkspaceLauncherForVSCode/Classes/SettingsManager.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ public class SettingsManager : JsonSettingsManager
1616

1717
private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
1818

19-
private static readonly List<ChoiceSetSetting.Choice> _preferredEditionChoices =
20-
[
21-
new ChoiceSetSetting.Choice(Resource.setting_preferredEdition_option_default_label, "Default"),
22-
new ChoiceSetSetting.Choice(Resource.setting_preferredEdition_option_insider_label, "Insider"),
23-
];
24-
2519
private static readonly List<ChoiceSetSetting.Choice> _commandResultChoices =
2620
[
2721
new ChoiceSetSetting.Choice(Resource.setting_commandResult_option_dismiss_label, nameof(CommandResultType.Dismiss)),
@@ -96,12 +90,6 @@ public class SettingsManager : JsonSettingsManager
9690
"Enable custom Visual Studio Code installations found in the PATH",
9791
false);
9892

99-
private readonly ChoiceSetSetting _preferredEdition = new(
100-
Namespaced(nameof(PreferredEdition)),
101-
Resource.setting_preferredEdition_label,
102-
Resource.setting_preferredEdition_desc,
103-
_preferredEditionChoices);
104-
10593
private readonly ChoiceSetSetting _commandResult = new(
10694
Namespaced(nameof(CommandResult)),
10795
Resource.setting_commandResult_label,
@@ -133,7 +121,6 @@ public class SettingsManager : JsonSettingsManager
133121
"8");
134122

135123
public bool EnableLogging => _enableLogging.Value;
136-
public string PreferredEdition => _preferredEdition.Value ?? "Default";
137124
public bool EnableVisualStudio => _enableVisualStudio.Value;
138125

139126
public TagType TagTypes
@@ -249,7 +236,6 @@ public SettingsManager()
249236
Settings.Add(_enableSystem);
250237
Settings.Add(_enableInsider);
251238
Settings.Add(_enableCustom);
252-
Settings.Add(_preferredEdition);
253239
Settings.Add(_commandResult);
254240
Settings.Add(_pageSize);
255241
Settings.Add(_searchBy);

‎WorkspaceLauncherForVSCode/Interfaces/IVisualStudioCodeService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace WorkspaceLauncherForVSCode
1010
public interface IVisualStudioCodeService
1111
{
1212
List<VisualStudioCodeInstance> Instances { get; }
13-
void LoadInstances(VisualStudioCodeEdition enabledEditions, string preferredEdition);
13+
void LoadInstances(VisualStudioCodeEdition enabledEditions);
1414
Task<List<VisualStudioCodeWorkspace>> GetWorkspacesAsync(List<VisualStudioCodeWorkspace> dbWorkspaces, CancellationToken cancellationToken);
1515
Task<List<VisualStudioCodeWorkspace>> GetVisualStudioSolutions(List<VisualStudioCodeWorkspace> dbWorkspaces, bool showPrerelease);
1616
}

‎WorkspaceLauncherForVSCode/Listeners/SettingsListener.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public SettingsListener(SettingsManager settingsManager)
2424
{
2525
_settingsManager = settingsManager;
2626
_previousEditions = _settingsManager.EnabledEditions;
27-
_previousPreferredEdition = _settingsManager.PreferredEdition;
2827
_previousSearchBy = _settingsManager.SearchBy;
2928
_previousEnableVisualStudio = _settingsManager.EnableVisualStudio;
3029
_previousVsSecondaryCommand = _settingsManager.VSSecondaryCommand;
@@ -35,17 +34,15 @@ public SettingsListener(SettingsManager settingsManager)
3534
private void OnSettingsChanged(object? sender, Settings e)
3635
{
3736
var currentEditions = _settingsManager.EnabledEditions;
38-
var currentPreferredEdition = _settingsManager.PreferredEdition;
3937
var currentSearchBy = _settingsManager.SearchBy;
4038
var currentEnableVisualStudio = _settingsManager.EnableVisualStudio;
4139
var currentVsSecondaryCommand = _settingsManager.VSSecondaryCommand;
4240
var currentVscodeSecondaryCommand = _settingsManager.VSCodeSecondaryCommand;
4341

44-
if (currentEditions != _previousEditions || currentPreferredEdition != _previousPreferredEdition || currentVsSecondaryCommand != _previousVsSecondaryCommand || currentVscodeSecondaryCommand != _previousVscodeSecondaryCommand)
42+
if (currentEditions != _previousEditions || currentVsSecondaryCommand != _previousVsSecondaryCommand || currentVscodeSecondaryCommand != _previousVscodeSecondaryCommand)
4543
{
4644
InstanceSettingsChanged?.Invoke(this, EventArgs.Empty);
4745
_previousEditions = currentEditions;
48-
_previousPreferredEdition = currentPreferredEdition;
4946
}
5047

5148
if (currentSearchBy != _previousSearchBy)

‎WorkspaceLauncherForVSCode/Pages/VisualStudioCodePage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private async Task RefreshWorkspacesAsync(bool isUserInitiated)
197197

198198
if (isUserInitiated)
199199
{
200-
_vscodeService.LoadInstances(_settingsManager.EnabledEditions, _settingsManager.PreferredEdition);
200+
_vscodeService.LoadInstances(_settingsManager.EnabledEditions);
201201
}
202202

203203
var dbWorkspaces = await _workspaceStorage.GetWorkspacesAsync();

‎WorkspaceLauncherForVSCode/Services/VisualStudioCodeInstanceProvider.cs‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ namespace WorkspaceLauncherForVSCode.Services
1010
{
1111
public static class VisualStudioCodeInstanceProvider
1212
{
13-
public static List<VisualStudioCodeInstance> GetInstances(VisualStudioCodeEdition enabledEditions, string preferredEdition)
13+
public static List<VisualStudioCodeInstance> GetInstances(VisualStudioCodeEdition enabledEditions)
1414
{
1515
#if DEBUG
1616
using var logger = new TimeLogger();
1717
#endif
1818
var instances = new List<VisualStudioCodeInstance>();
1919
LoadInstances(enabledEditions, instances);
20-
SortInstances(instances, preferredEdition);
2120
return instances;
2221
}
2322

@@ -98,24 +97,5 @@ private static void AddInstance(List<VisualStudioCodeInstance> instances, string
9897
instances.Add(new VisualStudioCodeInstance(name, path, storagePath, type, codeType));
9998
}
10099
}
101-
102-
private static void SortInstances(List<VisualStudioCodeInstance> instances, string preferredEdition)
103-
{
104-
instances.Sort((x, y) =>
105-
{
106-
var xIsPreferred = (preferredEdition == "Insider" && x.VisualStudioCodeType == VisualStudioCodeType.Insider) || (preferredEdition != "Insider" && x.VisualStudioCodeType == VisualStudioCodeType.Default);
107-
var yIsPreferred = (preferredEdition == "Insider" && y.VisualStudioCodeType == VisualStudioCodeType.Insider) || (preferredEdition != "Insider" && y.VisualStudioCodeType == VisualStudioCodeType.Default);
108-
109-
if (xIsPreferred && !yIsPreferred)
110-
{
111-
return -1;
112-
}
113-
if (!xIsPreferred && yIsPreferred)
114-
{
115-
return 1;
116-
}
117-
return 0;
118-
});
119-
}
120100
}
121101
}

‎WorkspaceLauncherForVSCode/Services/VisualStudioCodeService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ public class VisualStudioCodeService : IVisualStudioCodeService
1414
{
1515
public List<VisualStudioCodeInstance> Instances { get; private set; } = new List<VisualStudioCodeInstance>();
1616

17-
public void LoadInstances(VisualStudioCodeEdition enabledEditions, string preferredEdition)
17+
public void LoadInstances(VisualStudioCodeEdition enabledEditions)
1818
{
1919
#if DEBUG
2020
using var logger = new TimeLogger();
2121
#endif
22-
Instances = VisualStudioCodeInstanceProvider.GetInstances(enabledEditions, preferredEdition);
22+
Instances = VisualStudioCodeInstanceProvider.GetInstances(enabledEditions);
2323
}
2424

2525
public async Task<List<VisualStudioCodeWorkspace>> GetWorkspacesAsync(List<VisualStudioCodeWorkspace> dbWorkspaces, CancellationToken cancellationToken)

‎WorkspaceLauncherForVSCode/WorkspaceLauncherForVSCodeCommandsProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public WorkspaceLauncherForVSCodeCommandsProvider()
2929
Icon = Classes.Icon.VisualStudioAndVisualStudioCode;
3030
Settings = _settingsManager.Settings;
3131

32-
_vscodeService.LoadInstances(_settingsManager.EnabledEditions, _settingsManager.PreferredEdition);
32+
_vscodeService.LoadInstances(_settingsManager.EnabledEditions);
3333

3434
_settingsListener = new SettingsListener(_settingsManager);
3535
_settingsListener.InstanceSettingsChanged += OnInstanceSettingsChanged;

0 commit comments

Comments
 (0)