Merge pull request #7 from JonahFintzDev/settings-integration

Add Settings Integration

Author: JonahFintzDev

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+.idea

README.md

@@ -14,17 +14,37 @@ This project provides a command palette extension for opening Visual Studio Code
 
 ## Installation
 
+> [!NOTE]  
+> Because the application is first signed by the Microsoft Store, updates will take a few days to be available via WinGet or in the Command Palette.
+
 ### Windows Store
 
 <a href="https://apps.microsoft.com/detail/9PKCGVQ05TG1?mode=direct">
 	<img src="https://get.microsoft.com/images/en-us%20light.svg" width="300"/>
 </a>
 
+### Via Command Palette
+1. Open Command Palette
+2. Select "Command Palette - VS Code"
+
+### Via Winget
+1. Open Command Prompt or PowerShell
+2. Run the following command:
+   ```bash
+   winget install JonahFintzDEV.CommandPalette-VSCode
+   ```
+
 ### Manual Installation
 
 1. Make sure you use the latest version of PowerToys.
-2. Download the current Version and the certificate from [releases](https://github.com/JonahFintzDev/CommandPaletteVSCode/releases/).
-3. Install the application by double-clicking the `.msix` file.
+2. Install the application by double-clicking the `.msix` file.
+
+## Settings
+
+- **Preferred Edition**: Determines which edition (Default or Insider) is used when a folder or workspace has been opened in both editions of VS Code.
+- **Use Strict Search**: Enables or disables strict search for workspaces.  
+  - **Strict Search**: Matches items where the search text appears as a contiguous substring in the item's title or subtitle. For example, searching for "abc" will match "abc" or "abc123" but not "a1b2c3".
+- **Show Details Panel**: Toggles the visibility of the details panel in the UI.
 
 ## Contributing
 

VsCode/Classes/SettingsManager.cs

@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using CmdPalVsCode.Properties;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using System.Collections.Generic;
+using System.IO;
+
+namespace CmdPalVsCode;
+
+public class SettingsManager : JsonSettingsManager
+{
+    private static readonly string _namespace = "vscode";
+
+    private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
+
+    private static readonly List<ChoiceSetSetting.Choice> _choices =
+    [
+        new ChoiceSetSetting.Choice(Resource.setting_preferredEdition_option_default_label, "Default"),
+        new ChoiceSetSetting.Choice(Resource.setting_preferredEdition_option_insider_label, "Insider"),
+    ];
+
+
+    private readonly ToggleSetting _useStrictSearch = new(
+        Namespaced(nameof(UseStrichtSearch)),
+        Resource.settings_useStrictSearch_label,
+        Resource.settings_useStrictSearch_desc,
+        false); // TODO -- double check default value
+
+    private readonly ToggleSetting _showDetails = new(
+       Namespaced(nameof(ShowDetails)),
+       Resource.settings_showDetails_label,
+       Resource.settings_showDetails_desc,
+       false); // TODO -- double check default value
+
+    private readonly ChoiceSetSetting _preferredEdition = new(
+        Namespaced(nameof(PreferredEdition)),
+        Resource.setting_preferredEdition_label,
+        Resource.setting_preferredEdition_desc,
+        _choices);
+
+    public bool UseStrichtSearch => _useStrictSearch.Value;
+    public bool ShowDetails => _showDetails.Value;
+
+    public string PreferredEdition => _preferredEdition.Value ?? "Default";
+
+
+    internal static string SettingsJsonPath()
+    {
+        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        Directory.CreateDirectory(directory);
+
+        // now, the state is just next to the exe
+        return Path.Combine(directory, "settings.json");
+    }
+
+    public SettingsManager()
+    {
+        FilePath = SettingsJsonPath();
+
+        Settings.Add(_showDetails);
+        Settings.Add(_useStrictSearch);
+        Settings.Add(_preferredEdition);
+
+        // Load settings from file upon initialization
+        LoadSettings();
+
+        Settings.SettingsChanged += (s, a) =>
+        {
+            VSCodeHandler.LoadInstances(PreferredEdition);
+            this.SaveSettings();
+        };
+    }
+}

VsCode/Classes/VSCodeHandler.cs

@@ -15,19 +15,27 @@ internal static class VSCodeHandler
 
     /// <summary>
     /// Loads all available VS Code instances (default and insiders, user and system installations).
-    /// </summary>
-    public static void LoadInstances()
+    /// </summary> 
+    public static void LoadInstances(string preferredEdition)
     {
         var appdataProgramFilesPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
         var programsFolderPathBase = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
         var defaultStoragePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Code", "User", "globalStorage");
         var insiderStoragePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Code - Insiders", "User", "globalStorage");
 
+        Instances.Clear();
 
         AddInstance("VS Code", Path.Combine(appdataProgramFilesPath, "Programs", "Microsoft VS Code", "Code.exe"), defaultStoragePath, VSCodeInstallationType.User, VSCodeType.Default);
         AddInstance("VS Code [System]", Path.Combine(programsFolderPathBase, "Microsoft VS Code", "Code.exe"), defaultStoragePath, VSCodeInstallationType.System, VSCodeType.Default);
         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);
+
+
+        if (preferredEdition == "Insider")
+        {
+            // Reverse the order of the instances
+            Instances.Reverse();
+        }
     }
 
     /// <summary>

