andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

Merge ea98f84098 into b8313da5a8

Browse Source
This commit is contained in:
emilylime 2024-11-20 17:56:42 -06:00 committed by GitHub
commit d74ca8559c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
helix-term/src/commands.rs
View File

@ -1265,15 +1265,14 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
let (view, doc) = current_ref!(cx.editor); let (view, doc) = current_ref!(cx.editor);
let text = doc.text(); let text = doc.text();
let selections = doc.selection(view.id); let selections = doc.selection(view.id);
let primary = selections.primary();
let rel_path = doc let rel_path = doc
.relative_path() .relative_path()
.map(|path| path.parent().unwrap().to_path_buf()) .map(|path| path.parent().unwrap().to_path_buf())
.unwrap_or_default(); .unwrap_or_default();
let paths: Vec<_> = if selections.len() == 1 && primary.len() == 1 { let paths: Vec<_> = if selections.iter().all(|r| r.len() == 1) {
// Secial case: if there is only one one-width selection, try to detect the // Secial case: if all selections are only one-wide, try to detect the path under the
// path under the cursor. // cursor.
let is_valid_path_char = |c: &char| { let is_valid_path_char = |c: &char| {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let valid_chars = &[ let valid_chars = &[
@ -1286,7 +1285,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
valid_chars.contains(c) || c.is_alphabetic() || c.is_numeric() valid_chars.contains(c) || c.is_alphabetic() || c.is_numeric()
}; };
let cursor_pos = primary.cursor(text.slice(..)); selections
.iter()
.map(|sel| {
let cursor_pos = sel.cursor(text.slice(..));
let pre_cursor_pos = cursor_pos.saturating_sub(1); let pre_cursor_pos = cursor_pos.saturating_sub(1);
let post_cursor_pos = cursor_pos + 1; let post_cursor_pos = cursor_pos + 1;
let start_pos = if is_valid_path_char(&text.char(cursor_pos)) { let start_pos = if is_valid_path_char(&text.char(cursor_pos)) {
@ -1311,9 +1313,11 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
let path: String = text let path: String = text
.slice((start_pos - prefix_len)..(start_pos + postfix_len)) .slice((start_pos - prefix_len)..(start_pos + postfix_len))
.into(); .into();
log::debug!("goto_file auto-detected path: {}", path);
vec![path] log::debug!("goto_file auto-detected path: {}", path);
path
})
.collect()
} else { } else {
// Otherwise use each selection, trimmed. // Otherwise use each selection, trimmed.
selections selections