Improve goto_file_impl

helix-term/Cargo.toml

@@ -71,7 +71,10 @@ serde = { version = "1.0", features = ["derive"] }
 grep-regex = "0.1.12"
 grep-searcher = "0.1.13"
 
-[target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
+# expand env-variables in paths
+shellexpand = "3.1"
+
+[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
 libc = "0.2.150"
 

helix-term/src/commands.rs

@@ -1176,25 +1176,55 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
     let primary = selections.primary();
     // Checks whether there is only one selection with a width of 1
     if selections.len() == 1 && primary.len() == 1 {
-        let count = cx.count();
-        let text_slice = text.slice(..);
-        // In this case it selects the WORD under the cursor
-        let current_word = textobject::textobject_word(
-            text_slice,
-            primary,
-            textobject::TextObject::Inside,
-            count,
-            true,
-        );
-        // Trims some surrounding chars so that the actual file is opened.
-        let surrounding_chars: &[_] = &['\'', '"', '(', ')'];
         paths.clear();
-        paths.push(
-            current_word
-                .fragment(text_slice)
-                .trim_matches(surrounding_chars)
-                .to_string(),
-        );
+
+        let is_valid_path_char = |c: &char| {
+            let valid_chars: &[char] = if cfg!(target_os = "windows") {
+                &[
+                    '@', '/', '\\', '.', '-', '_', '+', '#', '$', '%', '{', '}', '[', ']', ':',
+                    '!', '~', '=',
+                ]
+            } else {
+                &['@', '/', '.', '-', '_', '+', '#', '$', '%', '~', '=']
+            };
+            valid_chars.contains(c) || c.is_alphabetic()
+        };
+
+        let path = {
+            let start = {
+                let cursor_pos = primary.cursor(text.slice(..));
+
+                let pre_cursor_pos = cursor_pos.saturating_sub(1);
+                let post_cursor_pos = cursor_pos.saturating_add(1);
+
+                if is_valid_path_char(&text.char(cursor_pos)) {
+                    text.chars_at(cursor_pos)
+                } else if is_valid_path_char(&text.char(pre_cursor_pos)) {
+                    text.chars_at(pre_cursor_pos)
+                } else {
+                    text.chars_at(post_cursor_pos)
+                }
+            };
+
+            let head = start
+                .clone()
+                .reversed()
+                .take_while(is_valid_path_char)
+                .collect::<String>()
+                .chars()
+                .rev()
+                .collect::<String>();
+
+            let tail = start.take_while(is_valid_path_char).collect::<String>();
+
+            format!("{}{}", head, tail)
+        };
+        log::debug!("Goto file path: {}", path);
+
+        match shellexpand::full(&path) {
+            Ok(path) => paths.push(path.to_string()),
+            Err(e) => cx.editor.set_error(format!("{}", e)),
+        };
     }
 
     for sel in paths {

helix-term/tests/test/commands.rs

@@ -153,6 +153,17 @@ async fn test_goto_file_impl() -> anyhow::Result<()> {
     )
     .await?;
 
+    // ';' is behind the path
+    test_key_sequence(
+        &mut AppBuilder::new().with_file(file.path(), None).build()?,
+        Some("iimport 'one.js';<esc>B;gf"),
+        Some(&|app| {
+            assert_eq!(1, match_paths(app, vec!["one.js"]));
+        }),
+        false,
+    )
+    .await?;
+
     Ok(())
 }