Use the builtin local command in shell integration scripts

hotpxl · hotpxl · commit 6d8cfe1becb5 · 2024-07-15T19:06:13.000-04:00
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
@@ -112,15 +112,15 @@ __vsc_escape_value() {
 	fi
 
 	# Process text byte by byte, not by codepoint.
-	local -r LC_ALL=C
-	local -r str="${1}"
-	local -ir len="${#str}"
+	builtin local -r LC_ALL=C
+	builtin local -r str="${1}"
+	builtin local -ir len="${#str}"
 
-	local -i i
-	local -i val
-	local byte
-	local token
-	local out=''
+	builtin local -i i
+	builtin local -i val
+	builtin local byte
+	builtin local token
+	builtin local out=''
 
 	for (( i=0; i < "${#str}"; ++i )); do
 		# Escape backslashes, semi-colons specially, then special ASCII chars below space (0x20).
@@ -326,7 +326,7 @@ __vsc_prompt_cmd_original() {
 	__vsc_restore_exit_code "${__vsc_status}"
 	# Evaluate the original PROMPT_COMMAND similarly to how bash would normally
 	# See https://unix.stackexchange.com/a/672843 for technique
-	local cmd
+	builtin local cmd
 	for cmd in "${__vsc_original_prompt_command[@]}"; do
 		eval "${cmd:-}"
 	done
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
@@ -159,7 +159,7 @@ __vsc_update_prompt() {
 }
 
 __vsc_precmd() {
-	local __vsc_status="$?"
+	builtin local __vsc_status="$?"
 	if [ -z "${__vsc_in_command_execution-}" ]; then
 		# not in command execution
 		__vsc_command_output_start

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ __vsc_update_prompt() {`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`__vsc_precmd() {`
`162`		`- local __vsc_status="$?"`
	`162`	`+ builtin local __vsc_status="$?"`
`163`	`163`	`if [ -z "${__vsc_in_command_execution-}" ]; then`
`164`	`164`	`# not in command execution`
`165`	`165`	`__vsc_command_output_start`