Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

terminal_view: Do not treat AltGr character input as a meta sequence on Windows (#63707)

Kirill Bulatov620efaa5c782
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 5f8cf0c3a33..5f711f229cf 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1289,6 +1289,13 @@ impl TerminalView {
self.clear_bell(cx);
self.pause_cursor_blinking(window, cx);
+ if event.prefer_character_input
+ && event.keystroke.key_char.is_some()
+ && !self.terminal.read(cx).vi_mode_enabled()
+ {
+ return;
+ }
+
if self.process_keystroke(&event.keystroke, cx) {
cx.stop_propagation();
}
@@ -2170,7 +2177,7 @@ fn first_project_directory(workspace: &Workspace, cx: &App) -> Option<PathBuf> {
#[cfg(test)]
mod tests {
use super::*;
- use gpui::{TestAppContext, VisualTestContext};
+ use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
use project::{Entry, Project, ProjectPath, Worktree};
use remote::RemoteClient;
use std::path::{Path, PathBuf};
@@ -2344,6 +2351,70 @@ mod tests {
);
}
+ #[gpui::test]
+ async fn altgr_character_input_is_not_swallowed_as_meta_sequence(cx: &mut TestAppContext) {
+ let (project, _workspace, window_handle) = init_test_with_window(cx).await;
+ cx.update(|cx| {
+ SettingsStore::update_global(cx, |store, cx| {
+ store.update_user_settings(cx, |settings| {
+ settings.terminal.get_or_insert_default().option_as_meta = Some(true);
+ });
+ });
+ });
+ let (_pane, terminal, _terminal_view) =
+ add_display_only_terminal(&project, window_handle, true, cx);
+
+ let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+ cx.update(|window, cx| {
+ let _ = window.draw(cx);
+ });
+ cx.run_until_parked();
+
+ let mut altgr_a = Keystroke::parse("ctrl-alt-a").unwrap();
+ altgr_a.key_char = Some("ą".to_string());
+
+ let propagate = cx.update(|window, cx| {
+ window
+ .dispatch_event(
+ gpui::PlatformInput::KeyDown(KeyDownEvent {
+ keystroke: altgr_a.clone(),
+ is_held: false,
+ prefer_character_input: true,
+ }),
+ cx,
+ )
+ .propagate
+ });
+ assert!(
+ propagate,
+ "a keystroke that produced a character must propagate so the platform can commit the text",
+ );
+ assert_eq!(
+ terminal.update(&mut cx, |terminal, _| terminal.take_input_log()),
+ Vec::<Vec<u8>>::new(),
+ "AltGr-produced characters must not be sent as meta escape sequences",
+ );
+
+ let propagate = cx.update(|window, cx| {
+ window
+ .dispatch_event(
+ gpui::PlatformInput::KeyDown(KeyDownEvent {
+ keystroke: altgr_a,
+ is_held: false,
+ prefer_character_input: false,
+ }),
+ cx,
+ )
+ .propagate
+ });
+ assert!(!propagate);
+ assert_eq!(
+ terminal.update(&mut cx, |terminal, _| terminal.take_input_log()),
+ vec![b"\x1b\x01".to_vec()],
+ "ctrl-alt-a without character input preference is still sent as meta ctrl-a",
+ );
+ }
+
// Working directory calculation tests
// No Worktrees in project -> home_dir()