Skip to content

Commit 281b90d

Browse files
authored
support debug traps that contain [[ (microsoft#157552)
fix microsoft#154189
1 parent 3bc5735 commit 281b90d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,13 @@ if [[ -n "${bash_preexec_imported:-}" ]]; then
125125
precmd_functions+=(__vsc_prompt_cmd)
126126
preexec_functions+=(__vsc_preexec_only)
127127
else
128-
__vsc_dbg_trap="$(trap -p DEBUG | cut -d' ' -f3 | tr -d \')"
128+
__vsc_dbg_trap="$(trap -p DEBUG)"
129+
if [[ "$__vsc_db_trap" =~ .*\[\[.* ]]; then
130+
__vsc_dbg_trap=${__vsc_dbg_trap#'trap -- '*}
131+
__vsc_dbg_trap=${__vsc_dbg_trap%'DEBUG'}
132+
else
133+
__vsc_dbg_trap="$(trap -p DEBUG | cut -d' ' -f3 | tr -d \')"
134+
fi
129135
if [[ -z "$__vsc_dbg_trap" ]]; then
130136
__vsc_preexec_only() {
131137
if [ "$__vsc_in_command_execution" = "0" ]; then

0 commit comments

Comments
 (0)