Merge pull request microsoft#157352 from microsoft/tyriar/1_70_157226

Tyriar · web-flow · commit cad5890e036c · 2022-08-05T16:56:42.000-07:00
[1.70] Escape % in bash and zsh shell integration
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
@@ -59,7 +59,8 @@ __vsc_update_cwd() {
 
 __vsc_command_output_start() {
 	builtin printf "\033]633;C\007"
-	builtin printf "\033]633;E;$__vsc_current_command\007"
+	# Send command line, escaping printf format chars %
+	builtin printf "\033]633;E;$(echo $__vsc_current_command | sed s/%/%%/g)\007"
 }
 
 __vsc_continuation_start() {
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
@@ -50,7 +50,8 @@ __vsc_update_cwd() {
 
 __vsc_command_output_start() {
 	builtin printf "\033]633;C\007"
-	builtin printf "\033]633;E;$__vsc_current_command\007"
+	# Send command line, escaping printf format chars %
+	builtin printf "\033]633;E;$(echo $__vsc_current_command | sed s/%/%%/g)\007"
 }
 
 __vsc_continuation_start() {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ __vsc_update_cwd() {`
`59`	`59`
`60`	`60`	`__vsc_command_output_start() {`
`61`	`61`	`builtin printf "\033]633;C\007"`
`62`		`- builtin printf "\033]633;E;$__vsc_current_command\007"`
	`62`	`+ # Send command line, escaping printf format chars %`
	`63`	`+ builtin printf "\033]633;E;$(echo $__vsc_current_command \| sed s/%/%%/g)\007"`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`__vsc_continuation_start() {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ __vsc_update_cwd() {`
`50`	`50`
`51`	`51`	`__vsc_command_output_start() {`
`52`	`52`	`builtin printf "\033]633;C\007"`
`53`		`- builtin printf "\033]633;E;$__vsc_current_command\007"`
	`53`	`+ # Send command line, escaping printf format chars %`
	`54`	`+ builtin printf "\033]633;E;$(echo $__vsc_current_command \| sed s/%/%%/g)\007"`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`__vsc_continuation_start() {`