1.8.0.0

Author: tanchekwei

.editorconfig

@@ -0,0 +1,8 @@
+# File-scoped namespace declarations
+dotnet_diagnostic.IDE0161.severity = refactoring
+csharp_style_namespace_declarations = file_scoped
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
+dotnet_style_namespace_match_folder = true
+dotnet_diagnostic.IDE0130.severity = warning

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "[csharp]": {
+    "editor.defaultFormatter": "ms-dotnettools.csharp",
+    "editor.codeActionsOnSave": ["source.organizeImports", "source.fixAll"]
+  },
+}

Assets/screenshot1.png

@@ -1,4 +1,4 @@
-# Project Guide: Workspace Launcher for VS Code
+# Project Guide: Workspace Launcher for Visual Studio & VS Code
 
 This document provides an overview of the project's architecture, focusing on its design principles and key components.
 
@@ -8,31 +8,39 @@ The extension is designed following SOLID principles to ensure it is maintainabl
 
 ### Key Principles
 
-*   **Single Responsibility Principle (SRP):** Each class has a single, well-defined responsibility. This is exemplified by the service layer, where responsibilities are highly granular. For instance, `VisualStudioCodeInstanceProvider` is solely responsible for discovering Visual Studio Code installations. `VisualStudioCodeWorkspaceProvider` orchestrates workspace discovery, which is further delegated to specialized reader classes like `VscdbWorkspaceReader` and `StorageJsonWorkspaceReader`, each handling a specific data source.
+*   **Single Responsibility Principle (SRP):** Each class has a single, well-defined responsibility. This is exemplified by the service layer, where responsibilities are highly granular. For instance, `VisualStudioCodeInstanceProvider` is solely responsible for discovering Visual Studio Code installations, while `VisualStudioProvider` is responsible for discovering Visual Studio solutions.
 *   **Dependency Inversion Principle (DIP):** High-level modules do not depend on low-level modules; both depend on abstractions. This is achieved through the use of interfaces like `IVisualStudioCodeService`. The `WorkspaceLauncherForVSCodeCommandsProvider` and `VisualStudioCodePage` depend on the `IVisualStudioCodeService` interface, not the concrete `VisualStudioCodeService` implementation. This decoupling allows for easier testing and maintenance.
 
 ## Project Structure
 
-The project is organized into the following key directories within the `VisualStudioCode` project:
+The project is organized into the following key directories within the `WorkspaceLauncherForVSCode` project:
 
 - **`/`**:
   - [`WorkspaceLauncherForVSCode.cs`](./WorkspaceLauncherForVSCode.cs) - The main extension implementation.
 - **`/Classes`**: Contains core data models and helper classes.
   - [`SettingsManager.cs`](./Classes/SettingsManager.cs) - Manages user-configurable settings.
   - `VisualStudioCodeInstance.cs`, `VisualStudioCodeWorkspace.cs` - Core data models.
 - **`/Commands`**: Contains command implementations that are executed by the user.
-    - `OpenVisualStudioCodeCommand.cs` - The primary command for launching a selected workspace.
-    - `CopyPathCommand.cs` - Copies the workspace path to the clipboard.
+    - `OpenVisualStudioCodeCommand.cs` - The primary command for launching a selected VS Code workspace.
+    - `OpenSolutionCommand.cs` - The primary command for launching a selected Visual Studio solution.
+    - `CopyPathCommand.cs` - Copies the workspace or solution path to the clipboard.
     - `RemoveWorkspaceCommand.cs` - Removes a workspace from the recently opened list.
+- **`/Components`**: Contains components for window management, adapted from the WindowWalker extension.
+    - `Window.cs` - Represents a single open window.
+    - `WindowProcess.cs` - Manages process information for a window.
+    - `OpenWindows.cs` - Manages the collection of open windows.
+- **`/Helpers`**: Contains helper classes, including `NativeMethods.cs` for P/Invoke signatures.
 - **`/Interfaces`**: Defines the contracts for services.
-  - `IVisualStudioCodeService.cs` - The contract for the main Visual Studio Code service.
+  - `IVisualStudioCodeService.cs` - The contract for the main service.
 - **`/Pages`**: Contains UI components.
