development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 02:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix flaky integration tests on mac

Browse source
This commit is contained in:
Daniel Imms 2024-05-01 13:18:50 -07:00
parent 9133f99105
commit d95fae2e2d
No known key found for this signature in database
GPG key ID: 5F0FF45B19E3A5D2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
View file

@ -39,7 +39,9 @@ import { assertNoRpc } from '../utils';
});
}
}));
const terminal = window.createTerminal();
const terminal = platform() === 'win32'
? window.createTerminal()
: window.createTerminal({ shellPath: '/bin/bash' });
terminal.show();
});
}

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

@ -170,7 +170,7 @@ builtin printf "\e]633;P;ContinuationPrompt=$(echo "$PS2" | sed 's/\x1b/\\\\x1b/
__vsc_report_prompt() {
# Expand the original PS1 similarly to how bash would normally
# See https://stackoverflow.com/a/37137981 for technique
__vsc_prompt=${__vsc_original_PS1@P}
__vsc_prompt=${__vsc_original_PS1}
__vsc_prompt="$(builtin printf "%s" "${__vsc_prompt//[$'\001'$'\002']}")"
builtin printf "\e]633;P;Prompt=%s\a" "$(__vsc_escape_value "${__vsc_prompt}")"
}
@ -238,9 +238,9 @@ __vsc_update_prompt() {
__vsc_precmd() {
__vsc_command_complete "$__vsc_status"
__vsc_current_command=""
__vsc_update_prompt
__vsc_report_prompt
__vsc_first_prompt=1
__vsc_update_prompt
}
__vsc_preexec() {