Merge pull request microsoft#210776 from microsoft/tyriar/210773

Tyriar · web-flow · commit a21b3e7a7b4d · 2024-04-19T11:22:44.000-07:00
Make bash window prompt adjuster more strict
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -950,7 +950,7 @@ class WindowsPtyHeuristics extends Disposable {
 		}
 
 		// Bash Prompt
-		const bashPrompt = lineText.match(/^(?<prompt>.*\$)/)?.groups?.prompt;
+		const bashPrompt = lineText.match(/^(?<prompt>\$)/)?.groups?.prompt;
 		if (bashPrompt) {
 			const adjustedPrompt = this._adjustPrompt(bashPrompt, lineText, '$');
 			if (adjustedPrompt) {

Original file line number	Diff line number	Diff line change
`@@ -950,7 +950,7 @@ class WindowsPtyHeuristics extends Disposable {`
`950`	`950`	`}`
`951`	`951`
`952`	`952`	`// Bash Prompt`
`953`		`- const bashPrompt = lineText.match(/^(?<prompt>.*\$)/)?.groups?.prompt;`
	`953`	`+ const bashPrompt = lineText.match(/^(?<prompt>\$)/)?.groups?.prompt;`
`954`	`954`	`if (bashPrompt) {`
`955`	`955`	`const adjustedPrompt = this._adjustPrompt(bashPrompt, lineText, '$');`
`956`	`956`	`if (adjustedPrompt) {`