-  - [`VisualStudioCodePage.cs`](./Pages/VisualStudioCodePage.cs) - A dynamic list page that displays discovered workspaces.
+  - [`VisualStudioCodePage.cs`](./Pages/VisualStudioCodePage.cs) - A dynamic list page that displays discovered workspaces and solutions.
 - **`/Services`**: Contains the primary service implementations.
   - [`WorkspaceLauncherForVSCodeCommandsProvider.cs`](./Services/WorkspaceLauncherForVSCodeCommandsProvider.cs) - The entry point for providing commands to the Command Palette.
   - [`VisualStudioCodeService.cs`](./Services/VisualStudioCodeService.cs) - Acts as a facade, orchestrating calls to more specialized provider classes.
   - [`VisualStudioCodeInstanceProvider.cs`](./Services/VisualStudioCodeInstanceProvider.cs) - Discovers all installed instances of Visual Studio Code.
-  - [`VisualStudioCodeWorkspaceProvider.cs`](./Services/VisualStudioCodeWorkspaceProvider.cs) - Orchestrates the process of finding recent workspaces.
+  - [`VisualStudioCodeWorkspaceProvider.cs`](./Services/VisualStudioCodeWorkspaceProvider.cs) - Orchestrates the process of finding recent VS Code workspaces.
+  - [`VisualStudioProvider.cs`](./Services/VisualStudioProvider.cs) - Orchestrates the process of finding recent Visual Studio solutions.
+  - **`/Services/VisualStudio`**: Contains the integrated source code for discovering Visual Studio instances and their recent items.
 - **`/Workspaces`**: Contains workspace-related logic.
     - **`/Models`**: C# models that map to the JSON structures of Visual Studio Code's workspace storage.
     - **`/Readers`**: Specialized classes for reading and parsing workspace data.
@@ -41,11 +49,29 @@ The project is organized into the following key directories within the `VisualSt
 
 ## Core Components
 
+### WindowWalker Integration
+
+The extension integrates logic from the **WindowWalker** extension to provide window-switching functionality. When a user attempts to open a Visual Studio solution, the extension first checks if that solution is already open in an existing Visual Studio instance.
+
+- The `OpenWindows` class enumerates all open windows on the system.
+- The `Window` and `WindowProcess` classes gather information about each window, including its title and process name.
+- The `OpenSolutionCommand` checks the titles of open `devenv.exe` processes to see if the solution is already open. If a match is found, the extension switches to that window instead of launching a new process.
+
 ### Services and Providers
 
-*   **`IVisualStudioCodeService` / `VisualStudioCodeService`**: This service acts as the primary entry point for interacting with local Visual Studio Code data. It delegates the complex tasks of instance and workspace discovery to specialized provider classes.
+*   **`IVisualStudioCodeService` / `VisualStudioCodeService`**: This service acts as the primary entry point for interacting with local Visual Studio and Visual Studio Code data. It delegates the complex tasks of instance and workspace/solution discovery to specialized provider classes.
 *   **`VisualStudioCodeInstanceProvider`**: A static provider class responsible for discovering all installed instances of Visual Studio Code (Stable, Insiders, User, System) by scanning known locations and the system's PATH environment variable.
-*   **`VisualStudioCodeWorkspaceProvider`**: This static provider orchestrates the process of finding recently opened workspaces. It doesn't perform the reading itself but delegates the task to specialized reader classes.
+*   **`VisualStudioCodeWorkspaceProvider`**: This static provider orchestrates the process of finding recently opened VS Code workspaces. It doesn't perform the reading itself but delegates the task to specialized reader classes.
+*   **`VisualStudioProvider`**: This static provider orchestrates the process of finding recently opened Visual Studio solutions. It uses the integrated `VisualStudioService` to discover Visual Studio instances and their recent items.
+
+### Visual Studio Integration
+
+The extension now includes the core logic from the `PowerToys-Run-VisualStudio` project to discover Visual Studio installations and their recent solutions. This is accomplished by:
+1.  Using `vswhere.exe` to find all Visual Studio installations on the system.
+2.  Parsing the `ApplicationPrivateSettings.xml` file for each installation to find the location of the `CodeContainers.json` file.
+3.  Reading and deserializing the `CodeContainers.json` file to get a list of recent solutions.
+
+This integration provides a seamless experience, allowing users to access both Visual Studio solutions and VS Code workspaces from a single interface.
 
 ### Workspace Readers and Performance
 
@@ -59,14 +85,14 @@ To ensure high performance and low memory usage, the extension uses the `System.
 
 ### UI and Commands
 
