Merge pull request #7082 from dotnet/dev/jorobich/open-solution-filters

List solution filter files (.slnf) in the 'Open Solution' command.
dotnet · May 1, 2024 · f588850 · f588850
2 parents f53131a + f07316e
commit f588850
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/lsptoolshost/commands.ts b/src/lsptoolshost/commands.ts
@@ -178,7 +178,7 @@ async function openSolution(languageServer: RoslynLanguageServer): Promise<vscod
         return undefined;
     }
 
-    const solutionFiles = await vscode.workspace.findFiles('**/*.sln');
+    const solutionFiles = await vscode.workspace.findFiles('**/*.{sln,slnf}');
     const launchTargets = solutionFiles.map(createLaunchTargetForSolution);
     const launchTarget = await vscode.window.showQuickPick(launchTargets, {
         matchOnDescription: true,

diff --git a/src/shared/launchTarget.ts b/src/shared/launchTarget.ts
@@ -29,12 +29,14 @@ export interface LaunchTarget {
 }
 
 export function createLaunchTargetForSolution(resource: vscode.Uri): LaunchTarget {
-    const dirname = path.dirname(resource.fsPath);
+    const directoryPath = path.dirname(resource.fsPath);
+    const relativePath = vscode.workspace.asRelativePath(directoryPath);
     return {
         label: path.basename(resource.fsPath),
-        description: vscode.workspace.asRelativePath(dirname),
+        // When the relativePath matches the directoryPath, it means we are in the root of the workspace.
+        description: directoryPath === relativePath ? '' : relativePath,
         target: resource.fsPath,
-        directory: path.dirname(resource.fsPath),
+        directory: directoryPath,
         workspaceKind: LaunchTargetKind.Solution,
     };
 }