vim: Fix clipping when navigating over inlay hints (#22813)
This fixes the issue described in this comment: https://github.com/zed-industries/zed/pull/22439#issuecomment-2563896422 Essentially, we'd clip in the wrong direction when there were multi-line inlay hints. It also fixes inline completions for non-Zeta-providers showing up in normal mode. Release Notes: - N/A
This commit is contained in:
parent
dffdf99228
commit
f9ee28db5e
10 changed files with 76 additions and 13 deletions
|
@ -1206,6 +1206,7 @@ fn up_down_buffer_rows(
|
|||
times: isize,
|
||||
text_layout_details: &TextLayoutDetails,
|
||||
) -> (DisplayPoint, SelectionGoal) {
|
||||
let bias = if times < 0 { Bias::Left } else { Bias::Right };
|
||||
let start = map.display_point_to_fold_point(point, Bias::Left);
|
||||
let begin_folded_line = map.fold_point_to_display_point(
|
||||
map.fold_snapshot
|
||||
|
@ -1229,14 +1230,14 @@ fn up_down_buffer_rows(
|
|||
|
||||
let mut begin_folded_line = map.fold_point_to_display_point(
|
||||
map.fold_snapshot
|
||||
.clip_point(FoldPoint::new(new_row, 0), Bias::Left),
|
||||
.clip_point(FoldPoint::new(new_row, 0), bias),
|
||||
);
|
||||
|
||||
let mut i = 0;
|
||||
while i < goal_wrap && begin_folded_line.row() < map.max_point().row() {
|
||||
let next_folded_line = DisplayPoint::new(begin_folded_line.row().next_row(), 0);
|
||||
if map
|
||||
.display_point_to_fold_point(next_folded_line, Bias::Right)
|
||||
.display_point_to_fold_point(next_folded_line, bias)
|
||||
.row()
|
||||
== new_row
|
||||
{
|
||||
|
@ -1254,10 +1255,7 @@ fn up_down_buffer_rows(
|
|||
};
|
||||
|
||||
(
|
||||
map.clip_point(
|
||||
DisplayPoint::new(begin_folded_line.row(), new_col),
|
||||
Bias::Left,
|
||||
),
|
||||
map.clip_point(DisplayPoint::new(begin_folded_line.row(), new_col), bias),
|
||||
goal,
|
||||
)
|
||||
}
|
||||
|
@ -2484,7 +2482,11 @@ fn section_motion(
|
|||
#[cfg(test)]
|
||||
mod test {
|
||||
|
||||
use crate::test::NeovimBackedTestContext;
|
||||
use crate::{
|
||||
state::Mode,
|
||||
test::{NeovimBackedTestContext, VimTestContext},
|
||||
};
|
||||
use editor::display_map::Inlay;
|
||||
use indoc::indoc;
|
||||
|
||||
#[gpui::test]
|
||||
|
@ -3146,4 +3148,35 @@ mod test {
|
|||
}ˇ»
|
||||
"});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_clipping_with_inlay_hints(cx: &mut gpui::TestAppContext) {
|
||||
let mut cx = VimTestContext::new(cx, true).await;
|
||||
|
||||
cx.set_state(
|
||||
indoc! {"
|
||||
struct Foo {
|
||||
ˇ
|
||||
}
|
||||
"},
|
||||
Mode::Normal,
|
||||
);
|
||||
|
||||
cx.update_editor(|editor, cx| {
|
||||
let range = editor.selections.newest_anchor().range();
|
||||
let inlay_text = " field: int,\n field2: string\n field3: float";
|
||||
let inlay = Inlay::inline_completion(1, range.start, inlay_text);
|
||||
editor.splice_inlays(vec![], vec![inlay], cx);
|
||||
});
|
||||
|
||||
cx.simulate_keystrokes("j");
|
||||
cx.assert_state(
|
||||
indoc! {"
|
||||
struct Foo {
|
||||
|
||||
ˇ}
|
||||
"},
|
||||
Mode::Normal,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1196,7 +1196,15 @@ impl Vim {
|
|||
editor.set_input_enabled(vim.editor_input_enabled());
|
||||
editor.set_autoindent(vim.should_autoindent());
|
||||
editor.selections.line_mode = matches!(vim.mode, Mode::VisualLine);
|
||||
editor.set_inline_completions_enabled(matches!(vim.mode, Mode::Insert | Mode::Replace));
|
||||
|
||||
let enable_inline_completions = match vim.mode {
|
||||
Mode::Insert | Mode::Replace => true,
|
||||
Mode::Normal => editor
|
||||
.inline_completion_provider()
|
||||
.map_or(false, |provider| provider.show_completions_in_normal_mode()),
|
||||
_ => false,
|
||||
};
|
||||
editor.set_inline_completions_enabled(enable_inline_completions);
|
||||
});
|
||||
cx.notify()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue