Make sure \ appears at end of dir results on Windows

Tyriar · Tyriar · commit dfeaf155b003 · 2024-07-20T09:40:11.000-07:00
Fixes microsoft#222230
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
@@ -240,9 +240,10 @@ function Send-Completions {
 			# Add trailing \ for directories so behavior aligns with TabExpansion2
 			[System.Management.Automation.CompletionCompleters]::CompleteFilename($completionPrefix) | ForEach-Object {
 				if ($_.ResultType -eq [System.Management.Automation.CompletionResultType]::ProviderContainer) {
-					[System.Management.Automation.CompletionResult]::new($_.CompletionText + [System.IO.Path]::DirectorySeparatorChar, $_.ListItemText + [System.IO.Path]::DirectorySeparatorChar, $_.ResultType, $_.ToolTip)
+					[System.Management.Automation.CompletionResult]::new("$($_.CompletionText)$([System.IO.Path]::DirectorySeparatorChar)", "$($_.CompletionText)$([System.IO.Path]::DirectorySeparatorChar)", $_.ResultType, $_.ToolTip)
+				} else {
+					$_
 				}
-				$_
 			}
 			([System.Management.Automation.CompletionCompleters]::CompleteVariable($completionPrefix));
 		)
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -27,6 +27,7 @@ import { getListStyles } from 'vs/platform/theme/browser/defaultStyles';
 import type { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
 import { terminalSuggestConfigSection, type ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
 import { commonPrefixLength } from 'vs/base/common/strings';
+import { sep } from 'vs/base/common/path';
 
 export const enum VSCodeSuggestOscPt {
 	Completions = 'Completions',
@@ -611,7 +612,7 @@ export function parseCompletionsFromShell(rawCompletions: PwshCompletion | PwshC
 	}
 	if (!Array.isArray(rawCompletions)) {
 		return [rawCompletions].map(e => (new SimpleCompletionItem({
-			label: e.CompletionText,
+			label: parseCompletionText(e.CompletionText, e.ResultType),
 			icon: pwshTypeToIconMap[e.ResultType],
 			detail: e.ToolTip,
 			isFile: e.ResultType === 3,
@@ -622,24 +623,37 @@ export function parseCompletionsFromShell(rawCompletions: PwshCompletion | PwshC
 	}
 	if (typeof rawCompletions[0] === 'string') {
 		return [rawCompletions as CompressedPwshCompletion].map(e => (new SimpleCompletionItem({
-			label: e[0],
+			label: parseCompletionText(e[0], e[1]),
 			icon: pwshTypeToIconMap[e[1]],
 			detail: e[2],
 			isFile: e[1] === 3,
 		})));
 	}
 	if (Array.isArray(rawCompletions[0])) {
 		return (rawCompletions as CompressedPwshCompletion[]).map(e => (new SimpleCompletionItem({
-			label: e[0],
+			label: parseCompletionText(e[0], e[1]),
 			icon: pwshTypeToIconMap[e[1]],
 			detail: e[2],
 			isFile: e[1] === 3,
 		})));
 	}
 	return (rawCompletions as PwshCompletion[]).map(e => (new SimpleCompletionItem({
-		label: e.CompletionText,
+		label: parseCompletionText(e.CompletionText, e.ResultType),
 		icon: pwshTypeToIconMap[e.ResultType],
 		detail: e.ToolTip,
 		isFile: e.ResultType === 3,
 	})));
 }
+
+function parseCompletionText(completionText: string, resultType: number): string {
+	// HACK: Somewhere along the way from the powershell script to here, the path separator at the
+	// end of directories may go missing, likely because `\"` -> `"`. As a result, make sure there
+	// is a trailing separator at the end of all directory completions. This should not be done for
+	// `.` and `..` entries because they are optimized not for navigating to different directories
+	// but for passing as args.
+	if (resultType === 4 && !completionText.match(/^\.\.?$/) && !completionText.match(/[\\\/]$/)) {
+		const separator = completionText.match(/(?<sep>[\\\/])/)?.groups?.sep ?? sep;
+		return completionText + separator;
+	}
+	return completionText;
+}

Original file line number	Diff line number	Diff line change
`@@ -240,9 +240,10 @@ function Send-Completions {`
`240`	`240`	`# Add trailing \ for directories so behavior aligns with TabExpansion2`
`241`	`241`	`[System.Management.Automation.CompletionCompleters]::CompleteFilename($completionPrefix) \| ForEach-Object {`
`242`	`242`	`if ($_.ResultType -eq [System.Management.Automation.CompletionResultType]::ProviderContainer) {`
`243`		`- [System.Management.Automation.CompletionResult]::new($_.CompletionText + [System.IO.Path]::DirectorySeparatorChar, $_.ListItemText + [System.IO.Path]::DirectorySeparatorChar, $_.ResultType, $_.ToolTip)`
	`243`	`+ [System.Management.Automation.CompletionResult]::new("$($_.CompletionText)$([System.IO.Path]::DirectorySeparatorChar)", "$($_.CompletionText)$([System.IO.Path]::DirectorySeparatorChar)", $_.ResultType, $_.ToolTip)`
	`244`	`+ } else {`
	`245`	`+ $_`
`244`	`246`	`}`
`245`		`- $_`
`246`	`247`	`}`
`247`	`248`	`([System.Management.Automation.CompletionCompleters]::CompleteVariable($completionPrefix));`
`248`	`249`	`)`