mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 11:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add path completion for multiple cursors (#12550)

Browse source
This commit is contained in:
TornaxO7 2025-01-23 21:31:12 +01:00 • committed by GitHub
parent 8986f8b953
commit fa27ae16a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
helix-term/src/handlers/completion.rs
View file

@ -184,7 +184,8 @@ fn request_completion(
} }
let text = doc.text(); let text = doc.text();
let cursor = doc.selection(view.id).primary().cursor(text.slice(..)); let selection = doc.selection(view.id);
let cursor = selection.primary().cursor(text.slice(..));
if trigger.view != view.id || trigger.doc != doc.id() || cursor < trigger.pos { if trigger.view != view.id || trigger.doc != doc.id() || cursor < trigger.pos {
return; return;
} }
@ -265,7 +266,7 @@ fn request_completion(
} }
.boxed() .boxed()
}) })
.chain(path_completion(cursor, text.clone(), doc, handle.clone())) .chain(path_completion(selection.clone(), doc, handle.clone()))
.collect(); .collect();
let future = async move { let future = async move {

16
helix-term/src/handlers/completion/path.rs
View file

@ -6,8 +6,7 @@ use std::{
}; };
use futures_util::{future::BoxFuture, FutureExt as _}; use futures_util::{future::BoxFuture, FutureExt as _};
use helix_core as core; use helix_core::{self as core, Selection, Transaction};
use helix_core::Transaction;
use helix_event::TaskHandle; use helix_event::TaskHandle;
use helix_stdx::path::{self, canonicalize, fold_home_dir, get_path_suffix}; use helix_stdx::path::{self, canonicalize, fold_home_dir, get_path_suffix};
use helix_view::Document; use helix_view::Document;
@ -16,8 +15,7 @@ use url::Url;
use super::item::CompletionItem; use super::item::CompletionItem;
pub(crate) fn path_completion( pub(crate) fn path_completion(
cursor: usize, selection: Selection,
text: core::Rope,
doc: &Document, doc: &Document,
handle: TaskHandle, handle: TaskHandle,
) -> Option<BoxFuture<'static, anyhow::Result<Vec<CompletionItem>>>> { ) -> Option<BoxFuture<'static, anyhow::Result<Vec<CompletionItem>>>> {
@ -25,6 +23,8 @@ pub(crate) fn path_completion(
return None; return None;
} }
let text = doc.text().clone();
let cursor = selection.primary().cursor(text.slice(..));
let cur_line = text.char_to_line(cursor); let cur_line = text.char_to_line(cursor);
let start = text.line_to_char(cur_line).max(cursor.saturating_sub(1000)); let start = text.line_to_char(cur_line).max(cursor.saturating_sub(1000));
let line_until_cursor = text.slice(start..cursor); let line_until_cursor = text.slice(start..cursor);
@ -93,10 +93,10 @@ pub(crate) fn path_completion(
.map(|f| f.len()) .map(|f| f.len())
.unwrap_or_default(); .unwrap_or_default();
let transaction = Transaction::change( let transaction = Transaction::change_by_selection(&text, &selection, |range| {
&text, let cursor = range.cursor(text.slice(..));
std::iter::once((cursor - edit_diff, cursor, Some((&file_name).into()))), (cursor - edit_diff, cursor, Some((&file_name).into()))
); });
Some(CompletionItem::Other(core::CompletionItem { Some(CompletionItem::Other(core::CompletionItem {
kind: Cow::Borrowed(kind), kind: Cow::Borrowed(kind),