Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pebrel_app/src/completion_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ pub(crate) struct CompletionContext {

impl CompletionContext {
pub(crate) fn owns_current(&self, token: &str) -> bool {
self.frames.last().is_some_and(|frame| frame.token.as_deref() == Some(token))
self.current_shell_token() == Some(token)
}

pub(crate) fn current_shell_token(&self) -> Option<&str> {
self.frames.last()?.token.as_deref()
}

fn submit(&mut self, env: &SuggestEnv, cwd: &str, line: &str) -> Option<SuggestEnv> {
Expand Down
26 changes: 25 additions & 1 deletion pebrel_app/src/gpui_shell/terminal/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1376,6 +1376,25 @@ impl TerminalView {
}
}

fn powershell_owns_line_selection(&self) -> bool {
if self.ssh_destination.is_some() || !self.suggest.suggest_env.is_this_machine() {
return false;
}
if self.running_program.is_some() || self.command_running && !self.command_running_disproved
{
return false;
}
if let Some(token) = self.suggest.completion_context.current_shell_token() {
return token.starts_with("pwsh:");
}
self.exec_context.as_ref().and_then(|context| context.shell_program()).is_some_and(
|program| {
use pebrel_completions::command_context::ShellSyntax;
ShellSyntax::for_program(program) == ShellSyntax::PowerShell
},
)
}

fn on_key_down(&mut self, event: &KeyDownEvent, window: &mut Window, cx: &mut Context<Self>) {
// 搜索输入具有独立焦点,祖先终端不得再次把同一按键写入 PTY。
if !self.focus_handle.is_focused(window) {
Expand Down Expand Up @@ -1472,12 +1491,17 @@ impl TerminalView {
}

// 回滚快捷键(对齐旧壳默认绑定,仅主屏):Shift+PageUp/PageDown
// 翻页、Shift+Home/End 到顶/到底;备用屏下不拦截,交给编码器
// 翻页、Shift+Home/End 到顶/到底。PowerShell 提示符用后者选区;备用屏交给编码器
// 把带修饰的键序发给应用(less 自己处理 Shift+PageUp)。
if mods.shift && !mods.control && !mods.alt && !mode.contains(TermMode::ALT_SCREEN) {
let scroll = match ks.key.as_str() {
"pageup" => Some(Scroll::PageUp),
"pagedown" => Some(Scroll::PageDown),
"home" | "end"
if !mode.contains(TermMode::VI) && self.powershell_owns_line_selection() =>
{
None
},
"home" => Some(Scroll::Top),
"end" => Some(Scroll::Bottom),
_ => None,
Expand Down
45 changes: 45 additions & 0 deletions pebrel_app/src/gpui_shell/terminal/view/startup_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1622,6 +1622,51 @@ fn a_failed_codex_chooser_does_not_start_an_automatic_retry_loop(cx: &mut TestAp
});
}

#[gpui::test]
fn shift_home_and_end_reach_the_local_powershell_editor(cx: &mut TestAppContext) {
let (view, window, receiver) = open(cx);
window.update(|window, cx| {
view.update(cx, |view, cx| {
view.suggest.suggest_env = crate::display::SuggestEnv::Local;
view.exec_context = Some(crate::runtime_exec::PaneExecContext::from_pty_options(
&pebrel_terminal::tty::Options {
shell: Some(pebrel_terminal::tty::Shell::new("powershell.exe".into(), vec![])),
..Default::default()
},
));
for (token, forwarded) in
[(None, true), (Some("pwsh:42"), true), (Some("bash:43"), false)]
{
if let Some(token) = token {
view.suggest.completion_shell_report("pebrel_shell", token);
}
for chord in ["shift-home", "shift-end"] {
let event = KeyDownEvent {
keystroke: gpui::Keystroke::parse(chord).unwrap(),
is_held: false,
prefer_character_input: false,
};
let expected = keymap::encode(&event.keystroke, &view.term_mode()).unwrap();
view.on_key_down(&event, window, cx);
let input: Vec<_> = receiver
.try_iter()
.filter_map(|msg| match msg {
Msg::Input(bytes) => Some(bytes.into_owned()),
_ => None,
})
.flatten()
.collect();
assert_eq!(
input,
if forwarded { expected } else { vec![] },
"{token:?} {chord}"
);
}
}
});
});
}

#[gpui::test]
fn host_administrator_scope_excludes_remote_and_wsl_shells(cx: &mut TestAppContext) {
let (view, window, _) = open(cx);
Expand Down
Loading