Merge pull request microsoft#242117 from microsoft/tyriar/241702_2

Tyriar · web-flow · commit 8b0f80c492f2 · 2025-02-26T13:37:11.000-08:00
Remove cwd fallback, ensuring we don't suggest non-existent folders
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -170,7 +170,7 @@ export async function resolveCwdFromPrefix(prefix: string, currentCwd?: vscode.U
 	}
 
 	// If the prefix is not a folder, return the current cwd
-	return currentCwd;
+	return undefined;
 }
 
 function getPrefix(commandLine: string, cursorPosition: number): string {
@@ -277,7 +277,7 @@ export async function getCompletionItemsFromSpecs(
 
 	let cwd: vscode.Uri | undefined;
 	if (shellIntegrationCwd && (filesRequested || foldersRequested)) {
-		cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd) ?? shellIntegrationCwd;
+		cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd);
 	}
 
 	return { items, filesRequested, foldersRequested, fileExtensions, cwd };

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ export async function resolveCwdFromPrefix(prefix: string, currentCwd?: vscode.U`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`// If the prefix is not a folder, return the current cwd`
`173`		`- return currentCwd;`
	`173`	`+ return undefined;`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`function getPrefix(commandLine: string, cursorPosition: number): string {`
`@@ -277,7 +277,7 @@ export async function getCompletionItemsFromSpecs(`
`277`	`277`
`278`	`278`	`let cwd: vscode.Uri \| undefined;`
`279`	`279`	`if (shellIntegrationCwd && (filesRequested \|\| foldersRequested)) {`
`280`		`- cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd) ?? shellIntegrationCwd;`
	`280`	`+ cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd);`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`return { items, filesRequested, foldersRequested, fileExtensions, cwd };`