mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-22 16:28:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Port the shell integration tests to use the run-shell kitten

Browse Source
This commit is contained in:
Kovid Goyal
2023-06-26 13:38:48 +05:30
parent 8ffbfa177d
commit da31d21ddb
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
kitty_tests/shell_integration.py
View File

@@ -12,7 +12,7 @@ from contextlib import contextmanager
from functools import lru_cache, partial from functools import lru_cache, partial
from kitty.bash import decode_ansi_c_quoted_string from kitty.bash import decode_ansi_c_quoted_string
from kitty.constants import kitty_base_dir, shell_integration_dir, terminfo_dir from kitty.constants import kitten_exe, kitty_base_dir, shell_integration_dir, terminfo_dir
from kitty.fast_data_types import CURSOR_BEAM, CURSOR_BLOCK, CURSOR_UNDERLINE from kitty.fast_data_types import CURSOR_BEAM, CURSOR_BLOCK, CURSOR_UNDERLINE
from kitty.shell_integration import setup_bash_env, setup_fish_env, setup_zsh_env from kitty.shell_integration import setup_bash_env, setup_fish_env, setup_zsh_env
@@ -48,7 +48,7 @@ def basic_shell_env(home_dir):
return ans return ans
def safe_env_for_running_shell(argv, home_dir, rc='', shell='zsh'): def safe_env_for_running_shell(argv, home_dir, rc='', shell='zsh', with_kitten=False):
ans = basic_shell_env(home_dir) ans = basic_shell_env(home_dir)
if shell == 'zsh': if shell == 'zsh':
argv.insert(1, '--noglobalrcs') argv.insert(1, '--noglobalrcs')
@@ -64,10 +64,14 @@ def safe_env_for_running_shell(argv, home_dir, rc='', shell='zsh'):
print(rc + '\n', file=f) print(rc + '\n', file=f)
setup_fish_env(ans, argv) setup_fish_env(ans, argv)
elif shell == 'bash': elif shell == 'bash':
setup_bash_env(ans, argv) bashrc = os.path.join(home_dir, '.bashrc')
ans['KITTY_BASH_INJECT'] += ' posix' if with_kitten:
ans['KITTY_BASH_POSIX_ENV'] = os.path.join(home_dir, '.bashrc') ans['KITTY_RUNNING_BASH_INTEGRATION_TEST'] = bashrc
with open(ans['KITTY_BASH_POSIX_ENV'], 'w') as f: else:
setup_bash_env(ans, argv)
ans['KITTY_BASH_INJECT'] += ' posix'
ans['KITTY_BASH_POSIX_ENV'] = bashrc
with open(bashrc, 'w') as f:
# ensure LINES and COLUMNS are kept up to date # ensure LINES and COLUMNS are kept up to date
print('shopt -s checkwinsize', file=f) print('shopt -s checkwinsize', file=f)
if rc: if rc:
@@ -77,13 +81,17 @@ def safe_env_for_running_shell(argv, home_dir, rc='', shell='zsh'):
class ShellIntegration(BaseTest): class ShellIntegration(BaseTest):
with_kitten = False
@contextmanager @contextmanager
def run_shell(self, shell='zsh', rc='', cmd='', setup_env=None): def run_shell(self, shell='zsh', rc='', cmd='', setup_env=None):
home_dir = self.home_dir = os.path.realpath(tempfile.mkdtemp()) home_dir = self.home_dir = os.path.realpath(tempfile.mkdtemp())
cmd = cmd or shell cmd = cmd or shell
cmd = shlex.split(cmd.format(**locals())) cmd = shlex.split(cmd.format(**locals()))
env = (setup_env or safe_env_for_running_shell)(cmd, home_dir, rc=rc, shell=shell) env = (setup_env or safe_env_for_running_shell)(cmd, home_dir, rc=rc, shell=shell, with_kitten=self.with_kitten)
try: try:
if self.with_kitten:
cmd = [kitten_exe(), 'run-shell', '--shell', shlex.join(cmd)]
pty = self.create_pty(cmd, cwd=home_dir, env=env) pty = self.create_pty(cmd, cwd=home_dir, env=env)
i = 10 i = 10
while i > 0 and not pty.screen_contents().strip(): while i > 0 and not pty.screen_contents().strip():
@@ -325,9 +333,10 @@ PS1="{ps1}"
# test startup file sourcing # test startup file sourcing
def setup_env(excluded, argv, home_dir, rc='', shell='bash'): def setup_env(excluded, argv, home_dir, rc='', shell='bash', with_kitten=self.with_kitten):
ans = basic_shell_env(home_dir) ans = basic_shell_env(home_dir)
setup_bash_env(ans, argv) if not with_kitten:
setup_bash_env(ans, argv)
for x in {'profile', 'bash.bashrc', '.bash_profile', '.bash_login', '.profile', '.bashrc', 'rcfile'} - excluded: for x in {'profile', 'bash.bashrc', '.bash_profile', '.bash_login', '.profile', '.bashrc', 'rcfile'} - excluded:
with open(os.path.join(home_dir, x), 'w') as f: with open(os.path.join(home_dir, x), 'w') as f:
if x == '.bashrc' and rc: if x == '.bashrc' and rc:
@@ -381,3 +390,7 @@ PS1="{ps1}"
}.items(): }.items():
q = q + "'" q = q + "'"
self.ae(decode_ansi_c_quoted_string(q, 0)[0], e, f'Failed to decode: {q!r}') self.ae(decode_ansi_c_quoted_string(q, 0)[0], e, f'Failed to decode: {q!r}')
class ShellIntegrationWithKitten(ShellIntegration):
with_kitten = True

10
tools/tui/shell_integration/api.go
View File

@@ -224,7 +224,7 @@ func bash_setup_func(shell_integration_dir string, argv []string, env map[string
sorted := remove_args.AsSlice() sorted := remove_args.AsSlice()
slices.Sort(sorted) slices.Sort(sorted)
for _, i := range utils.Reverse(sorted) { for _, i := range utils.Reverse(sorted) {
slices.Delete(argv, i, i+1) argv = slices.Delete(argv, i, i+1)
} }
if env[`HISTFILE`] == "" && !inject.Has(`posix`) { if env[`HISTFILE`] == "" && !inject.Has(`posix`) {
// In POSIX mode the default history file is ~/.sh_history instead of ~/.bash_history // In POSIX mode the default history file is ~/.sh_history instead of ~/.bash_history
@@ -232,6 +232,14 @@ func bash_setup_func(shell_integration_dir string, argv []string, env map[string
env[`KITTY_BASH_UNEXPORT_HISTFILE`] = `1` env[`KITTY_BASH_UNEXPORT_HISTFILE`] = `1`
} }
argv = slices.Insert(argv, 1, `--posix`) argv = slices.Insert(argv, 1, `--posix`)
if bashrc := os.Getenv(`KITTY_RUNNING_BASH_INTEGRATION_TEST`); bashrc != `` {
// prevent bash from source /etc/profile which is not under our control
os.Unsetenv(`KITTY_RUNNING_BASH_INTEGRATION_TEST`)
env[`KITTY_BASH_INJECT`] += ` posix`
env[`KITTY_BASH_POSIX_ENV`] = bashrc
}
return argv, env, nil return argv, env, nil
} }