VsCode/Classes/VSCodeWorkspace.cs

@@ -1,4 +1,9 @@
-namespace CmdPalVsCode;
+using CmdPalVsCode.Properties;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using System;
+using System.Collections.Generic;
+
+namespace CmdPalVsCode;
 
 /// <summary>
 /// Enum for type of Visual Studio Code.
@@ -97,4 +102,36 @@ public string GetWorkspaceType()
                 return "Unknown Type";
         }
     }
+
+
+    /// <summary>
+    /// Gets the details of the workspace.
+    /// </summary>
+    /// <returns>An array of details elements containing information about the workspace.</returns>
+    public DetailsElement[] GetMetadata()
+    {
+        var typeTags = new List<Tag>() { new Tag(GetWorkspaceType()) };
+        if (GetVSType() != "")
+        {
+            typeTags.Add(new Tag(GetVSType()));
+        }
+
+        return new List<DetailsElement>(){
+            new DetailsElement()
+            {
+                Key = Resource.item_details_target,
+                Data = new DetailsTags() { Tags = new List<Tag>() { new Tag(Instance.Name) }.ToArray() }
+            },
+            new DetailsElement()
+            {
+                Key = Resource.item_details_type,
+                Data = new DetailsTags() { Tags = typeTags.ToArray() }
+            },
+            new DetailsElement()
+            {
+                Key = Resource.item_details_path,
+                Data = new DetailsLink() { Text = Uri.UnescapeDataString(Path) },
+            }
+        }.ToArray();
+    }
 }

VsCode/CmdPalVsCode.csproj

@@ -59,6 +59,13 @@
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Shmuelie.WinRTServer" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resource.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <Content Update="Assets\VsCodeIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -153,6 +160,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resource.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 
   <!--
     Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
@@ -182,7 +195,7 @@
     <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <AppxPackageDir>C:\Users\jonah\Documents\Visual Studio 2022\Projects\VsCode\AppPackages\</AppxPackageDir>
+    <AppxPackageDir>I:\Freelancer\RiderProjects\CommandPaletteVSCode\AppPackages\</AppxPackageDir>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

VsCode/CmdPalVsCodeCommandsProvider.cs

@@ -6,18 +6,27 @@ namespace CmdPalVsCode;
 public partial class CmdPalVsCodeCommandsProvider : CommandProvider
 {
     private readonly ICommandItem[] _commands;
-
+    private readonly SettingsManager _settingsManager = new();
     public CmdPalVsCodeCommandsProvider()
     {
         DisplayName = "VS Code";
         Icon = IconHelpers.FromRelativePath("Assets\\VsCodeIcon.png");
+
+        Settings = _settingsManager.Settings;
         _commands = [
-            new CommandItem(new VSCodePage()) { Title = DisplayName },
+            new CommandItem(new VSCodePage(_settingsManager)) {
+                Title = DisplayName,
+                MoreCommands = [
+                    new CommandContextItem(Settings.SettingsPage),
+                ],
+            },
         ];
 
-        VSCodeHandler.LoadInstances();
+        VSCodeHandler.LoadInstances(_settingsManager.PreferredEdition);
+
     }
 
+
     public override ICommandItem[] TopLevelCommands()
     {
         return _commands;

VsCode/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="JonahFintzDEV.602808C55E867"
 	  Publisher="CN=240FD63B-E96D-4F79-A6D2-BFC6E6AD6C10"
-	  Version="1.1.2.0" />
+	  Version="1.2.0.0" />
 
 
 	<Properties>