-*   **`WorkspaceLauncherForVSCodeCommandsProvider`**: The main entry point for providing commands to the Command Palette. It initializes the required services (`SettingsManager`, `VisualStudioCodeService`) and creates the top-level command items. It also listens for settings changes to reload Visual Studio Code instances when necessary.
-*   **`VisualStudioCodePage`**: A dynamic list page that displays the discovered Visual Studio Code workspaces. It receives the `IVisualStudioCodeService` to fetch workspace data asynchronously and handles user interactions like searching and scrolling.
-*   **`OpenVisualStudioCodeCommand`**: The primary command responsible for launching a selected Visual Studio Code workspace.
+*   **`WorkspaceLauncherForVSCodeCommandsProvider`**: The main entry point for providing commands to the Command Palette. It initializes the required services and creates the top-level command items.
+*   **`VisualStudioCodePage`**: A dynamic list page that displays the discovered workspaces and solutions. It receives the `IVisualStudioCodeService` to fetch data asynchronously and handles user interactions like searching and scrolling.
+*   **`OpenVisualStudioCodeCommand` & `OpenSolutionCommand`**: The primary commands responsible for launching a selected VS Code workspace or Visual Studio solution.
 
 #### Secondary Commands
-Beyond the primary action of opening a workspace, the extension provides secondary commands for managing the workspace list:
+Beyond the primary action of opening a workspace or solution, the extension provides secondary commands for managing the list:
 
-*   **`CopyPathCommand`**: This command allows the user to copy the full file path of a workspace or folder directly to the clipboard, providing a quick way to access the location of the project.
-*   **`RemoveWorkspaceCommand`**: This command provides the functionality to remove a workspace or folder entry from the Visual Studio Code's list of recently opened items. It first presents a confirmation dialog to prevent accidental removals. The command directly modifies the `state.vscdb` or `storage.json` files where VS Code stores this information.
+*   **`CopyPathCommand`**: This command allows the user to copy the full file path of a workspace, solution, or folder directly to the clipboard.
+*   **`RemoveWorkspaceCommand`**: This command provides the functionality to remove a workspace entry from the Visual Studio Code's list of recently opened items (not applicable to Visual Studio solutions).
 
 This architecture ensures a clean separation of concerns, making the codebase easier to understand, extend, and debug.

Assets/screenshot2.png

@@ -1,7 +1,10 @@
 MIT License
 
+Copyright (c) 2025 Davide Giacometti
 Copyright (c) 2025 Jonah Fintz
 Copyright (c) 2025 tanchekwei
+Copyright (c) 2020 Betsegaw Tadele
+Copyright (c) 2025 Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

GUIDE.md

