oak-team/oak-gpui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vim: Downgrade user config error from panic to log (#42070)

Browse Source 
Fixes ZED-2W3

Release Notes:

- Fixed panic due to invalid vim keycap
This commit is contained in:
Lukas Wirth
2025-11-06 08:37:04 +00:00
committed by GitHub
parent 001a47c8b7
commit 4003287cc3
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/vim/src/digraph.rs
+14 -10
View File
@@ -63,18 +63,22 @@ impl Vim {
}
fn literal(&mut self, action: &Literal, window: &mut Window, cx: &mut Context<Self>) {
if let Some(Operator::Literal { prefix }) = self.active_operator()
&& let Some(prefix) = prefix
{
if let Some(keystroke) = Keystroke::parse(&action.0).ok() {
window.defer(cx, |window, cx| {
window.dispatch_keystroke(keystroke, cx);
});
match self.active_operator() {
Some(Operator::Literal {
prefix: Some(prefix),
}) => {
if let Some(keystroke) = Keystroke::parse(&action.0).ok() {
window.defer(cx, |window, cx| {
window.dispatch_keystroke(keystroke, cx);
});
}
return self.handle_literal_input(prefix, "", window, cx);
}
return self.handle_literal_input(prefix, "", window, cx);
Some(_) => self.insert_literal(Some(action.1), "", window, cx),
None => log::error!(
"Literal called when no operator was on the stack. This likely means there is an invalid keymap config"
),
}
self.insert_literal(Some(action.1), "", window, cx);
}
pub fn handle_literal_keystroke(