From 20f98e4d17032eac76a69e939eecf86dd06172b1 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 21 Aug 2023 16:10:13 -0600 Subject: [PATCH 01/19] vim . to replay Co-Authored-By: maxbrunsfeld@gmail.com --- Cargo.lock | 2 + assets/keymaps/vim.json | 6 +- crates/editor/src/editor.rs | 145 +++++++++++++--- crates/editor/src/editor_tests.rs | 2 +- crates/gpui/src/app/window.rs | 2 +- crates/terminal_view/README.md | 8 +- crates/vim/Cargo.toml | 2 + crates/vim/src/editor_events.rs | 1 + crates/vim/src/insert.rs | 7 +- crates/vim/src/normal.rs | 31 +++- crates/vim/src/normal/case.rs | 1 + crates/vim/src/normal/delete.rs | 2 + crates/vim/src/normal/paste.rs | 1 + crates/vim/src/normal/repeat.rs | 200 ++++++++++++++++++++++ crates/vim/src/state.rs | 34 +++- crates/vim/src/test/vim_test_context.rs | 15 ++ crates/vim/src/vim.rs | 85 ++++++++- crates/vim/src/visual.rs | 2 + crates/vim/test_data/test_dot_repeat.json | 38 ++++ 19 files changed, 544 insertions(+), 40 deletions(-) create mode 100644 crates/vim/src/normal/repeat.rs create mode 100644 crates/vim/test_data/test_dot_repeat.json diff --git a/Cargo.lock b/Cargo.lock index a185542c63..1353fd2240 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8767,12 +8767,14 @@ dependencies = [ "collections", "command_palette", "editor", + "futures 0.3.28", "gpui", "indoc", "itertools", "language", "language_selector", "log", + "lsp", "nvim-rs", "parking_lot 0.11.2", "project", diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index da094ea7e4..582171d8a2 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -316,6 +316,7 @@ { "context": "Editor && vim_mode == normal && (vim_operator == none || vim_operator == n) && !VimWaiting", "bindings": { + ".": "vim::Repeat", "c": [ "vim::PushOperator", "Change" @@ -331,10 +332,7 @@ "vim::PushOperator", "Yank" ], - "i": [ - "vim::SwitchMode", - "Insert" - ], + "i": "vim::InsertBefore", "shift-i": "vim::InsertFirstNonWhitespace", "a": "vim::InsertAfter", "shift-a": "vim::InsertEndOfLine", diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index bdd29b04fa..1e6e5685b9 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -2269,10 +2269,6 @@ impl Editor { if self.read_only { return; } - if !self.input_enabled { - cx.emit(Event::InputIgnored { text }); - return; - } let selections = self.selections.all_adjusted(cx); let mut brace_inserted = false; @@ -3207,17 +3203,30 @@ impl Editor { .count(); let snapshot = self.buffer.read(cx).snapshot(cx); + let mut range_to_replace: Option> = None; let mut ranges = Vec::new(); for selection in &selections { if snapshot.contains_str_at(selection.start.saturating_sub(lookbehind), &old_text) { let start = selection.start.saturating_sub(lookbehind); let end = selection.end + lookahead; + if selection.id == newest_selection.id { + range_to_replace = Some( + ((start + common_prefix_len) as isize - selection.start as isize) + ..(end as isize - selection.start as isize), + ); + } ranges.push(start + common_prefix_len..end); } else { common_prefix_len = 0; ranges.clear(); ranges.extend(selections.iter().map(|s| { if s.id == newest_selection.id { + range_to_replace = Some( + old_range.start.to_offset_utf16(&snapshot).0 as isize + - selection.start as isize + ..old_range.end.to_offset_utf16(&snapshot).0 as isize + - selection.start as isize, + ); old_range.clone() } else { s.start..s.end @@ -3228,6 +3237,11 @@ impl Editor { } let text = &text[common_prefix_len..]; + cx.emit(Event::InputHandled { + utf16_range_to_replace: range_to_replace, + text: text.into(), + }); + self.transact(cx, |this, cx| { if let Some(mut snippet) = snippet { snippet.text = text.to_string(); @@ -3685,6 +3699,10 @@ impl Editor { self.report_copilot_event(Some(completion.uuid.clone()), true, cx) } + cx.emit(Event::InputHandled { + utf16_range_to_replace: None, + text: suggestion.text.to_string().into(), + }); self.insert_with_autoindent_mode(&suggestion.text.to_string(), None, cx); cx.notify(); true @@ -8436,6 +8454,41 @@ impl Editor { pub fn inlay_hint_cache(&self) -> &InlayHintCache { &self.inlay_hint_cache } + + pub fn replay_insert_event( + &mut self, + text: &str, + relative_utf16_range: Option>, + cx: &mut ViewContext, + ) { + if !self.input_enabled { + cx.emit(Event::InputIgnored { text: text.into() }); + return; + } + if let Some(relative_utf16_range) = relative_utf16_range { + let selections = self.selections.all::(cx); + self.change_selections(None, cx, |s| { + let new_ranges = selections.into_iter().map(|range| { + let start = OffsetUtf16( + range + .head() + .0 + .saturating_add_signed(relative_utf16_range.start), + ); + let end = OffsetUtf16( + range + .head() + .0 + .saturating_add_signed(relative_utf16_range.end), + ); + start..end + }); + s.select_ranges(new_ranges); + }); + } + + self.handle_input(text, cx); + } } fn document_to_inlay_range( @@ -8524,6 +8577,10 @@ pub enum Event { InputIgnored { text: Arc, }, + InputHandled { + utf16_range_to_replace: Option>, + text: Arc, + }, ExcerptsAdded { buffer: ModelHandle, predecessor: ExcerptId, @@ -8744,29 +8801,51 @@ impl View for Editor { text: &str, cx: &mut ViewContext, ) { - self.transact(cx, |this, cx| { - if this.input_enabled { - let new_selected_ranges = if let Some(range_utf16) = range_utf16 { - let range_utf16 = OffsetUtf16(range_utf16.start)..OffsetUtf16(range_utf16.end); - Some(this.selection_replacement_ranges(range_utf16, cx)) - } else { - this.marked_text_ranges(cx) - }; + if !self.input_enabled { + cx.emit(Event::InputIgnored { text: text.into() }); + return; + } - if let Some(new_selected_ranges) = new_selected_ranges { - this.change_selections(None, cx, |selections| { - selections.select_ranges(new_selected_ranges) - }); - } + self.transact(cx, |this, cx| { + let new_selected_ranges = if let Some(range_utf16) = range_utf16 { + let range_utf16 = OffsetUtf16(range_utf16.start)..OffsetUtf16(range_utf16.end); + Some(this.selection_replacement_ranges(range_utf16, cx)) + } else { + this.marked_text_ranges(cx) + }; + + let range_to_replace = new_selected_ranges.as_ref().and_then(|ranges_to_replace| { + let newest_selection_id = this.selections.newest_anchor().id; + this.selections + .all::(cx) + .iter() + .zip(ranges_to_replace.iter()) + .find_map(|(selection, range)| { + if selection.id == newest_selection_id { + Some( + (range.start.0 as isize - selection.head().0 as isize) + ..(range.end.0 as isize - selection.head().0 as isize), + ) + } else { + None + } + }) + }); + + cx.emit(Event::InputHandled { + utf16_range_to_replace: range_to_replace, + text: text.into(), + }); + + if let Some(new_selected_ranges) = new_selected_ranges { + this.change_selections(None, cx, |selections| { + selections.select_ranges(new_selected_ranges) + }); } this.handle_input(text, cx); }); - if !self.input_enabled { - return; - } - if let Some(transaction) = self.ime_transaction { self.buffer.update(cx, |buffer, cx| { buffer.group_until_transaction(transaction, cx); @@ -8784,6 +8863,7 @@ impl View for Editor { cx: &mut ViewContext, ) { if !self.input_enabled { + cx.emit(Event::InputIgnored { text: text.into() }); return; } @@ -8808,6 +8888,29 @@ impl View for Editor { None }; + let range_to_replace = ranges_to_replace.as_ref().and_then(|ranges_to_replace| { + let newest_selection_id = this.selections.newest_anchor().id; + this.selections + .all::(cx) + .iter() + .zip(ranges_to_replace.iter()) + .find_map(|(selection, range)| { + if selection.id == newest_selection_id { + Some( + (range.start.0 as isize - selection.head().0 as isize) + ..(range.end.0 as isize - selection.head().0 as isize), + ) + } else { + None + } + }) + }); + + cx.emit(Event::InputHandled { + utf16_range_to_replace: range_to_replace, + text: text.into(), + }); + if let Some(ranges) = ranges_to_replace { this.change_selections(None, cx, |s| s.select_ranges(ranges)); } diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs index 74bd67e03a..f11639a770 100644 --- a/crates/editor/src/editor_tests.rs +++ b/crates/editor/src/editor_tests.rs @@ -7807,7 +7807,7 @@ fn assert_selection_ranges(marked_text: &str, view: &mut Editor, cx: &mut ViewCo /// Handle completion request passing a marked string specifying where the completion /// should be triggered from using '|' character, what range should be replaced, and what completions /// should be returned using '<' and '>' to delimit the range -fn handle_completion_request<'a>( +pub fn handle_completion_request<'a>( cx: &mut EditorLspTestContext<'a>, marked_string: &str, completions: Vec<&'static str>, diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs index 4b8b0534d5..09744579a9 100644 --- a/crates/gpui/src/app/window.rs +++ b/crates/gpui/src/app/window.rs @@ -1110,7 +1110,7 @@ impl<'a> WindowContext<'a> { self.window.is_fullscreen } - pub(crate) fn dispatch_action(&mut self, view_id: Option, action: &dyn Action) -> bool { + pub fn dispatch_action(&mut self, view_id: Option, action: &dyn Action) -> bool { if let Some(view_id) = view_id { self.halt_action_dispatch = false; self.visit_dispatch_path(view_id, |view_id, capture_phase, cx| { diff --git a/crates/terminal_view/README.md b/crates/terminal_view/README.md index 019460067e..ca48f54542 100644 --- a/crates/terminal_view/README.md +++ b/crates/terminal_view/README.md @@ -2,13 +2,13 @@ Design notes: This crate is split into two conceptual halves: - The terminal.rs file and the src/mappings/ folder, these contain the code for interacting with Alacritty and maintaining the pty event loop. Some behavior in this file is constrained by terminal protocols and standards. The Zed init function is also placed here. -- Everything else. These other files integrate the `Terminal` struct created in terminal.rs into the rest of GPUI. The main entry point for GPUI is the terminal_view.rs file and the modal.rs file. +- Everything else. These other files integrate the `Terminal` struct created in terminal.rs into the rest of GPUI. The main entry point for GPUI is the terminal_view.rs file and the modal.rs file. ttys are created externally, and so can fail in unexpected ways. However, GPUI currently does not have an API for models than can fail to instantiate. `TerminalBuilder` solves this by using Rust's type system to split tty instantiation into a 2 step process: first attempt to create the file handles with `TerminalBuilder::new()`, check the result, then call `TerminalBuilder::subscribe(cx)` from within a model context. The TerminalView struct abstracts over failed and successful terminals, passing focus through to the associated view and allowing clients to build a terminal without worrying about errors. -#Input +#Input There are currently many distinct paths for getting keystrokes to the terminal: @@ -18,6 +18,6 @@ There are currently many distinct paths for getting keystrokes to the terminal: 3. IME text. When the special character mappings fail, we pass the keystroke back to GPUI to hand it to the IME system. This comes back to us in the `View::replace_text_in_range()` method, and we then send that to the terminal directly, bypassing `try_keystroke()`. -4. Pasted text has a separate pathway. +4. Pasted text has a separate pathway. -Generally, there's a distinction between 'keystrokes that need to be mapped' and 'strings which need to be written'. I've attempted to unify these under the '.try_keystroke()' API and the `.input()` API (which try_keystroke uses) so we have consistent input handling across the terminal \ No newline at end of file +Generally, there's a distinction between 'keystrokes that need to be mapped' and 'strings which need to be written'. I've attempted to unify these under the '.try_keystroke()' API and the `.input()` API (which try_keystroke uses) so we have consistent input handling across the terminal diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml index 2d394e3dcf..5d40032024 100644 --- a/crates/vim/Cargo.toml +++ b/crates/vim/Cargo.toml @@ -38,6 +38,7 @@ language_selector = { path = "../language_selector"} [dev-dependencies] indoc.workspace = true parking_lot.workspace = true +futures.workspace = true editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } @@ -47,3 +48,4 @@ util = { path = "../util", features = ["test-support"] } settings = { path = "../settings" } workspace = { path = "../workspace", features = ["test-support"] } theme = { path = "../theme", features = ["test-support"] } +lsp = { path = "../lsp", features = ["test-support"] } diff --git a/crates/vim/src/editor_events.rs b/crates/vim/src/editor_events.rs index 994a09aaf9..da5c7d46ed 100644 --- a/crates/vim/src/editor_events.rs +++ b/crates/vim/src/editor_events.rs @@ -34,6 +34,7 @@ fn focused(EditorFocused(editor): &EditorFocused, cx: &mut AppContext) { fn blurred(EditorBlurred(editor): &EditorBlurred, cx: &mut AppContext) { editor.window().update(cx, |cx| { Vim::update(cx, |vim, cx| { + vim.workspace_state.recording = false; if let Some(previous_editor) = vim.active_editor.clone() { if previous_editor == editor.clone() { vim.active_editor = None; diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs index 537f6a15f1..9141a02ab3 100644 --- a/crates/vim/src/insert.rs +++ b/crates/vim/src/insert.rs @@ -11,8 +11,9 @@ pub fn init(cx: &mut AppContext) { } fn normal_before(_: &mut Workspace, _: &NormalBefore, cx: &mut ViewContext) { - Vim::update(cx, |state, cx| { - state.update_active_editor(cx, |editor, cx| { + Vim::update(cx, |vim, cx| { + vim.stop_recording(); + vim.update_active_editor(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| { s.move_cursors_with(|map, mut cursor, _| { *cursor.column_mut() = cursor.column().saturating_sub(1); @@ -20,7 +21,7 @@ fn normal_before(_: &mut Workspace, _: &NormalBefore, cx: &mut ViewContext, cx: &mut Win fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { + vim.start_recording(); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| { @@ -162,12 +173,20 @@ fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext) { + Vim::update(cx, |vim, cx| { + vim.start_recording(); + vim.switch_mode(Mode::Insert, false, cx); + }); +} + fn insert_first_non_whitespace( _: &mut Workspace, _: &InsertFirstNonWhitespace, cx: &mut ViewContext, ) { Vim::update(cx, |vim, cx| { + vim.start_recording(); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| { @@ -184,6 +203,7 @@ fn insert_first_non_whitespace( fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { + vim.start_recording(); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| { @@ -197,6 +217,7 @@ fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewConte fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { + vim.start_recording(); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { @@ -229,6 +250,7 @@ fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContex fn insert_line_below(_: &mut Workspace, _: &InsertLineBelow, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { + vim.start_recording(); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { @@ -260,6 +282,7 @@ fn insert_line_below(_: &mut Workspace, _: &InsertLineBelow, cx: &mut ViewContex pub(crate) fn normal_replace(text: Arc, cx: &mut WindowContext) { Vim::update(cx, |vim, cx| { + vim.stop_recording(); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { editor.set_clip_at_line_ends(false, cx); diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs index 90967949bb..bca7af852d 100644 --- a/crates/vim/src/normal/case.rs +++ b/crates/vim/src/normal/case.rs @@ -7,6 +7,7 @@ use crate::{normal::ChangeCase, state::Mode, Vim}; pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { + vim.record_current_action(); let count = vim.pop_number_operator(cx).unwrap_or(1) as u32; vim.update_active_editor(cx, |editor, cx| { let mut ranges = Vec::new(); diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs index 56fef78e1d..ae85acaab5 100644 --- a/crates/vim/src/normal/delete.rs +++ b/crates/vim/src/normal/delete.rs @@ -4,6 +4,7 @@ use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, Bias}; use gpui::WindowContext; pub fn delete_motion(vim: &mut Vim, motion: Motion, times: Option, cx: &mut WindowContext) { + vim.stop_recording(); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { editor.set_clip_at_line_ends(false, cx); @@ -37,6 +38,7 @@ pub fn delete_motion(vim: &mut Vim, motion: Motion, times: Option, cx: &m } pub fn delete_object(vim: &mut Vim, object: Object, around: bool, cx: &mut WindowContext) { + vim.stop_recording(); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { editor.set_clip_at_line_ends(false, cx); diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs index 3c437f9177..db451cec12 100644 --- a/crates/vim/src/normal/paste.rs +++ b/crates/vim/src/normal/paste.rs @@ -28,6 +28,7 @@ pub(crate) fn init(cx: &mut AppContext) { fn paste(_: &mut Workspace, action: &Paste, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { + vim.record_current_action(); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { editor.set_clip_at_line_ends(false, cx); diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs new file mode 100644 index 0000000000..20b9966a41 --- /dev/null +++ b/crates/vim/src/normal/repeat.rs @@ -0,0 +1,200 @@ +use crate::{ + state::{Mode, ReplayableAction}, + Vim, +}; +use gpui::{actions, AppContext}; +use workspace::Workspace; + +actions!(vim, [Repeat, EndRepeat,]); + +pub(crate) fn init(cx: &mut AppContext) { + cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| { + Vim::update(cx, |vim, cx| { + vim.workspace_state.replaying = false; + vim.switch_mode(Mode::Normal, false, cx) + }); + }); + + cx.add_action(|_: &mut Workspace, _: &Repeat, cx| { + Vim::update(cx, |vim, cx| { + let actions = vim.workspace_state.repeat_actions.clone(); + let Some(editor) = vim.active_editor.clone() else { + return; + }; + if let Some(new_count) = vim.pop_number_operator(cx) { + vim.workspace_state.recorded_count = Some(new_count); + } + vim.workspace_state.replaying = true; + + let window = cx.window(); + cx.app_context() + .spawn(move |mut cx| async move { + for action in actions { + match action { + ReplayableAction::Action(action) => window + .dispatch_action(editor.id(), action.as_ref(), &mut cx) + .ok_or_else(|| anyhow::anyhow!("window was closed")), + ReplayableAction::Insertion { + text, + utf16_range_to_replace, + } => editor.update(&mut cx, |editor, cx| { + editor.replay_insert_event( + &text, + utf16_range_to_replace.clone(), + cx, + ) + }), + }? + } + window + .dispatch_action(editor.id(), &EndRepeat, &mut cx) + .ok_or_else(|| anyhow::anyhow!("window was closed")) + }) + .detach_and_log_err(cx); + }); + }); +} + +#[cfg(test)] +mod test { + use std::sync::Arc; + + use editor::test::editor_lsp_test_context::EditorLspTestContext; + use futures::StreamExt; + use indoc::indoc; + + use gpui::{executor::Deterministic, View}; + + use crate::{ + state::Mode, + test::{NeovimBackedTestContext, VimTestContext}, + }; + + #[gpui::test] + async fn test_dot_repeat(cx: &mut gpui::TestAppContext) { + let mut cx = NeovimBackedTestContext::new(cx).await; + + // "o" + cx.set_shared_state("ˇhello").await; + cx.simulate_shared_keystrokes(["o", "w", "o", "r", "l", "d", "escape"]) + .await; + cx.assert_shared_state("hello\nworlˇd").await; + cx.simulate_shared_keystrokes(["."]).await; + cx.assert_shared_state("hello\nworld\nworlˇd").await; + + // "d" + cx.simulate_shared_keystrokes(["^", "d", "f", "o"]).await; + cx.simulate_shared_keystrokes(["g", "g", "."]).await; + cx.assert_shared_state("ˇ\nworld\nrld").await; + + // "p" (note that it pastes the current clipboard) + cx.simulate_shared_keystrokes(["j", "y", "y", "p"]).await; + cx.simulate_shared_keystrokes(["shift-g", "y", "y", "."]) + .await; + cx.assert_shared_state("\nworld\nworld\nrld\nˇrld").await; + + // "~" (note that counts apply to the action taken, not . itself) + cx.set_shared_state("ˇthe quick brown fox").await; + cx.simulate_shared_keystrokes(["2", "~", "."]).await; + cx.set_shared_state("THE ˇquick brown fox").await; + cx.simulate_shared_keystrokes(["3", "."]).await; + cx.set_shared_state("THE QUIˇck brown fox").await; + cx.simulate_shared_keystrokes(["."]).await; + cx.set_shared_state("THE QUICK ˇbrown fox").await; + } + + #[gpui::test] + async fn test_repeat_ime(deterministic: Arc, cx: &mut gpui::TestAppContext) { + let mut cx = VimTestContext::new(cx, true).await; + + cx.set_state("hˇllo", Mode::Normal); + cx.simulate_keystrokes(["i"]); + + // simulate brazilian input for ä. + cx.update_editor(|editor, cx| { + editor.replace_and_mark_text_in_range(None, "\"", Some(1..1), cx); + editor.replace_text_in_range(None, "ä", cx); + }); + cx.simulate_keystrokes(["escape"]); + cx.assert_state("hˇällo", Mode::Normal); + cx.simulate_keystrokes(["."]); + deterministic.run_until_parked(); + cx.assert_state("hˇäällo", Mode::Normal); + } + + #[gpui::test] + async fn test_repeat_completion( + deterministic: Arc, + cx: &mut gpui::TestAppContext, + ) { + let cx = EditorLspTestContext::new_rust( + lsp::ServerCapabilities { + completion_provider: Some(lsp::CompletionOptions { + trigger_characters: Some(vec![".".to_string(), ":".to_string()]), + resolve_provider: Some(true), + ..Default::default() + }), + ..Default::default() + }, + cx, + ) + .await; + let mut cx = VimTestContext::new_with_lsp(cx, true); + + cx.set_state( + indoc! {" + onˇe + two + three + "}, + Mode::Normal, + ); + + let mut request = + cx.handle_request::(move |_, params, _| async move { + let position = params.text_document_position.position; + Ok(Some(lsp::CompletionResponse::Array(vec![ + lsp::CompletionItem { + label: "first".to_string(), + text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit { + range: lsp::Range::new(position.clone(), position.clone()), + new_text: "first".to_string(), + })), + ..Default::default() + }, + lsp::CompletionItem { + label: "second".to_string(), + text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit { + range: lsp::Range::new(position.clone(), position.clone()), + new_text: "second".to_string(), + })), + ..Default::default() + }, + ]))) + }); + cx.simulate_keystrokes(["a", "."]); + request.next().await; + cx.condition(|editor, _| editor.context_menu_visible()) + .await; + cx.simulate_keystrokes(["down", "enter", "!", "escape"]); + + cx.assert_state( + indoc! {" + one.secondˇ! + two + three + "}, + Mode::Normal, + ); + cx.simulate_keystrokes(["j", "."]); + deterministic.run_until_parked(); + cx.assert_state( + indoc! {" + one.second! + two.secondˇ! + three + "}, + Mode::Normal, + ); + } +} diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs index aacd3d26e0..0b4f19fe13 100644 --- a/crates/vim/src/state.rs +++ b/crates/vim/src/state.rs @@ -1,4 +1,6 @@ -use gpui::keymap_matcher::KeymapContext; +use std::{ops::Range, sync::Arc}; + +use gpui::{keymap_matcher::KeymapContext, Action}; use language::CursorShape; use serde::{Deserialize, Serialize}; use workspace::searchable::Direction; @@ -52,6 +54,36 @@ pub struct EditorState { pub struct WorkspaceState { pub search: SearchState, pub last_find: Option, + + pub recording: bool, + pub stop_recording_after_next_action: bool, + pub replaying: bool, + pub recorded_count: Option, + pub repeat_actions: Vec, +} + +#[derive(Debug)] +pub enum ReplayableAction { + Action(Box), + Insertion { + text: Arc, + utf16_range_to_replace: Option>, + }, +} + +impl Clone for ReplayableAction { + fn clone(&self) -> Self { + match self { + Self::Action(action) => Self::Action(action.boxed_clone()), + Self::Insertion { + text, + utf16_range_to_replace, + } => Self::Insertion { + text: text.clone(), + utf16_range_to_replace: utf16_range_to_replace.clone(), + }, + } + } } #[derive(Clone)] diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs index 9b03739570..7cee320373 100644 --- a/crates/vim/src/test/vim_test_context.rs +++ b/crates/vim/src/test/vim_test_context.rs @@ -3,7 +3,9 @@ use std::ops::{Deref, DerefMut}; use editor::test::{ editor_lsp_test_context::EditorLspTestContext, editor_test_context::EditorTestContext, }; +use futures::Future; use gpui::ContextHandle; +use lsp::request; use search::{BufferSearchBar, ProjectSearchBar}; use crate::{state::Operator, *}; @@ -124,6 +126,19 @@ impl<'a> VimTestContext<'a> { assert_eq!(self.mode(), mode_after, "{}", self.assertion_context()); assert_eq!(self.active_operator(), None, "{}", self.assertion_context()); } + + pub fn handle_request( + &self, + handler: F, + ) -> futures::channel::mpsc::UnboundedReceiver<()> + where + T: 'static + request::Request, + T::Params: 'static + Send, + F: 'static + Send + FnMut(lsp::Url, T::Params, gpui::AsyncAppContext) -> Fut, + Fut: 'static + Send + Future>, + { + self.cx.handle_request::(handler) + } } impl<'a> Deref for VimTestContext<'a> { diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs index da1c634682..48d34d7094 100644 --- a/crates/vim/src/vim.rs +++ b/crates/vim/src/vim.rs @@ -25,10 +25,12 @@ use normal::normal_replace; use serde::Deserialize; use settings::{Setting, SettingsStore}; use state::{EditorState, Mode, Operator, WorkspaceState}; -use std::sync::Arc; +use std::{ops::Range, sync::Arc}; use visual::{visual_block_motion, visual_replace}; use workspace::{self, Workspace}; +use crate::state::ReplayableAction; + struct VimModeSetting(bool); #[derive(Clone, Deserialize, PartialEq)] @@ -102,6 +104,19 @@ pub fn observe_keystrokes(cx: &mut WindowContext) { return true; } if let Some(handled_by) = handled_by { + Vim::update(cx, |vim, _| { + if vim.workspace_state.recording { + vim.workspace_state + .repeat_actions + .push(ReplayableAction::Action(handled_by.boxed_clone())); + + if vim.workspace_state.stop_recording_after_next_action { + vim.workspace_state.recording = false; + vim.workspace_state.stop_recording_after_next_action = false; + } + } + }); + // Keystroke is handled by the vim system, so continue forward if handled_by.namespace() == "vim" { return true; @@ -156,7 +171,12 @@ impl Vim { } Event::InputIgnored { text } => { Vim::active_editor_input_ignored(text.clone(), cx); + Vim::record_insertion(text, None, cx) } + Event::InputHandled { + text, + utf16_range_to_replace: range_to_replace, + } => Vim::record_insertion(text, range_to_replace.clone(), cx), _ => {} })); @@ -176,6 +196,27 @@ impl Vim { self.sync_vim_settings(cx); } + fn record_insertion( + text: &Arc, + range_to_replace: Option>, + cx: &mut WindowContext, + ) { + Vim::update(cx, |vim, _| { + if vim.workspace_state.recording { + vim.workspace_state + .repeat_actions + .push(ReplayableAction::Insertion { + text: text.clone(), + utf16_range_to_replace: range_to_replace, + }); + if vim.workspace_state.stop_recording_after_next_action { + vim.workspace_state.recording = false; + vim.workspace_state.stop_recording_after_next_action = false; + } + } + }); + } + fn update_active_editor( &self, cx: &mut WindowContext, @@ -184,6 +225,36 @@ impl Vim { let editor = self.active_editor.clone()?.upgrade(cx)?; Some(editor.update(cx, update)) } + // ~, shift-j, x, shift-x, p + // shift-c, shift-d, shift-i, i, a, o, shift-o, s + // c, d + // r + + // TODO: shift-j? + // + pub fn start_recording(&mut self) { + if !self.workspace_state.replaying { + self.workspace_state.recording = true; + self.workspace_state.repeat_actions = Default::default(); + self.workspace_state.recorded_count = + if let Some(Operator::Number(number)) = self.active_operator() { + Some(number) + } else { + None + } + } + } + + pub fn stop_recording(&mut self) { + if self.workspace_state.recording { + self.workspace_state.stop_recording_after_next_action = true; + } + } + + pub fn record_current_action(&mut self) { + self.start_recording(); + self.stop_recording(); + } fn switch_mode(&mut self, mode: Mode, leave_selections: bool, cx: &mut WindowContext) { let state = self.state(); @@ -247,6 +318,12 @@ impl Vim { } fn push_operator(&mut self, operator: Operator, cx: &mut WindowContext) { + if matches!( + operator, + Operator::Change | Operator::Delete | Operator::Replace + ) { + self.start_recording() + }; self.update_state(|state| state.operator_stack.push(operator)); self.sync_vim_settings(cx); } @@ -272,6 +349,12 @@ impl Vim { } fn pop_number_operator(&mut self, cx: &mut WindowContext) -> Option { + if self.workspace_state.replaying { + if let Some(number) = self.workspace_state.recorded_count { + return Some(number); + } + } + if let Some(Operator::Number(number)) = self.active_operator() { self.pop_operator(cx); return Some(number); diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs index ee46a0d209..b7ea0811f0 100644 --- a/crates/vim/src/visual.rs +++ b/crates/vim/src/visual.rs @@ -277,6 +277,7 @@ pub fn other_end(_: &mut Workspace, _: &OtherEnd, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { + vim.record_current_action(); vim.update_active_editor(cx, |editor, cx| { let mut original_columns: HashMap<_, _> = Default::default(); let line_mode = editor.selections.line_mode; @@ -339,6 +340,7 @@ pub fn yank(_: &mut Workspace, _: &VisualYank, cx: &mut ViewContext) pub(crate) fn visual_replace(text: Arc, cx: &mut WindowContext) { Vim::update(cx, |vim, cx| { + vim.stop_recording(); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { let (display_map, selections) = editor.selections.all_adjusted_display(cx); diff --git a/crates/vim/test_data/test_dot_repeat.json b/crates/vim/test_data/test_dot_repeat.json new file mode 100644 index 0000000000..f1a1a3c138 --- /dev/null +++ b/crates/vim/test_data/test_dot_repeat.json @@ -0,0 +1,38 @@ +{"Put":{"state":"ˇhello"}} +{"Key":"o"} +{"Key":"w"} +{"Key":"o"} +{"Key":"r"} +{"Key":"l"} +{"Key":"d"} +{"Key":"escape"} +{"Get":{"state":"hello\nworlˇd","mode":"Normal"}} +{"Key":"."} +{"Get":{"state":"hello\nworld\nworlˇd","mode":"Normal"}} +{"Key":"^"} +{"Key":"d"} +{"Key":"f"} +{"Key":"o"} +{"Key":"g"} +{"Key":"g"} +{"Key":"."} +{"Get":{"state":"ˇ\nworld\nrld","mode":"Normal"}} +{"Key":"j"} +{"Key":"y"} +{"Key":"y"} +{"Key":"p"} +{"Key":"shift-g"} +{"Key":"y"} +{"Key":"y"} +{"Key":"."} +{"Get":{"state":"\nworld\nworld\nrld\nˇrld","mode":"Normal"}} +{"Put":{"state":"ˇthe quick brown fox"}} +{"Key":"2"} +{"Key":"~"} +{"Key":"."} +{"Put":{"state":"THE ˇquick brown fox"}} +{"Key":"3"} +{"Key":"."} +{"Put":{"state":"THE QUIˇck brown fox"}} +{"Key":"."} +{"Put":{"state":"THE QUICK ˇbrown fox"}} From f22d53eef9198e64d7e1c72d7d3875af21727e26 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Wed, 6 Sep 2023 14:14:49 -0600 Subject: [PATCH 02/19] Make test more deterministic Otherwise these pass only when --features=neovim is set --- crates/vim/src/normal/repeat.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs index 20b9966a41..7f2b8c4434 100644 --- a/crates/vim/src/normal/repeat.rs +++ b/crates/vim/src/normal/repeat.rs @@ -71,7 +71,7 @@ mod test { }; #[gpui::test] - async fn test_dot_repeat(cx: &mut gpui::TestAppContext) { + async fn test_dot_repeat(deterministic: Arc, cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; // "o" @@ -80,26 +80,33 @@ mod test { .await; cx.assert_shared_state("hello\nworlˇd").await; cx.simulate_shared_keystrokes(["."]).await; + deterministic.run_until_parked(); cx.assert_shared_state("hello\nworld\nworlˇd").await; // "d" cx.simulate_shared_keystrokes(["^", "d", "f", "o"]).await; cx.simulate_shared_keystrokes(["g", "g", "."]).await; + deterministic.run_until_parked(); cx.assert_shared_state("ˇ\nworld\nrld").await; // "p" (note that it pastes the current clipboard) cx.simulate_shared_keystrokes(["j", "y", "y", "p"]).await; cx.simulate_shared_keystrokes(["shift-g", "y", "y", "."]) .await; + deterministic.run_until_parked(); cx.assert_shared_state("\nworld\nworld\nrld\nˇrld").await; // "~" (note that counts apply to the action taken, not . itself) cx.set_shared_state("ˇthe quick brown fox").await; cx.simulate_shared_keystrokes(["2", "~", "."]).await; + deterministic.run_until_parked(); cx.set_shared_state("THE ˇquick brown fox").await; cx.simulate_shared_keystrokes(["3", "."]).await; + deterministic.run_until_parked(); cx.set_shared_state("THE QUIˇck brown fox").await; + deterministic.run_until_parked(); cx.simulate_shared_keystrokes(["."]).await; + deterministic.run_until_parked(); cx.set_shared_state("THE QUICK ˇbrown fox").await; } From 1969a12a0b8389182700de01ac3989c5c144dd73 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 7 Sep 2023 10:55:04 -0400 Subject: [PATCH 03/19] Include JS template literal as string type for overrides --- crates/zed/src/languages/javascript/overrides.scm | 6 +++++- crates/zed/src/languages/tsx/overrides.scm | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/crates/zed/src/languages/javascript/overrides.scm b/crates/zed/src/languages/javascript/overrides.scm index 5e43c4a94a..8b43fdcfc5 100644 --- a/crates/zed/src/languages/javascript/overrides.scm +++ b/crates/zed/src/languages/javascript/overrides.scm @@ -1,5 +1,9 @@ (comment) @comment -(string) @string + +[ + (string) + (template_string) +] @string [ (jsx_element) diff --git a/crates/zed/src/languages/tsx/overrides.scm b/crates/zed/src/languages/tsx/overrides.scm index 03066371b1..8b43fdcfc5 100644 --- a/crates/zed/src/languages/tsx/overrides.scm +++ b/crates/zed/src/languages/tsx/overrides.scm @@ -1,5 +1,10 @@ (comment) @comment -(string) @string + +[ + (string) + (template_string) +] @string + [ (jsx_element) (jsx_fragment) From 1b1d7f22cce914c0dc1c17631680c41333101597 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Wed, 6 Sep 2023 16:31:52 -0600 Subject: [PATCH 04/19] Add visual area repeating --- assets/keymaps/vim.json | 6 +- crates/editor/src/editor.rs | 2 +- crates/vim/src/motion.rs | 8 +- crates/vim/src/normal.rs | 20 +- crates/vim/src/normal/case.rs | 15 +- crates/vim/src/normal/paste.rs | 2 +- crates/vim/src/normal/repeat.rs | 268 ++++++++++++++++--- crates/vim/src/normal/substitute.rs | 2 + crates/vim/src/state.rs | 23 +- crates/vim/src/vim.rs | 53 +++- crates/vim/src/visual.rs | 2 +- crates/vim/test_data/test_change_case.json | 5 + crates/vim/test_data/test_repeat_visual.json | 51 ++++ 13 files changed, 393 insertions(+), 64 deletions(-) create mode 100644 crates/vim/test_data/test_repeat_visual.json diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index 582171d8a2..2027943a0f 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -446,12 +446,10 @@ ], "s": "vim::Substitute", "shift-s": "vim::SubstituteLine", + "shift-r": "vim::SubstituteLine", "c": "vim::Substitute", "~": "vim::ChangeCase", - "shift-i": [ - "vim::SwitchMode", - "Insert" - ], + "shift-i": "vim::InsertBefore", "shift-a": "vim::InsertAfter", "r": [ "vim::PushOperator", diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 1e6e5685b9..50a382439a 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -572,7 +572,7 @@ pub struct Editor { project: Option>, focused: bool, blink_manager: ModelHandle, - show_local_selections: bool, + pub show_local_selections: bool, mode: EditorMode, replica_id_mapping: Option>, show_gutter: bool, diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs index 16bccb6963..48f502639c 100644 --- a/crates/vim/src/motion.rs +++ b/crates/vim/src/motion.rs @@ -65,9 +65,9 @@ struct PreviousWordStart { #[derive(Clone, Deserialize, PartialEq)] #[serde(rename_all = "camelCase")] -struct Up { +pub(crate) struct Up { #[serde(default)] - display_lines: bool, + pub(crate) display_lines: bool, } #[derive(Clone, Deserialize, PartialEq)] @@ -93,9 +93,9 @@ struct EndOfLine { #[derive(Clone, Deserialize, PartialEq)] #[serde(rename_all = "camelCase")] -struct StartOfLine { +pub struct StartOfLine { #[serde(default)] - display_lines: bool, + pub(crate) display_lines: bool, } #[derive(Clone, Deserialize, PartialEq)] diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs index 310883d1d6..25a5ba5131 100644 --- a/crates/vim/src/normal.rs +++ b/crates/vim/src/normal.rs @@ -66,21 +66,21 @@ pub fn init(cx: &mut AppContext) { cx.add_action(|_: &mut Workspace, _: &DeleteLeft, cx| { Vim::update(cx, |vim, cx| { - vim.record_current_action(); + vim.record_current_action(cx); let times = vim.pop_number_operator(cx); delete_motion(vim, Motion::Left, times, cx); }) }); cx.add_action(|_: &mut Workspace, _: &DeleteRight, cx| { Vim::update(cx, |vim, cx| { - vim.record_current_action(); + vim.record_current_action(cx); let times = vim.pop_number_operator(cx); delete_motion(vim, Motion::Right, times, cx); }) }); cx.add_action(|_: &mut Workspace, _: &ChangeToEndOfLine, cx| { Vim::update(cx, |vim, cx| { - vim.start_recording(); + vim.start_recording(cx); let times = vim.pop_number_operator(cx); change_motion( vim, @@ -94,7 +94,7 @@ pub fn init(cx: &mut AppContext) { }); cx.add_action(|_: &mut Workspace, _: &DeleteToEndOfLine, cx| { Vim::update(cx, |vim, cx| { - vim.record_current_action(); + vim.record_current_action(cx); let times = vim.pop_number_operator(cx); delete_motion( vim, @@ -161,7 +161,7 @@ fn move_cursor(vim: &mut Vim, motion: Motion, times: Option, cx: &mut Win fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.start_recording(); + vim.start_recording(cx); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| { @@ -175,7 +175,7 @@ fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.start_recording(); + vim.start_recording(cx); vim.switch_mode(Mode::Insert, false, cx); }); } @@ -186,7 +186,7 @@ fn insert_first_non_whitespace( cx: &mut ViewContext, ) { Vim::update(cx, |vim, cx| { - vim.start_recording(); + vim.start_recording(cx); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| { @@ -203,7 +203,7 @@ fn insert_first_non_whitespace( fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.start_recording(); + vim.start_recording(cx); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| { @@ -217,7 +217,7 @@ fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewConte fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.start_recording(); + vim.start_recording(cx); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { @@ -250,7 +250,7 @@ fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContex fn insert_line_below(_: &mut Workspace, _: &InsertLineBelow, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.start_recording(); + vim.start_recording(cx); vim.switch_mode(Mode::Insert, false, cx); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs index bca7af852d..12fd8dbd2b 100644 --- a/crates/vim/src/normal/case.rs +++ b/crates/vim/src/normal/case.rs @@ -7,7 +7,7 @@ use crate::{normal::ChangeCase, state::Mode, Vim}; pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.record_current_action(); + vim.record_current_action(cx); let count = vim.pop_number_operator(cx).unwrap_or(1) as u32; vim.update_active_editor(cx, |editor, cx| { let mut ranges = Vec::new(); @@ -22,10 +22,16 @@ pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext { + Mode::Visual => { ranges.push(selection.start..selection.end); cursor_positions.push(selection.start..selection.start); } + Mode::VisualBlock => { + ranges.push(selection.start..selection.end); + if cursor_positions.len() == 0 { + cursor_positions.push(selection.start..selection.start); + } + } Mode::Insert | Mode::Normal => { let start = selection.start; let mut end = start; @@ -97,6 +103,11 @@ mod test { cx.simulate_shared_keystrokes(["shift-v", "~"]).await; cx.assert_shared_state("ˇABc\n").await; + // works in visual block mode + cx.set_shared_state("ˇaa\nbb\ncc").await; + cx.simulate_shared_keystrokes(["ctrl-v", "j", "~"]).await; + cx.assert_shared_state("ˇAa\nBb\ncc").await; + // works with multiple cursors (zed only) cx.set_state("aˇßcdˇe\n", Mode::Normal); cx.simulate_keystroke("~"); diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs index db451cec12..dda8dea1e4 100644 --- a/crates/vim/src/normal/paste.rs +++ b/crates/vim/src/normal/paste.rs @@ -28,7 +28,7 @@ pub(crate) fn init(cx: &mut AppContext) { fn paste(_: &mut Workspace, action: &Paste, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.record_current_action(); + vim.record_current_action(cx); vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { editor.set_clip_at_line_ends(false, cx); diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs index 7f2b8c4434..a291419413 100644 --- a/crates/vim/src/normal/repeat.rs +++ b/crates/vim/src/normal/repeat.rs @@ -1,5 +1,7 @@ use crate::{ - state::{Mode, ReplayableAction}, + motion::Motion, + state::{Mode, RecordedSelection, ReplayableAction}, + visual::visual_motion, Vim, }; use gpui::{actions, AppContext}; @@ -11,47 +13,127 @@ pub(crate) fn init(cx: &mut AppContext) { cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| { Vim::update(cx, |vim, cx| { vim.workspace_state.replaying = false; + vim.update_active_editor(cx, |editor, _| { + editor.show_local_selections = true; + }); vim.switch_mode(Mode::Normal, false, cx) }); }); cx.add_action(|_: &mut Workspace, _: &Repeat, cx| { - Vim::update(cx, |vim, cx| { - let actions = vim.workspace_state.repeat_actions.clone(); + let Some((actions, editor, selection)) = Vim::update(cx, |vim, cx| { + let actions = vim.workspace_state.recorded_actions.clone(); let Some(editor) = vim.active_editor.clone() else { - return; + return None; }; - if let Some(new_count) = vim.pop_number_operator(cx) { - vim.workspace_state.recorded_count = Some(new_count); - } + let count = vim.pop_number_operator(cx); + vim.workspace_state.replaying = true; - let window = cx.window(); - cx.app_context() - .spawn(move |mut cx| async move { - for action in actions { - match action { - ReplayableAction::Action(action) => window - .dispatch_action(editor.id(), action.as_ref(), &mut cx) - .ok_or_else(|| anyhow::anyhow!("window was closed")), - ReplayableAction::Insertion { - text, - utf16_range_to_replace, - } => editor.update(&mut cx, |editor, cx| { - editor.replay_insert_event( - &text, - utf16_range_to_replace.clone(), - cx, - ) - }), - }? + let selection = vim.workspace_state.recorded_selection.clone(); + match selection { + RecordedSelection::SingleLine { .. } | RecordedSelection::Visual { .. } => { + vim.workspace_state.recorded_count = None; + vim.switch_mode(Mode::Visual, false, cx) + } + RecordedSelection::VisualLine { .. } => { + vim.workspace_state.recorded_count = None; + vim.switch_mode(Mode::VisualLine, false, cx) + } + RecordedSelection::VisualBlock { .. } => { + vim.workspace_state.recorded_count = None; + vim.switch_mode(Mode::VisualBlock, false, cx) + } + RecordedSelection::None => { + if let Some(count) = count { + vim.workspace_state.recorded_count = Some(count); } - window - .dispatch_action(editor.id(), &EndRepeat, &mut cx) - .ok_or_else(|| anyhow::anyhow!("window was closed")) + } + } + + if let Some(editor) = editor.upgrade(cx) { + editor.update(cx, |editor, _| { + editor.show_local_selections = false; }) - .detach_and_log_err(cx); - }); + } else { + return None; + } + + Some((actions, editor, selection)) + }) else { + return; + }; + + match selection { + RecordedSelection::SingleLine { cols } => { + if cols > 1 { + visual_motion(Motion::Right, Some(cols as usize - 1), cx) + } + } + RecordedSelection::Visual { rows, cols } => { + visual_motion( + Motion::Down { + display_lines: false, + }, + Some(rows as usize), + cx, + ); + visual_motion( + Motion::StartOfLine { + display_lines: false, + }, + None, + cx, + ); + if cols > 1 { + visual_motion(Motion::Right, Some(cols as usize - 1), cx) + } + } + RecordedSelection::VisualBlock { rows, cols } => { + visual_motion( + Motion::Down { + display_lines: false, + }, + Some(rows as usize), + cx, + ); + if cols > 1 { + visual_motion(Motion::Right, Some(cols as usize - 1), cx); + } + } + RecordedSelection::VisualLine { rows } => { + visual_motion( + Motion::Down { + display_lines: false, + }, + Some(rows as usize), + cx, + ); + } + RecordedSelection::None => {} + } + + let window = cx.window(); + cx.app_context() + .spawn(move |mut cx| async move { + for action in actions { + match action { + ReplayableAction::Action(action) => window + .dispatch_action(editor.id(), action.as_ref(), &mut cx) + .ok_or_else(|| anyhow::anyhow!("window was closed")), + ReplayableAction::Insertion { + text, + utf16_range_to_replace, + } => editor.update(&mut cx, |editor, cx| { + editor.replay_insert_event(&text, utf16_range_to_replace.clone(), cx) + }), + }? + } + window + .dispatch_action(editor.id(), &EndRepeat, &mut cx) + .ok_or_else(|| anyhow::anyhow!("window was closed")) + }) + .detach_and_log_err(cx); }); } @@ -204,4 +286,128 @@ mod test { Mode::Normal, ); } + + #[gpui::test] + async fn test_repeat_visual(deterministic: Arc, cx: &mut gpui::TestAppContext) { + let mut cx = NeovimBackedTestContext::new(cx).await; + + // single-line (3 columns) + cx.set_shared_state(indoc! { + "ˇthe quick brown + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["v", "i", "w", "s", "o", "escape"]) + .await; + cx.assert_shared_state(indoc! { + "ˇo quick brown + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["j", "w", "."]).await; + deterministic.run_until_parked(); + cx.assert_shared_state(indoc! { + "o quick brown + fox ˇops over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["f", "r", "."]).await; + deterministic.run_until_parked(); + cx.assert_shared_state(indoc! { + "o quick brown + fox ops oveˇothe lazy dog" + }) + .await; + + // visual + cx.set_shared_state(indoc! { + "the ˇquick brown + fox jumps over + fox jumps over + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["v", "j", "x"]).await; + cx.assert_shared_state(indoc! { + "the ˇumps over + fox jumps over + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["."]).await; + deterministic.run_until_parked(); + cx.assert_shared_state(indoc! { + "the ˇumps over + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["w", "."]).await; + deterministic.run_until_parked(); + cx.assert_shared_state(indoc! { + "the umps ˇumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["j", "."]).await; + deterministic.run_until_parked(); + cx.assert_shared_state(indoc! { + "the umps umps over + the ˇog" + }) + .await; + + // block mode (3 rows) + cx.set_shared_state(indoc! { + "ˇthe quick brown + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["ctrl-v", "j", "j", "shift-i", "o", "escape"]) + .await; + cx.assert_shared_state(indoc! { + "ˇothe quick brown + ofox jumps over + othe lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["j", "4", "l", "."]).await; + deterministic.run_until_parked(); + cx.assert_shared_state(indoc! { + "othe quick brown + ofoxˇo jumps over + otheo lazy dog" + }) + .await; + + // line mode + cx.set_shared_state(indoc! { + "ˇthe quick brown + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["shift-v", "shift-r", "o", "escape"]) + .await; + cx.assert_shared_state(indoc! { + "ˇo + fox jumps over + the lazy dog" + }) + .await; + cx.simulate_shared_keystrokes(["j", "."]).await; + deterministic.run_until_parked(); + cx.assert_shared_state(indoc! { + "o + ˇo + the lazy dog" + }) + .await; + } } diff --git a/crates/vim/src/normal/substitute.rs b/crates/vim/src/normal/substitute.rs index 23b545abd8..d0dbb9e306 100644 --- a/crates/vim/src/normal/substitute.rs +++ b/crates/vim/src/normal/substitute.rs @@ -10,6 +10,7 @@ actions!(vim, [Substitute, SubstituteLine]); pub(crate) fn init(cx: &mut AppContext) { cx.add_action(|_: &mut Workspace, _: &Substitute, cx| { Vim::update(cx, |vim, cx| { + vim.start_recording(cx); let count = vim.pop_number_operator(cx); substitute(vim, count, vim.state().mode == Mode::VisualLine, cx); }) @@ -17,6 +18,7 @@ pub(crate) fn init(cx: &mut AppContext) { cx.add_action(|_: &mut Workspace, _: &SubstituteLine, cx| { Vim::update(cx, |vim, cx| { + vim.start_recording(cx); if matches!(vim.state().mode, Mode::VisualBlock | Mode::Visual) { vim.switch_mode(Mode::VisualLine, false, cx) } diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs index 0b4f19fe13..7359178f0e 100644 --- a/crates/vim/src/state.rs +++ b/crates/vim/src/state.rs @@ -50,6 +50,26 @@ pub struct EditorState { pub operator_stack: Vec, } +#[derive(Default, Clone, Debug)] +pub enum RecordedSelection { + #[default] + None, + Visual { + rows: u32, + cols: u32, + }, + SingleLine { + cols: u32, + }, + VisualBlock { + rows: u32, + cols: u32, + }, + VisualLine { + rows: u32, + }, +} + #[derive(Default, Clone)] pub struct WorkspaceState { pub search: SearchState, @@ -59,7 +79,8 @@ pub struct WorkspaceState { pub stop_recording_after_next_action: bool, pub replaying: bool, pub recorded_count: Option, - pub repeat_actions: Vec, + pub recorded_actions: Vec, + pub recorded_selection: RecordedSelection, } #[derive(Debug)] diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs index 48d34d7094..35abdaf834 100644 --- a/crates/vim/src/vim.rs +++ b/crates/vim/src/vim.rs @@ -18,13 +18,13 @@ use gpui::{ actions, impl_actions, keymap_matcher::KeymapContext, keymap_matcher::MatchResult, AppContext, Subscription, ViewContext, ViewHandle, WeakViewHandle, WindowContext, }; -use language::{CursorShape, Selection, SelectionGoal}; +use language::{CursorShape, Point, Selection, SelectionGoal}; pub use mode_indicator::ModeIndicator; use motion::Motion; use normal::normal_replace; use serde::Deserialize; use settings::{Setting, SettingsStore}; -use state::{EditorState, Mode, Operator, WorkspaceState}; +use state::{EditorState, Mode, Operator, RecordedSelection, WorkspaceState}; use std::{ops::Range, sync::Arc}; use visual::{visual_block_motion, visual_replace}; use workspace::{self, Workspace}; @@ -107,7 +107,7 @@ pub fn observe_keystrokes(cx: &mut WindowContext) { Vim::update(cx, |vim, _| { if vim.workspace_state.recording { vim.workspace_state - .repeat_actions + .recorded_actions .push(ReplayableAction::Action(handled_by.boxed_clone())); if vim.workspace_state.stop_recording_after_next_action { @@ -204,7 +204,7 @@ impl Vim { Vim::update(cx, |vim, _| { if vim.workspace_state.recording { vim.workspace_state - .repeat_actions + .recorded_actions .push(ReplayableAction::Insertion { text: text.clone(), utf16_range_to_replace: range_to_replace, @@ -232,16 +232,51 @@ impl Vim { // TODO: shift-j? // - pub fn start_recording(&mut self) { + pub fn start_recording(&mut self, cx: &mut WindowContext) { if !self.workspace_state.replaying { self.workspace_state.recording = true; - self.workspace_state.repeat_actions = Default::default(); + self.workspace_state.recorded_actions = Default::default(); self.workspace_state.recorded_count = if let Some(Operator::Number(number)) = self.active_operator() { Some(number) } else { None + }; + + let selections = self + .active_editor + .and_then(|editor| editor.upgrade(cx)) + .map(|editor| { + let editor = editor.read(cx); + ( + editor.selections.oldest::(cx), + editor.selections.newest::(cx), + ) + }); + + if let Some((oldest, newest)) = selections { + self.workspace_state.recorded_selection = match self.state().mode { + Mode::Visual if newest.end.row == newest.start.row => { + RecordedSelection::SingleLine { + cols: newest.end.column - newest.start.column, + } + } + Mode::Visual => RecordedSelection::Visual { + rows: newest.end.row - newest.start.row, + cols: newest.end.column, + }, + Mode::VisualLine => RecordedSelection::VisualLine { + rows: newest.end.row - newest.start.row, + }, + Mode::VisualBlock => RecordedSelection::VisualBlock { + rows: newest.end.row.abs_diff(oldest.start.row), + cols: newest.end.column.abs_diff(oldest.start.column), + }, + _ => RecordedSelection::None, } + } else { + self.workspace_state.recorded_selection = RecordedSelection::None; + } } } @@ -251,8 +286,8 @@ impl Vim { } } - pub fn record_current_action(&mut self) { - self.start_recording(); + pub fn record_current_action(&mut self, cx: &mut WindowContext) { + self.start_recording(cx); self.stop_recording(); } @@ -322,7 +357,7 @@ impl Vim { operator, Operator::Change | Operator::Delete | Operator::Replace ) { - self.start_recording() + self.start_recording(cx) }; self.update_state(|state| state.operator_stack.push(operator)); self.sync_vim_settings(cx); diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs index b7ea0811f0..acd55a0954 100644 --- a/crates/vim/src/visual.rs +++ b/crates/vim/src/visual.rs @@ -277,7 +277,7 @@ pub fn other_end(_: &mut Workspace, _: &OtherEnd, cx: &mut ViewContext) { Vim::update(cx, |vim, cx| { - vim.record_current_action(); + vim.record_current_action(cx); vim.update_active_editor(cx, |editor, cx| { let mut original_columns: HashMap<_, _> = Default::default(); let line_mode = editor.selections.line_mode; diff --git a/crates/vim/test_data/test_change_case.json b/crates/vim/test_data/test_change_case.json index 1c0cad0b93..10eb93b227 100644 --- a/crates/vim/test_data/test_change_case.json +++ b/crates/vim/test_data/test_change_case.json @@ -16,3 +16,8 @@ {"Key":"shift-v"} {"Key":"~"} {"Get":{"state":"ˇABc\n","mode":"Normal"}} +{"Put":{"state":"ˇaa\nbb\ncc"}} +{"Key":"ctrl-v"} +{"Key":"j"} +{"Key":"~"} +{"Get":{"state":"ˇAa\nBb\ncc","mode":"Normal"}} diff --git a/crates/vim/test_data/test_repeat_visual.json b/crates/vim/test_data/test_repeat_visual.json new file mode 100644 index 0000000000..cb83addcfb --- /dev/null +++ b/crates/vim/test_data/test_repeat_visual.json @@ -0,0 +1,51 @@ +{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}} +{"Key":"v"} +{"Key":"i"} +{"Key":"w"} +{"Key":"s"} +{"Key":"o"} +{"Key":"escape"} +{"Get":{"state":"ˇo quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}} +{"Key":"j"} +{"Key":"w"} +{"Key":"."} +{"Get":{"state":"o quick brown\nfox ˇops over\nthe lazy dog","mode":"Normal"}} +{"Key":"f"} +{"Key":"r"} +{"Key":"."} +{"Get":{"state":"o quick brown\nfox ops oveˇothe lazy dog","mode":"Normal"}} +{"Put":{"state":"the ˇquick brown\nfox jumps over\nfox jumps over\nfox jumps over\nthe lazy dog"}} +{"Key":"v"} +{"Key":"j"} +{"Key":"x"} +{"Get":{"state":"the ˇumps over\nfox jumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}} +{"Key":"."} +{"Get":{"state":"the ˇumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}} +{"Key":"w"} +{"Key":"."} +{"Get":{"state":"the umps ˇumps over\nthe lazy dog","mode":"Normal"}} +{"Key":"j"} +{"Key":"."} +{"Get":{"state":"the umps umps over\nthe ˇog","mode":"Normal"}} +{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}} +{"Key":"ctrl-v"} +{"Key":"j"} +{"Key":"j"} +{"Key":"shift-i"} +{"Key":"o"} +{"Key":"escape"} +{"Get":{"state":"ˇothe quick brown\nofox jumps over\nothe lazy dog","mode":"Normal"}} +{"Key":"j"} +{"Key":"4"} +{"Key":"l"} +{"Key":"."} +{"Get":{"state":"othe quick brown\nofoxˇo jumps over\notheo lazy dog","mode":"Normal"}} +{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}} +{"Key":"shift-v"} +{"Key":"shift-r"} +{"Key":"o"} +{"Key":"escape"} +{"Get":{"state":"ˇo\nfox jumps over\nthe lazy dog","mode":"Normal"}} +{"Key":"j"} +{"Key":"."} +{"Get":{"state":"o\nˇo\nthe lazy dog","mode":"Normal"}} From 48bb2a3321f5aeebc7f830760202b8ef317579f6 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Thu, 7 Sep 2023 10:51:18 -0600 Subject: [PATCH 05/19] TEMP --- assets/keymaps/vim.json | 2 +- crates/vim/src/normal.rs | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index 2027943a0f..f7fdb57d9d 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -327,7 +327,7 @@ "Delete" ], "shift-d": "vim::DeleteToEndOfLine", - "shift-j": "editor::JoinLines", + "shift-j": "vim::JoinLines", "y": [ "vim::PushOperator", "Yank" diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs index 25a5ba5131..d328f663c5 100644 --- a/crates/vim/src/normal.rs +++ b/crates/vim/src/normal.rs @@ -46,6 +46,7 @@ actions!( DeleteToEndOfLine, Yank, ChangeCase, + JoinLines, ] ); @@ -106,6 +107,19 @@ pub fn init(cx: &mut AppContext) { ); }) }); + cx.add_action(|_: &mut Workspace, _: &JoinLines, cx| { + Vim::update(cx, |vim, cx| { + vim.record_current_action(cx); + let times = vim.pop_number_operator(cx).unwrap_or(1); + vim.update_active_editor(cx, |editor, cx| { + editor.transact(cx, |editor, cx| { + for _ in 0..times { + editor.join_lines(editor::JoinLines, cx) + } + }) + }) + }) + }) } pub fn normal_motion( From 65e17e212dbadfbe7a249d1822bf01eb507b9b38 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 7 Sep 2023 18:49:57 +0200 Subject: [PATCH 06/19] Eagerly index project on workspace creation if it was indexed before Co-Authored-By: Kyle Caverly --- crates/search/src/project_search.rs | 2 +- crates/semantic_index/src/db.rs | 7 +---- crates/semantic_index/src/semantic_index.rs | 32 ++++++++++++++++++++- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index 7088f394bc..105849bf1d 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -867,7 +867,7 @@ impl ProjectSearchView { SemanticIndex::global(cx) .map(|semantic| { let project = self.model.read(cx).project.clone(); - semantic.update(cx, |this, cx| this.project_previously_indexed(project, cx)) + semantic.update(cx, |this, cx| this.project_previously_indexed(&project, cx)) }) .unwrap_or(Task::ready(Ok(false))) } diff --git a/crates/semantic_index/src/db.rs b/crates/semantic_index/src/db.rs index c35057594a..c53a3e1ba9 100644 --- a/crates/semantic_index/src/db.rs +++ b/crates/semantic_index/src/db.rs @@ -18,7 +18,7 @@ use std::{ path::{Path, PathBuf}, rc::Rc, sync::Arc, - time::{Instant, SystemTime}, + time::SystemTime, }; use util::TryFutureExt; @@ -232,7 +232,6 @@ impl VectorDatabase { let file_id = db.last_insert_rowid(); - let t0 = Instant::now(); let mut query = db.prepare( " INSERT INTO spans @@ -240,10 +239,6 @@ impl VectorDatabase { VALUES (?1, ?2, ?3, ?4, ?5, ?6) ", )?; - log::trace!( - "Preparing Query Took: {:?} milliseconds", - t0.elapsed().as_millis() - ); for span in spans { query.execute(params![ diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs index 8bba2f1d0e..ce8af3ba80 100644 --- a/crates/semantic_index/src/semantic_index.rs +++ b/crates/semantic_index/src/semantic_index.rs @@ -35,6 +35,7 @@ use util::{ paths::EMBEDDINGS_DIR, ResultExt, }; +use workspace::WorkspaceCreated; const SEMANTIC_INDEX_VERSION: usize = 10; const BACKGROUND_INDEXING_DELAY: Duration = Duration::from_secs(5 * 60); @@ -57,6 +58,35 @@ pub fn init( return; } + cx.subscribe_global::({ + move |event, cx| { + let Some(semantic_index) = SemanticIndex::global(cx) else { + return; + }; + let workspace = &event.0; + if let Some(workspace) = workspace.upgrade(cx) { + let project = workspace.read(cx).project().clone(); + if project.read(cx).is_local() { + cx.spawn(|mut cx| async move { + let previously_indexed = semantic_index + .update(&mut cx, |index, cx| { + index.project_previously_indexed(&project, cx) + }) + .await?; + if previously_indexed { + semantic_index + .update(&mut cx, |index, cx| index.index_project(project, cx)) + .await?; + } + anyhow::Ok(()) + }) + .detach_and_log_err(cx); + } + } + } + }) + .detach(); + cx.spawn(move |mut cx| async move { let semantic_index = SemanticIndex::new( fs, @@ -356,7 +386,7 @@ impl SemanticIndex { pub fn project_previously_indexed( &mut self, - project: ModelHandle, + project: &ModelHandle, cx: &mut ModelContext, ) -> Task> { let worktrees_indexed_previously = project From 47d7aa0b911a8257e025337f4fb355821fed4581 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 7 Sep 2023 19:04:45 +0200 Subject: [PATCH 07/19] Allow searching before indexing is complete Co-Authored-By: Kyle Caverly --- crates/search/src/project_search.rs | 33 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index 105849bf1d..593308ce12 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -230,7 +230,7 @@ impl ProjectSearch { self.search_id += 1; self.match_ranges.clear(); self.search_history.add(inputs.as_str().to_string()); - self.no_results = Some(true); + self.no_results = None; self.pending_search = Some(cx.spawn(|this, mut cx| async move { let results = search?.await.log_err()?; let matches = results @@ -238,9 +238,10 @@ impl ProjectSearch { .map(|result| (result.buffer, vec![result.range.start..result.range.start])); this.update(&mut cx, |this, cx| { + this.no_results = Some(true); this.excerpts.update(cx, |excerpts, cx| { excerpts.clear(cx); - }) + }); }); for (buffer, ranges) in matches { let mut match_ranges = this.update(&mut cx, |this, cx| { @@ -315,15 +316,13 @@ impl View for ProjectSearchView { } }; - let semantic_status = if let Some(semantic) = &self.semantic_state { + let semantic_status = self.semantic_state.as_ref().map(|semantic| { if semantic.pending_file_count > 0 { format!("Remaining files to index: {}", semantic.pending_file_count) } else { "Indexing complete".to_string() } - } else { - "Indexing: ...".to_string() - }; + }); let minor_text = if let Some(no_results) = model.no_results { if model.pending_search.is_none() && no_results { @@ -333,12 +332,16 @@ impl View for ProjectSearchView { } } else { match current_mode { - SearchMode::Semantic => vec![ - "".to_owned(), - semantic_status, - "Simply explain the code you are looking to find.".to_owned(), - "ex. 'prompt user for permissions to index their project'".to_owned(), - ], + SearchMode::Semantic => { + let mut minor_text = Vec::new(); + minor_text.push("".into()); + minor_text.extend(semantic_status); + minor_text.push("Simply explain the code you are looking to find.".into()); + minor_text.push( + "ex. 'prompt user for permissions to index their project'".into(), + ); + minor_text + } _ => vec![ "".to_owned(), "Include/exclude specific paths with the filter option.".to_owned(), @@ -952,11 +955,7 @@ impl ProjectSearchView { let mode = self.current_mode; match mode { SearchMode::Semantic => { - if let Some(semantic) = &mut self.semantic_state { - if semantic.pending_file_count > 0 { - return; - } - + if self.semantic_state.is_some() { if let Some(query) = self.build_search_query(cx) { self.model .update(cx, |model, cx| model.semantic_search(query.as_inner(), cx)); From 8e2e00e00377600cd261bd1c43c9476991bd2a5f Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Thu, 7 Sep 2023 11:08:07 -0600 Subject: [PATCH 08/19] add vim-specific J (with repeatability) --- assets/keymaps/vim.json | 1 + crates/vim/src/normal.rs | 11 ++++- crates/vim/src/test.rs | 49 +++++++++++++++++++++++ crates/vim/test_data/test_join_lines.json | 13 ++++++ 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 crates/vim/test_data/test_join_lines.json diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index f7fdb57d9d..45891adee6 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -451,6 +451,7 @@ "~": "vim::ChangeCase", "shift-i": "vim::InsertBefore", "shift-a": "vim::InsertAfter", + "shift-j": "vim::JoinLines", "r": [ "vim::PushOperator", "Replace" diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs index d328f663c5..63bfe9bd1e 100644 --- a/crates/vim/src/normal.rs +++ b/crates/vim/src/normal.rs @@ -110,11 +110,18 @@ pub fn init(cx: &mut AppContext) { cx.add_action(|_: &mut Workspace, _: &JoinLines, cx| { Vim::update(cx, |vim, cx| { vim.record_current_action(cx); - let times = vim.pop_number_operator(cx).unwrap_or(1); + let mut times = vim.pop_number_operator(cx).unwrap_or(1); + if vim.state().mode.is_visual() { + times = 1; + } else if times > 1 { + // 2J joins two lines together (same as J or 1J) + times -= 1; + } + vim.update_active_editor(cx, |editor, cx| { editor.transact(cx, |editor, cx| { for _ in 0..times { - editor.join_lines(editor::JoinLines, cx) + editor.join_lines(&Default::default(), cx) } }) }) diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs index c6a212d77f..9d3a141a9e 100644 --- a/crates/vim/src/test.rs +++ b/crates/vim/src/test.rs @@ -286,6 +286,55 @@ async fn test_word_characters(cx: &mut gpui::TestAppContext) { ) } +#[gpui::test] +async fn test_join_lines(cx: &mut gpui::TestAppContext) { + let mut cx = NeovimBackedTestContext::new(cx).await; + + cx.set_shared_state(indoc! {" + ˇone + two + three + four + five + six + "}) + .await; + cx.simulate_shared_keystrokes(["shift-j"]).await; + cx.assert_shared_state(indoc! {" + oneˇ two + three + four + five + six + "}) + .await; + cx.simulate_shared_keystrokes(["3", "shift-j"]).await; + cx.assert_shared_state(indoc! {" + one two threeˇ four + five + six + "}) + .await; + + cx.set_shared_state(indoc! {" + ˇone + two + three + four + five + six + "}) + .await; + cx.simulate_shared_keystrokes(["j", "v", "3", "j", "shift-j"]) + .await; + cx.assert_shared_state(indoc! {" + one + two three fourˇ five + six + "}) + .await; +} + #[gpui::test] async fn test_wrapped_lines(cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; diff --git a/crates/vim/test_data/test_join_lines.json b/crates/vim/test_data/test_join_lines.json new file mode 100644 index 0000000000..b4bc5c30e1 --- /dev/null +++ b/crates/vim/test_data/test_join_lines.json @@ -0,0 +1,13 @@ +{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}} +{"Key":"shift-j"} +{"Get":{"state":"oneˇ two\nthree\nfour\nfive\nsix\n","mode":"Normal"}} +{"Key":"3"} +{"Key":"shift-j"} +{"Get":{"state":"one two threeˇ four\nfive\nsix\n","mode":"Normal"}} +{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}} +{"Key":"j"} +{"Key":"v"} +{"Key":"3"} +{"Key":"j"} +{"Key":"shift-j"} +{"Get":{"state":"one\ntwo three fourˇ five\nsix\n","mode":"Normal"}} From eda7e0064593aae789a8045515a197541f5655aa Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 7 Sep 2023 19:39:30 +0200 Subject: [PATCH 09/19] Implement `SemanticIndex::status` and use it in project search Co-Authored-By: Kyle Caverly --- crates/search/src/project_search.rs | 76 ++++++++++----------- crates/semantic_index/src/semantic_index.rs | 67 ++++++++++++++++-- 2 files changed, 96 insertions(+), 47 deletions(-) diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index 593308ce12..c52be64141 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -20,12 +20,11 @@ use gpui::{ Task, View, ViewContext, ViewHandle, WeakModelHandle, WeakViewHandle, }; use menu::Confirm; -use postage::stream::Stream; use project::{ search::{PathMatcher, SearchInputs, SearchQuery}, Entry, Project, }; -use semantic_index::SemanticIndex; +use semantic_index::{SemanticIndex, SemanticIndexStatus}; use smallvec::SmallVec; use std::{ any::{Any, TypeId}, @@ -116,7 +115,7 @@ pub struct ProjectSearchView { model: ModelHandle, query_editor: ViewHandle, results_editor: ViewHandle, - semantic_state: Option, + semantic_state: Option, semantic_permissioned: Option, search_options: SearchOptions, panels_with_errors: HashSet, @@ -129,9 +128,9 @@ pub struct ProjectSearchView { current_mode: SearchMode, } -struct SemanticSearchState { - pending_file_count: usize, - _progress_task: Task<()>, +struct SemanticState { + index_status: SemanticIndexStatus, + _subscription: Subscription, } pub struct ProjectSearchBar { @@ -316,11 +315,18 @@ impl View for ProjectSearchView { } }; - let semantic_status = self.semantic_state.as_ref().map(|semantic| { - if semantic.pending_file_count > 0 { - format!("Remaining files to index: {}", semantic.pending_file_count) - } else { - "Indexing complete".to_string() + let semantic_status = self.semantic_state.as_ref().and_then(|semantic| { + let status = semantic.index_status; + match status { + SemanticIndexStatus::Indexed => Some("Indexing complete".to_string()), + SemanticIndexStatus::Indexing { remaining_files } => { + if remaining_files == 0 { + Some(format!("Indexing...")) + } else { + Some(format!("Remaining files to index: {}", remaining_files)) + } + } + SemanticIndexStatus::NotIndexed => None, } }); @@ -637,41 +643,29 @@ impl ProjectSearchView { let project = self.model.read(cx).project.clone(); - let mut pending_file_count_rx = semantic_index.update(cx, |semantic_index, cx| { + semantic_index.update(cx, |semantic_index, cx| { semantic_index .index_project(project.clone(), cx) .detach_and_log_err(cx); - semantic_index.pending_file_count(&project).unwrap() }); - cx.spawn(|search_view, mut cx| async move { - search_view.update(&mut cx, |search_view, cx| { - cx.notify(); - let pending_file_count = *pending_file_count_rx.borrow(); - search_view.semantic_state = Some(SemanticSearchState { - pending_file_count, - _progress_task: cx.spawn(|search_view, mut cx| async move { - while let Some(count) = pending_file_count_rx.recv().await { - search_view - .update(&mut cx, |search_view, cx| { - if let Some(semantic_search_state) = - &mut search_view.semantic_state - { - semantic_search_state.pending_file_count = count; - cx.notify(); - if count == 0 { - return; - } - } - }) - .ok(); - } - }), - }); - })?; - anyhow::Ok(()) - }) - .detach_and_log_err(cx); + self.semantic_state = Some(SemanticState { + index_status: semantic_index.read(cx).status(&project), + _subscription: cx.observe(&semantic_index, Self::semantic_index_changed), + }); + cx.notify(); + } + } + + fn semantic_index_changed( + &mut self, + semantic_index: ModelHandle, + cx: &mut ViewContext, + ) { + let project = self.model.read(cx).project.clone(); + if let Some(semantic_state) = self.semantic_state.as_mut() { + semantic_state.index_status = semantic_index.read(cx).status(&project); + cx.notify(); } } diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs index ce8af3ba80..2ef409eb92 100644 --- a/crates/semantic_index/src/semantic_index.rs +++ b/crates/semantic_index/src/semantic_index.rs @@ -109,6 +109,13 @@ pub fn init( .detach(); } +#[derive(Copy, Clone, Debug)] +pub enum SemanticIndexStatus { + NotIndexed, + Indexed, + Indexing { remaining_files: usize }, +} + pub struct SemanticIndex { fs: Arc, db: VectorDatabase, @@ -124,7 +131,9 @@ struct ProjectState { worktrees: HashMap, pending_file_count_rx: watch::Receiver, pending_file_count_tx: Arc>>, + pending_index: usize, _subscription: gpui::Subscription, + _observe_pending_file_count: Task<()>, } enum WorktreeState { @@ -133,6 +142,10 @@ enum WorktreeState { } impl WorktreeState { + fn is_registered(&self) -> bool { + matches!(self, Self::Registered(_)) + } + fn paths_changed( &mut self, changes: Arc<[(Arc, ProjectEntryId, PathChange)]>, @@ -207,14 +220,25 @@ impl JobHandle { } impl ProjectState { - fn new(subscription: gpui::Subscription) -> Self { + fn new(subscription: gpui::Subscription, cx: &mut ModelContext) -> Self { let (pending_file_count_tx, pending_file_count_rx) = watch::channel_with(0); let pending_file_count_tx = Arc::new(Mutex::new(pending_file_count_tx)); Self { worktrees: Default::default(), - pending_file_count_rx, + pending_file_count_rx: pending_file_count_rx.clone(), pending_file_count_tx, + pending_index: 0, _subscription: subscription, + _observe_pending_file_count: cx.spawn_weak({ + let mut pending_file_count_rx = pending_file_count_rx.clone(); + |this, mut cx| async move { + while let Some(_) = pending_file_count_rx.next().await { + if let Some(this) = this.upgrade(&cx) { + this.update(&mut cx, |_, cx| cx.notify()); + } + } + } + }), } } @@ -257,6 +281,25 @@ impl SemanticIndex { && *RELEASE_CHANNEL != ReleaseChannel::Stable } + pub fn status(&self, project: &ModelHandle) -> SemanticIndexStatus { + if let Some(project_state) = self.projects.get(&project.downgrade()) { + if project_state + .worktrees + .values() + .all(|worktree| worktree.is_registered()) + && project_state.pending_index == 0 + { + SemanticIndexStatus::Indexed + } else { + SemanticIndexStatus::Indexing { + remaining_files: project_state.pending_file_count_rx.borrow().clone(), + } + } + } else { + SemanticIndexStatus::NotIndexed + } + } + async fn new( fs: Arc, database_path: PathBuf, @@ -800,13 +843,15 @@ impl SemanticIndex { } _ => {} }); - self.projects - .insert(project.downgrade(), ProjectState::new(subscription)); + let project_state = ProjectState::new(subscription, cx); + self.projects.insert(project.downgrade(), project_state); self.project_worktrees_changed(project.clone(), cx); } - let project_state = &self.projects[&project.downgrade()]; - let mut pending_file_count_rx = project_state.pending_file_count_rx.clone(); + let project_state = self.projects.get_mut(&project.downgrade()).unwrap(); + project_state.pending_index += 1; + cx.notify(); + let mut pending_file_count_rx = project_state.pending_file_count_rx.clone(); let db = self.db.clone(); let language_registry = self.language_registry.clone(); let parsing_files_tx = self.parsing_files_tx.clone(); @@ -917,6 +962,16 @@ impl SemanticIndex { }) .await; + this.update(&mut cx, |this, cx| { + let project_state = this + .projects + .get_mut(&project.downgrade()) + .ok_or_else(|| anyhow!("project was dropped"))?; + project_state.pending_index -= 1; + cx.notify(); + anyhow::Ok(()) + })?; + Ok(()) }) } From cf5d1d91a44e57010985ec5be103d5c992921c4d Mon Sep 17 00:00:00 2001 From: KCaverly Date: Thu, 7 Sep 2023 14:43:41 -0400 Subject: [PATCH 10/19] update semantic search to go to no results if search query is blank --- crates/semantic_index/src/semantic_index.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs index 2ef409eb92..0e18c42049 100644 --- a/crates/semantic_index/src/semantic_index.rs +++ b/crates/semantic_index/src/semantic_index.rs @@ -703,6 +703,10 @@ impl SemanticIndex { let database = VectorDatabase::new(fs.clone(), db_path.clone(), cx.background()).await?; + if phrase.len() == 0 { + return Ok(Vec::new()); + } + let phrase_embedding = embedding_provider .embed_batch(vec![phrase]) .await? From a6ce382368f1d1c9ef5cd615a4d82c5d06136c12 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 7 Sep 2023 14:50:36 -0400 Subject: [PATCH 11/19] Stop LiveKitBridge Package.resolved from constantly updating --- crates/live_kit_client/build.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/live_kit_client/build.rs b/crates/live_kit_client/build.rs index 3fa0e003e7..1445704b46 100644 --- a/crates/live_kit_client/build.rs +++ b/crates/live_kit_client/build.rs @@ -63,6 +63,7 @@ fn build_bridge(swift_target: &SwiftTarget) { let swift_target_folder = swift_target_folder(); if !Command::new("swift") .arg("build") + .arg("--disable-automatic-resolution") .args(["--configuration", &env::var("PROFILE").unwrap()]) .args(["--triple", &swift_target.target.triple]) .args(["--build-path".into(), swift_target_folder]) From 56d9a578bdaf46bf8c99a935d3e177c5d5831689 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 7 Sep 2023 12:50:08 -0700 Subject: [PATCH 12/19] Make toolbar horizontal padding more consistent * increase horizontal padding of toolbar itself, remove padding that was added to individual toolbar items like feedback button. * make feedback info text and breadcrumbs have the same additional padding as quick action buttons. --- crates/feedback/src/feedback_info_text.rs | 8 +++++--- styles/src/style_tree/feedback.ts | 15 +++++++++------ styles/src/style_tree/toolbar.ts | 10 +++++----- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/crates/feedback/src/feedback_info_text.rs b/crates/feedback/src/feedback_info_text.rs index 91ff22e904..bc0ee9ea36 100644 --- a/crates/feedback/src/feedback_info_text.rs +++ b/crates/feedback/src/feedback_info_text.rs @@ -42,14 +42,14 @@ impl View for FeedbackInfoText { ) .with_child( MouseEventHandler::new::(0, cx, |state, _| { - let contained_text = if state.hovered() { + let style = if state.hovered() { &theme.feedback.link_text_hover } else { &theme.feedback.link_text_default }; - - Label::new("community repo", contained_text.text.clone()) + Label::new("community repo", style.text.clone()) .contained() + .with_style(style.container) .aligned() .left() .clipped() @@ -64,6 +64,8 @@ impl View for FeedbackInfoText { .with_soft_wrap(false) .aligned(), ) + .contained() + .with_style(theme.feedback.info_text_default.container) .aligned() .left() .clipped() diff --git a/styles/src/style_tree/feedback.ts b/styles/src/style_tree/feedback.ts index 0349359533..4226db9753 100644 --- a/styles/src/style_tree/feedback.ts +++ b/styles/src/style_tree/feedback.ts @@ -12,9 +12,6 @@ export default function feedback(): any { background: background(theme.highest, "on"), corner_radius: 6, border: border(theme.highest, "on"), - margin: { - right: 4, - }, padding: { bottom: 2, left: 10, @@ -41,9 +38,15 @@ export default function feedback(): any { }, }), button_margin: 8, - info_text_default: text(theme.highest, "sans", "default", { - size: "xs", - }), + info_text_default: { + padding: { + left: 4, + right: 4, + }, + ...text(theme.highest, "sans", "default", { + size: "xs", + }) + }, link_text_default: text(theme.highest, "sans", "default", { size: "xs", underline: true, diff --git a/styles/src/style_tree/toolbar.ts b/styles/src/style_tree/toolbar.ts index adf8fb866f..8ec46d9f2a 100644 --- a/styles/src/style_tree/toolbar.ts +++ b/styles/src/style_tree/toolbar.ts @@ -2,14 +2,14 @@ import { useTheme } from "../common" import { toggleable_icon_button } from "../component/icon_button" import { interactive, toggleable } from "../element" import { background, border, foreground, text } from "./components" -import { text_button } from "../component"; +import { text_button } from "../component" export const toolbar = () => { const theme = useTheme() return { height: 42, - padding: { left: 4, right: 4 }, + padding: { left: 8, right: 8 }, background: background(theme.highest), border: border(theme.highest, { bottom: true }), item_spacing: 4, @@ -24,9 +24,9 @@ export const toolbar = () => { ...text(theme.highest, "sans", "variant"), corner_radius: 6, padding: { - left: 6, - right: 6, - }, + left: 4, + right: 4, + } }, state: { hovered: { From 4e818fed4a68402bb4040262c2f4e253f7f5f456 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 8 Sep 2023 11:20:49 +0200 Subject: [PATCH 13/19] Make channel notes act as an editor to enable inline assistant --- crates/collab_ui/src/channel_view.rs | 17 ++++++++++++++++- crates/workspace/src/item.rs | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/crates/collab_ui/src/channel_view.rs b/crates/collab_ui/src/channel_view.rs index 5086cc8b37..a09073c55d 100644 --- a/crates/collab_ui/src/channel_view.rs +++ b/crates/collab_ui/src/channel_view.rs @@ -15,7 +15,7 @@ use gpui::{ ViewContext, ViewHandle, }; use project::Project; -use std::any::Any; +use std::any::{Any, TypeId}; use workspace::{ item::{FollowableItem, Item, ItemHandle}, register_followable_item, @@ -189,6 +189,21 @@ impl View for ChannelView { } impl Item for ChannelView { + fn act_as_type<'a>( + &'a self, + type_id: TypeId, + self_handle: &'a ViewHandle, + _: &'a AppContext, + ) -> Option<&'a AnyViewHandle> { + if type_id == TypeId::of::() { + Some(self_handle) + } else if type_id == TypeId::of::() { + Some(&self.editor) + } else { + None + } + } + fn tab_content( &self, _: Option, diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs index c218a85234..4e24c831f4 100644 --- a/crates/workspace/src/item.rs +++ b/crates/workspace/src/item.rs @@ -171,6 +171,7 @@ pub trait Item: View { None } } + fn as_searchable(&self, _: &ViewHandle) -> Option> { None } From ddc8a126da3369b59414727307d0e635bdb4b3f8 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 8 Sep 2023 12:50:59 +0200 Subject: [PATCH 14/19] Find keystrokes defined on a child but handled by a parent This fixes a bug that was preventing keystrokes from being shown on tooltips for the "Buffer Search" and "Inline Assist" buttons in the toolbar. This commit makes the behavior of `keystrokes_for_action` more consistent with the behavior of `available_actions`. It seems reasonable that, if a child view defines a keystroke for an action and that action is handled on a parent, we should show the child's keystroke. --- crates/gpui/src/app.rs | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs index 890bd55a7f..77674581dc 100644 --- a/crates/gpui/src/app.rs +++ b/crates/gpui/src/app.rs @@ -3513,14 +3513,12 @@ impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> { handler_depth = Some(contexts.len()) } - let action_contexts = if let Some(depth) = handler_depth { - &contexts[depth..] - } else { - &contexts - }; - - self.keystroke_matcher - .keystrokes_for_action(action, action_contexts) + let handler_depth = handler_depth.unwrap_or(0); + (0..=handler_depth).find_map(|depth| { + let contexts = &contexts[depth..]; + self.keystroke_matcher + .keystrokes_for_action(action, contexts) + }) } fn notify_if_view_ancestors_change(&mut self, view_id: usize) { @@ -6499,7 +6497,7 @@ mod tests { #[crate::test(self)] fn test_keystrokes_for_action(cx: &mut TestAppContext) { - actions!(test, [Action1, Action2, GlobalAction]); + actions!(test, [Action1, Action2, Action3, GlobalAction]); struct View1 { child: ViewHandle, @@ -6542,12 +6540,14 @@ mod tests { cx.update(|cx| { cx.add_action(|_: &mut View1, _: &Action1, _cx| {}); + cx.add_action(|_: &mut View1, _: &Action3, _cx| {}); cx.add_action(|_: &mut View2, _: &Action2, _cx| {}); cx.add_global_action(|_: &GlobalAction, _| {}); cx.add_bindings(vec![ Binding::new("a", Action1, Some("View1")), Binding::new("b", Action2, Some("View1 > View2")), - Binding::new("c", GlobalAction, Some("View3")), // View 3 does not exist + Binding::new("c", Action3, Some("View2")), + Binding::new("d", GlobalAction, Some("View3")), // View 3 does not exist ]); }); @@ -6577,6 +6577,14 @@ mod tests { .as_slice(), &[Keystroke::parse("b").unwrap()] ); + assert_eq!(layout_cx.keystrokes_for_action(view_1.id(), &Action3), None); + assert_eq!( + layout_cx + .keystrokes_for_action(view_2.id(), &Action3) + .unwrap() + .as_slice(), + &[Keystroke::parse("c").unwrap()] + ); // The 'a' keystroke propagates up the view tree from view_2 // to view_1. The action, Action1, is handled by view_1. @@ -6604,7 +6612,8 @@ mod tests { &available_actions(window.into(), view_1.id(), cx), &[ ("test::Action1", vec![Keystroke::parse("a").unwrap()]), - ("test::GlobalAction", vec![]) + ("test::Action3", vec![]), + ("test::GlobalAction", vec![]), ], ); @@ -6614,6 +6623,7 @@ mod tests { &[ ("test::Action1", vec![Keystroke::parse("a").unwrap()]), ("test::Action2", vec![Keystroke::parse("b").unwrap()]), + ("test::Action3", vec![Keystroke::parse("c").unwrap()]), ("test::GlobalAction", vec![]), ], ); From 74ccb3df637a7ba7228e2eb30266d97e40eae0c7 Mon Sep 17 00:00:00 2001 From: Julia Date: Fri, 8 Sep 2023 12:09:31 -0400 Subject: [PATCH 15/19] Fix Python's cached binary retrieval being borked Co-Authored-By: Max Brunsfeld --- crates/zed/src/languages/python.rs | 38 +++++++++--------------------- crates/zed/src/languages/rust.rs | 1 + 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/crates/zed/src/languages/python.rs b/crates/zed/src/languages/python.rs index c1539e9590..c10d605a38 100644 --- a/crates/zed/src/languages/python.rs +++ b/crates/zed/src/languages/python.rs @@ -1,6 +1,5 @@ -use anyhow::{anyhow, Result}; +use anyhow::Result; use async_trait::async_trait; -use futures::StreamExt; use language::{LanguageServerName, LspAdapter, LspAdapterDelegate}; use lsp::LanguageServerBinary; use node_runtime::NodeRuntime; @@ -164,31 +163,16 @@ async fn get_cached_server_binary( container_dir: PathBuf, node: &dyn NodeRuntime, ) -> Option { - (|| async move { - let mut last_version_dir = None; - let mut entries = fs::read_dir(&container_dir).await?; - while let Some(entry) = entries.next().await { - let entry = entry?; - if entry.file_type().await?.is_dir() { - last_version_dir = Some(entry.path()); - } - } - let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?; - let server_path = last_version_dir.join(SERVER_PATH); - if server_path.exists() { - Ok(LanguageServerBinary { - path: node.binary_path().await?, - arguments: server_binary_arguments(&server_path), - }) - } else { - Err(anyhow!( - "missing executable in directory {:?}", - last_version_dir - )) - } - })() - .await - .log_err() + let server_path = container_dir.join(SERVER_PATH); + if server_path.exists() { + Some(LanguageServerBinary { + path: node.binary_path().await.log_err()?, + arguments: server_binary_arguments(&server_path), + }) + } else { + log::error!("missing executable in directory {:?}", server_path); + None + } } #[cfg(test)] diff --git a/crates/zed/src/languages/rust.rs b/crates/zed/src/languages/rust.rs index 854eeb7e08..62bdddab5b 100644 --- a/crates/zed/src/languages/rust.rs +++ b/crates/zed/src/languages/rust.rs @@ -262,6 +262,7 @@ impl LspAdapter for RustLspAdapter { }) } } + async fn get_cached_server_binary(container_dir: PathBuf) -> Option { (|| async move { let mut last = None; From 5f897f45a883b1fb4e0bf0840e74de56136e1505 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Thu, 7 Sep 2023 10:42:47 -0600 Subject: [PATCH 16/19] Fix f,t on soft-wrapped lines Also remove the (dangerously confusing) display_map.find_while --- crates/editor/src/display_map.rs | 89 +----------------- crates/vim/src/motion.rs | 95 +++++++++++--------- crates/vim/src/normal.rs | 1 + crates/vim/src/test.rs | 7 ++ crates/vim/src/vim.rs | 10 ++- crates/vim/test_data/test_wrapped_lines.json | 6 ++ 6 files changed, 76 insertions(+), 132 deletions(-) diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index e8e15a927e..f306692b5e 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -555,67 +555,6 @@ impl DisplaySnapshot { }) } - /// Returns an iterator of the start positions of the occurrences of `target` in the `self` after `from` - /// Stops if `condition` returns false for any of the character position pairs observed. - pub fn find_while<'a>( - &'a self, - from: DisplayPoint, - target: &str, - condition: impl FnMut(char, DisplayPoint) -> bool + 'a, - ) -> impl Iterator + 'a { - Self::find_internal(self.chars_at(from), target.chars().collect(), condition) - } - - /// Returns an iterator of the end positions of the occurrences of `target` in the `self` before `from` - /// Stops if `condition` returns false for any of the character position pairs observed. - pub fn reverse_find_while<'a>( - &'a self, - from: DisplayPoint, - target: &str, - condition: impl FnMut(char, DisplayPoint) -> bool + 'a, - ) -> impl Iterator + 'a { - Self::find_internal( - self.reverse_chars_at(from), - target.chars().rev().collect(), - condition, - ) - } - - fn find_internal<'a>( - iterator: impl Iterator + 'a, - target: Vec, - mut condition: impl FnMut(char, DisplayPoint) -> bool + 'a, - ) -> impl Iterator + 'a { - // List of partial matches with the index of the last seen character in target and the starting point of the match - let mut partial_matches: Vec<(usize, DisplayPoint)> = Vec::new(); - iterator - .take_while(move |(ch, point)| condition(*ch, *point)) - .filter_map(move |(ch, point)| { - if Some(&ch) == target.get(0) { - partial_matches.push((0, point)); - } - - let mut found = None; - // Keep partial matches that have the correct next character - partial_matches.retain_mut(|(match_position, match_start)| { - if target.get(*match_position) == Some(&ch) { - *match_position += 1; - if *match_position == target.len() { - found = Some(match_start.clone()); - // This match is completed. No need to keep tracking it - false - } else { - true - } - } else { - false - } - }); - - found - }) - } - pub fn column_to_chars(&self, display_row: u32, target: u32) -> u32 { let mut count = 0; let mut column = 0; @@ -933,7 +872,7 @@ pub mod tests { use smol::stream::StreamExt; use std::{env, sync::Arc}; use theme::SyntaxTheme; - use util::test::{marked_text_offsets, marked_text_ranges, sample_text}; + use util::test::{marked_text_ranges, sample_text}; use Bias::*; #[gpui::test(iterations = 100)] @@ -1744,32 +1683,6 @@ pub mod tests { ) } - #[test] - fn test_find_internal() { - assert("This is a ˇtest of find internal", "test"); - assert("Some text ˇaˇaˇaa with repeated characters", "aa"); - - fn assert(marked_text: &str, target: &str) { - let (text, expected_offsets) = marked_text_offsets(marked_text); - - let chars = text - .chars() - .enumerate() - .map(|(index, ch)| (ch, DisplayPoint::new(0, index as u32))); - let target = target.chars(); - - assert_eq!( - expected_offsets - .into_iter() - .map(|offset| offset as u32) - .collect::>(), - DisplaySnapshot::find_internal(chars, target.collect(), |_, _| true) - .map(|point| point.column()) - .collect::>() - ) - } - } - fn syntax_chunks<'a>( rows: Range, map: &ModelHandle, diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs index 16bccb6963..6d83642648 100644 --- a/crates/vim/src/motion.rs +++ b/crates/vim/src/motion.rs @@ -1,9 +1,9 @@ -use std::{cmp, sync::Arc}; +use std::cmp; use editor::{ char_kind, display_map::{DisplaySnapshot, FoldPoint, ToDisplayPoint}, - movement::{self, FindRange}, + movement::{self, find_boundary, find_preceding_boundary, FindRange}, Bias, CharKind, DisplayPoint, ToOffset, }; use gpui::{actions, impl_actions, AppContext, WindowContext}; @@ -37,8 +37,8 @@ pub enum Motion { StartOfDocument, EndOfDocument, Matching, - FindForward { before: bool, text: Arc }, - FindBackward { after: bool, text: Arc }, + FindForward { before: bool, char: char }, + FindBackward { after: bool, char: char }, NextLineStart, } @@ -233,25 +233,25 @@ pub(crate) fn motion(motion: Motion, cx: &mut WindowContext) { fn repeat_motion(backwards: bool, cx: &mut WindowContext) { let find = match Vim::read(cx).workspace_state.last_find.clone() { - Some(Motion::FindForward { before, text }) => { + Some(Motion::FindForward { before, char }) => { if backwards { Motion::FindBackward { after: before, - text, + char, } } else { - Motion::FindForward { before, text } + Motion::FindForward { before, char } } } - Some(Motion::FindBackward { after, text }) => { + Some(Motion::FindBackward { after, char }) => { if backwards { Motion::FindForward { before: after, - text, + char, } } else { - Motion::FindBackward { after, text } + Motion::FindBackward { after, char } } } _ => return, @@ -403,12 +403,12 @@ impl Motion { SelectionGoal::None, ), Matching => (matching(map, point), SelectionGoal::None), - FindForward { before, text } => ( - find_forward(map, point, *before, text.clone(), times), + FindForward { before, char } => ( + find_forward(map, point, *before, *char, times), SelectionGoal::None, ), - FindBackward { after, text } => ( - find_backward(map, point, *after, text.clone(), times), + FindBackward { after, char } => ( + find_backward(map, point, *after, *char, times), SelectionGoal::None, ), NextLineStart => (next_line_start(map, point, times), SelectionGoal::None), @@ -793,44 +793,55 @@ fn find_forward( map: &DisplaySnapshot, from: DisplayPoint, before: bool, - target: Arc, + target: char, times: usize, ) -> DisplayPoint { - map.find_while(from, target.as_ref(), |ch, _| ch != '\n') - .skip_while(|found_at| found_at == &from) - .nth(times - 1) - .map(|mut found| { - if before { - *found.column_mut() -= 1; - found = map.clip_point(found, Bias::Right); - found - } else { - found - } - }) - .unwrap_or(from) + let mut to = from; + let mut found = false; + + for _ in 0..times { + found = false; + to = find_boundary(map, to, FindRange::SingleLine, |_, right| { + found = right == target; + found + }); + } + + if found { + if before && to.column() > 0 { + *to.column_mut() -= 1; + map.clip_point(to, Bias::Left) + } else { + to + } + } else { + from + } } fn find_backward( map: &DisplaySnapshot, from: DisplayPoint, after: bool, - target: Arc, + target: char, times: usize, ) -> DisplayPoint { - map.reverse_find_while(from, target.as_ref(), |ch, _| ch != '\n') - .skip_while(|found_at| found_at == &from) - .nth(times - 1) - .map(|mut found| { - if after { - *found.column_mut() += 1; - found = map.clip_point(found, Bias::Left); - found - } else { - found - } - }) - .unwrap_or(from) + let mut to = from; + + for _ in 0..times { + to = find_preceding_boundary(map, to, FindRange::SingleLine, |_, right| right == target); + } + + if map.buffer_snapshot.chars_at(to.to_point(map)).next() == Some(target) { + if after { + *to.column_mut() += 1; + map.clip_point(to, Bias::Right) + } else { + to + } + } else { + from + } } fn next_line_start(map: &DisplaySnapshot, point: DisplayPoint, times: usize) -> DisplayPoint { diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs index ce1e4c3d6d..e452fb65ae 100644 --- a/crates/vim/src/normal.rs +++ b/crates/vim/src/normal.rs @@ -780,6 +780,7 @@ mod test { #[gpui::test] async fn test_f_and_t(cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; + for count in 1..=3 { let test_case = indoc! {" ˇaaaˇbˇ ˇbˇ ˇbˇbˇ aˇaaˇbaaa diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs index c6a212d77f..54bbe6c56e 100644 --- a/crates/vim/src/test.rs +++ b/crates/vim/src/test.rs @@ -449,6 +449,13 @@ async fn test_wrapped_lines(cx: &mut gpui::TestAppContext) { fourteen char "}) .await; + cx.simulate_shared_keystrokes(["j", "shift-f", "e", "f", "r"]) + .await; + cx.assert_shared_state(indoc! {" + fourteen• + fourteen chaˇr + "}) + .await; } #[gpui::test] diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs index da1c634682..be3d04d3ee 100644 --- a/crates/vim/src/vim.rs +++ b/crates/vim/src/vim.rs @@ -295,14 +295,20 @@ impl Vim { match Vim::read(cx).active_operator() { Some(Operator::FindForward { before }) => { - let find = Motion::FindForward { before, text }; + let find = Motion::FindForward { + before, + char: text.chars().next().unwrap(), + }; Vim::update(cx, |vim, _| { vim.workspace_state.last_find = Some(find.clone()) }); motion::motion(find, cx) } Some(Operator::FindBackward { after }) => { - let find = Motion::FindBackward { after, text }; + let find = Motion::FindBackward { + after, + char: text.chars().next().unwrap(), + }; Vim::update(cx, |vim, _| { vim.workspace_state.last_find = Some(find.clone()) }); diff --git a/crates/vim/test_data/test_wrapped_lines.json b/crates/vim/test_data/test_wrapped_lines.json index 1fbfc935d9..e5b5d0eac0 100644 --- a/crates/vim/test_data/test_wrapped_lines.json +++ b/crates/vim/test_data/test_wrapped_lines.json @@ -53,3 +53,9 @@ {"Key":"i"} {"Key":"w"} {"Get":{"state":"fourteenˇ \nfourteen char\n","mode":"Normal"}} +{"Key":"j"} +{"Key":"shift-f"} +{"Key":"e"} +{"Key":"f"} +{"Key":"r"} +{"Get":{"state":"fourteen \nfourteen chaˇr\n","mode":"Normal"}} From f4a9d3f26979335cb65710f2340a9e554f2a4622 Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Fri, 8 Sep 2023 12:41:32 -0400 Subject: [PATCH 17/19] Add tooltip to language selector --- crates/language_selector/src/active_buffer_language.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/language_selector/src/active_buffer_language.rs b/crates/language_selector/src/active_buffer_language.rs index 5ffcb13fba..01333c1ffb 100644 --- a/crates/language_selector/src/active_buffer_language.rs +++ b/crates/language_selector/src/active_buffer_language.rs @@ -52,6 +52,7 @@ impl View for ActiveBufferLanguage { } else { "Unknown".to_string() }; + let theme = theme::current(cx).clone(); MouseEventHandler::new::(0, cx, |state, cx| { let theme = &theme::current(cx).workspace.status_bar; @@ -68,6 +69,7 @@ impl View for ActiveBufferLanguage { }); } }) + .with_tooltip::(0, "Select Language", None, theme.tooltip.clone(), cx) .into_any() } else { Empty::new().into_any() From a0701777d5b2d8762c5f84ff29d6a19e0f16e3b3 Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Fri, 8 Sep 2023 12:44:49 -0400 Subject: [PATCH 18/19] Make tooltip title case to match other tooltips --- crates/collab_ui/src/collab_titlebar_item.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 95b9868937..6c34b7021e 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -771,7 +771,7 @@ impl CollabTitlebarItem { }) .with_tooltip::( 0, - "Toggle user menu".to_owned(), + "Toggle User Menu".to_owned(), Some(Box::new(ToggleUserMenu)), tooltip, cx, From 88dae22e3eedbc1b6c42209b5a985705345cfbed Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Fri, 8 Sep 2023 10:56:26 -0600 Subject: [PATCH 19/19] Don't replay ShowCharacterPalette --- crates/vim/src/normal/repeat.rs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs index a291419413..1a7c789aad 100644 --- a/crates/vim/src/normal/repeat.rs +++ b/crates/vim/src/normal/repeat.rs @@ -4,11 +4,19 @@ use crate::{ visual::visual_motion, Vim, }; -use gpui::{actions, AppContext}; +use gpui::{actions, Action, AppContext}; use workspace::Workspace; actions!(vim, [Repeat, EndRepeat,]); +fn should_replay(action: &Box) -> bool { + // skip so that we don't leave the character palette open + if editor::ShowCharacterPalette.id() == action.id() { + return false; + } + true +} + pub(crate) fn init(cx: &mut AppContext) { cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| { Vim::update(cx, |vim, cx| { @@ -118,9 +126,15 @@ pub(crate) fn init(cx: &mut AppContext) { .spawn(move |mut cx| async move { for action in actions { match action { - ReplayableAction::Action(action) => window - .dispatch_action(editor.id(), action.as_ref(), &mut cx) - .ok_or_else(|| anyhow::anyhow!("window was closed")), + ReplayableAction::Action(action) => { + if should_replay(&action) { + window + .dispatch_action(editor.id(), action.as_ref(), &mut cx) + .ok_or_else(|| anyhow::anyhow!("window was closed")) + } else { + Ok(()) + } + } ReplayableAction::Insertion { text, utf16_range_to_replace,