@@ -0,0 +1,32 @@
+**Copyright and Notices**
+
+This software is made possible by the contributions of its developers and the open-source projects it is built upon.
+
+Copyright © 2025 tanchekwei
+
+The following copyrights are acknowledged for the respective components and adaptations included in this software:
+
+* Copyright © 2025 Jonah Fintz
+* Copyright © 2025 Davide Giacometti
+* Copyright © 2020 Betsegaw Tadele
+* Copyright © 2025 Microsoft Corporation
+
+---
+
+**Third-Party Acknowledgements**
+
+This extension adapts and combines functionality from the following open-source projects. I acknowledge and appreciate the availability of their work under open-source licenses:
+
+* CommandPaletteVSCode by Jonah Fintz
+  Source: [https://github.com/JonahFintzDev/CommandPaletteVSCode](https://github.com/JonahFintzDev/CommandPaletteVSCode)
+
+* PowerToys-Run-VisualStudio by Davide Giacometti
+  Source: [https://github.com/davidegiacometti/PowerToys-Run-VisualStudio](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio)
+
+* VisualStudioExtension by Davide Giacometti
+  Source: [https://github.com/davidegiacometti/CmdPal-Extensions/tree/main/src/VisualStudioExtension](https://github.com/davidegiacometti/CmdPal-Extensions/tree/main/src/VisualStudioExtension)
+
+* Window Walker PowerToys Command Palette Extension, based on the original work by Betsegaw Tadele and integrated into the Microsoft PowerToys
+  Source: [https://github.com/microsoft/PowerToys/tree/main/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker](https://github.com/microsoft/PowerToys/tree/main/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker)
+
+All third-party components are used in accordance with their original licensing terms. Please visit the source repositories for more information.

LICENSE.txt

@@ -1,29 +1,23 @@
-# Workspace Launcher for VS Code
+# Workspace Launcher for Visual Studio / Code
 
 ## Overview
 
-This project provides a command palette extension for opening Visual Studio Code workspaces.
+This project provides a command palette extension for opening Visual Studio solutions and Visual Studio Code workspaces from a single, unified interface.
 
-![Workspace Launcher for VS Code](./Assets/screenshot1.png)
-
-## Replacing PowerToys Run
-Suggested usage to replace PowerToys Run with this extension:
-
-1. Open the Command Palette settings > Extensions > Workspace Launcher for VS Code.
-2. Assign **Alt + Space** as the global hotkey (requires disabling PowerToys Run) or assign `{` as an alias with Direct toggled.
-
-![Replacing PowerToys Run](./Assets/screenshot2.png)
+![Workspace Launcher for Visual Studio / Code](./Assets/screenshot1.png)
 
 ## Features
 
+- **Unified Launcher**: Launch both Visual Studio solutions and Visual Studio Code workspaces from a single, convenient interface.
+- **Window-Switching**: If a Visual Studio solution is already open, the extension will switch to the existing window instead of opening a new instance.
 - **Workspace Management**: Retrieve and display a list of available workspaces, including their paths and types (e.g., Local, WSL, Remote).
-- **Command Execution**: Open workspaces in Visual Studio Code using a dedicated command.
-- **Multi-Installation Support**: Works for multiple installations of Visual Studio Code, including Insider and system installations.
-- **Secondary Actions**: Access additional commands for each workspace entry:
-    - **Copy Path**: Copies the full file path of the workspace or folder to the clipboard.
-    - **Remove from List**: Removes the workspace entry from Visual Studio Code's list of recently opened projects. A confirmation is required to prevent accidental removal.
-    - **Open in Explorer**: Opens the workspace or folder location in the default file explorer.
-    - **Refresh Workspaces**: Manually reloads the list of workspaces to reflect any recent changes.
+- **Command Execution**: Open solutions in Visual Studio and workspaces in Visual Studio Code using dedicated commands.
+- **Multi-Installation Support**: Works for multiple installations of Visual Studio and Visual Studio Code, including Insider and system installations.
+- **Secondary Actions**: Access additional commands for each entry:
+    - **Copy Path**: Copies the full file path of the solution, workspace, or folder to the clipboard.
+    - **Remove from List**: Removes the workspace entry from Visual Studio Code's list of recently opened projects (not available for Visual Studio solutions).
+    - **Open in Explorer**: Opens the solution, workspace, or folder location in the default file explorer.
+    - **Refresh Workspaces**: Manually reloads the list of solutions and workspaces to reflect any recent changes.
 
 ## Installation
 
@@ -39,7 +33,7 @@ Suggested usage to replace PowerToys Run with this extension:
 ### Via Command Palette
 
 1. Open Command Palette
-2. Select "Workspace Launcher for VS Code"
+2. Select "Workspace Launcher for Visual Studio / Code"
 
 <!-- ### Via Winget
 
@@ -49,11 +43,20 @@ Suggested usage to replace PowerToys Run with this extension:
    winget install 15722UsefulApp.WorkspaceLauncherForVSCode
    ```
 -->
+
 ### Manual Installation
 
 1. Make sure you use the latest version of PowerToys.
 2. Install the application by double-clicking the `.msix` file.
 
+## Replacing PowerToys Run
+Suggested usage to replace PowerToys Run with this extension:
+
+1. Open the Command Palette settings > Extensions > Workspace Launcher for Visual Studio / Code.
+2. Assign **Alt + Space** as the global hotkey (requires disabling PowerToys Run) or assign `{` as an alias with Direct toggled.
+
+![Replacing PowerToys Run](./Assets/screenshot2.png)
+
 ## Settings
 
 - **Preferred Edition**: Determines which edition (Default or Insider) is used when a folder or workspace has been opened in both editions of Visual Studio Code.
@@ -67,7 +70,12 @@ Suggested usage to replace PowerToys Run with this extension:
 
 ## How It Works
 
-This extension scans for installations of Visual Studio Code on your system, including stable, Insiders, and system-wide installations. It then reads the workspace history from Visual Studio Code's internal storage files (`state.vscdb` and `storage.json`) to populate the list of recent workspaces.
+This extension discovers installations of Visual Studio and Visual Studio Code on your system.
+- For **Visual Studio Code**, it reads the workspace history from the internal storage files (`state.vscdb` and `storage.json`).
+- For **Visual Studio**, it uses `vswhere.exe` to find installations and then reads their configuration files to discover recent solutions.
+- The extension also includes logic from the **WindowWalker** extension to detect if a solution is already open. If so, it switches to the existing Visual Studio window instead of creating a new one.
+
+The results are then combined into a single, unified list for easy access.
 
 For more detailed technical information about the project's architecture and components, please see the [Project Guide](./GUIDE.md).