Fix for windows

VAWVAW · VAWVAW · commit 65d6f3c72638 · 2025-09-21T22:57:45.000+02:00
diff --git a/crates/modalkit/src/editing/buffer/complete.rs b/crates/modalkit/src/editing/buffer/complete.rs
@@ -427,6 +427,21 @@ mod tests {
 
     #[test]
     fn test_complete_file() {
+        fn escape(input: &str) -> Cow<'_, str> {
+            if MAIN_SEPARATOR != '\\' {
+                Cow::Borrowed(input)
+            } else {
+                Cow::Owned(input.replace('\\', "\\\\"))
+            }
+        }
+        fn unescape(input: &str) -> Cow<'_, str> {
+            if MAIN_SEPARATOR != '\\' {
+                Cow::Borrowed(input)
+            } else {
+                Cow::Owned(input.replace("\\\\", "\\"))
+            }
+        }
+
         // First, create temporary and files to complete.
         let tmp = TempDir::new().unwrap();
         let file1 = tmp.child("file1");
@@ -442,13 +457,17 @@ mod tests {
         let file2 = file2.to_string_lossy();
         let hidden = hidden.to_string_lossy();
         let mut cur_dir = path.clone().into_owned();
-        cur_dir.push_str("/./");
+        cur_dir.push(MAIN_SEPARATOR);
+        cur_dir.push('.');
+        cur_dir.push(MAIN_SEPARATOR);
         let mut parent = path.clone().into_owned();
-        parent.push_str("/../");
+        parent.push(MAIN_SEPARATOR);
+        parent.push_str("..");
+        parent.push(MAIN_SEPARATOR);
         let next = MoveDir1D::Next;
 
         // create buffer with path to temporary directory.
-        let (mut ebuf, gid, vwctx, mut vctx, mut store) = mkfivestr(path.as_ref());
+        let (mut ebuf, gid, vwctx, mut vctx, mut store) = mkfivestr(escape(path.as_ref()).as_ref());
         vctx.persist.insert = Some(InsertStyle::Insert);
 
         // Move to end of line.
@@ -459,6 +478,9 @@ mod tests {
 
         // Type path separator.
         type_char!(ebuf, MAIN_SEPARATOR, gid, vwctx, vctx, store);
+        if MAIN_SEPARATOR == '\\' {
+            type_char!(ebuf, MAIN_SEPARATOR, gid, vwctx, vctx, store);
+        }
 
         // First, complete to file1.
         ebuf.complete_file(
@@ -468,7 +490,7 @@ mod tests {
             &mut store,
         )
         .unwrap();
-        assert_eq!(ebuf.get_text().trim_end(), file1);
+        assert_eq!(unescape(ebuf.get_text().trim_end()), file1);
 
         // Then complete to file2.
         ebuf.complete_file(
@@ -478,7 +500,7 @@ mod tests {
             &mut store,
         )
         .unwrap();
-        assert_eq!(ebuf.get_text().trim_end(), file2);
+        assert_eq!(unescape(ebuf.get_text().trim_end()), file2);
 
         // Then return to parent.
         ebuf.complete_file(
@@ -489,6 +511,7 @@ mod tests {
         )
         .unwrap();
         let result = ebuf.get_text();
+        let result = unescape(&result);
         let result = Path::new(result.trim_end());
         assert_eq!(result, tmp.path());
 
@@ -506,7 +529,7 @@ mod tests {
             &mut store,
         )
         .unwrap();
-        assert_eq!(ebuf.get_text().trim_end(), &cur_dir);
+        assert_eq!(unescape(ebuf.get_text().trim_end()).as_ref(), &cur_dir);
 
         // Complete to "../".
         ebuf.complete_file(
@@ -516,7 +539,7 @@ mod tests {
             &mut store,
         )
         .unwrap();
-        assert_eq!(ebuf.get_text().trim_end(), &parent);
+        assert_eq!(unescape(ebuf.get_text().trim_end()).as_ref(), &parent);
 
         // Complete to ".hidden".
         ebuf.complete_file(
@@ -526,7 +549,7 @@ mod tests {
             &mut store,
         )
         .unwrap();
-        assert_eq!(ebuf.get_text().trim_end(), hidden);
+        assert_eq!(unescape(ebuf.get_text().trim_end()), hidden);
 
         // Return to parent.
         ebuf.complete_file(
@@ -537,6 +560,7 @@ mod tests {
         )
         .unwrap();
         let result = ebuf.get_text();
+        let result = unescape(&result);
         let result = Path::new(result.trim_end());
         assert_eq!(result, tmp.path());
 
@@ -554,7 +578,7 @@ mod tests {
             &mut store,
         )
         .unwrap();
-        assert_eq!(ebuf.get_text().trim_end(), hidden);
+        assert_eq!(unescape(ebuf.get_text().trim_end()), hidden);
     }
 
     #[test]
diff --git a/crates/modalkit/src/editing/buffer/mod.rs b/crates/modalkit/src/editing/buffer/mod.rs
@@ -1434,7 +1434,6 @@ where
 mod tests {
     pub use super::*;
     pub use crate::editing::application::EmptyInfo;
-    pub use crate::editing::context::EditContextBuilder;
     pub use crate::editing::store::{RegisterCell, RegisterPutFlags, Store};
     pub use crate::env::vim::VimState;
     pub use crate::prelude::TargetShape::{BlockWise, CharWise, LineWise};
diff --git a/crates/modalkit/src/editing/completion.rs b/crates/modalkit/src/editing/completion.rs
@@ -353,7 +353,7 @@ impl LineCompleter {
 }
 
 mod parse {
-    use std::borrow::Cow;
+    use std::{borrow::Cow, path::MAIN_SEPARATOR};
 
     use nom::{
         branch::alt,
@@ -412,6 +412,25 @@ mod parse {
 
         filepath_at_end(prefix.as_ref()).ok().map(|(_, path)| path)
     }
+
+    pub fn escape_string(input: &mut String) {
+        for c in ["\\\\", "\\ ", "\\#", "\\%", "\\|", "\\\""] {
+            if input.contains(&c[1..2]) {
+                *input = input.replace(&c[1..2], c);
+            }
+        }
+    }
+
+    pub fn trailing_filename(input: &str) -> &str {
+        let start = input.rfind(MAIN_SEPARATOR).map(|s| s + 1).unwrap_or(0);
+        &input[start..]
+    }
+
+    pub fn trailing_filename_escaped(input: &str) -> String {
+        let mut name = trailing_filename(input).to_string();
+        escape_string(&mut name);
+        name
+    }
 }
 
 /// Complete filenames within a path leading up to the cursor.
@@ -430,7 +449,7 @@ pub fn complete_path(input: &EditRope, cursor: &mut Cursor) -> Vec<String> {
     }
 
     if filepath.is_empty() {
-        filepath = Cow::Borrowed("./");
+        filepath = format!(".{MAIN_SEPARATOR}").into();
     }
 
     let mut res = Vec::<String>::with_capacity(MAX_COMPLETIONS);
@@ -462,10 +481,10 @@ pub fn complete_path(input: &EditRope, cursor: &mut Cursor) -> Vec<String> {
         filepath.strip_suffix('.').is_some_and(|s| s.ends_with(MAIN_SEPARATOR))
     {
         // complete all dotfiles
-
         // The .parent() and .file_name() methods treat . especially, so we
         // have to special-case completion of hidden files here.
-        let _ = input.get_prefix_word_mut(cursor, &WordStyle::CharSet(|c| c != MAIN_SEPARATOR)); // TODO: fix for windows
+
+        cursor.left(parse::trailing_filename_escaped(filepath.as_ref()).len());
 
         if let Ok(dir) = path.read_dir() {
             let filter = |entry: DirEntry| {
@@ -491,8 +510,7 @@ pub fn complete_path(input: &EditRope, cursor: &mut Cursor) -> Vec<String> {
         }
     } else {
         // complete a path
-
-        let _ = input.get_prefix_word_mut(cursor, &WordStyle::CharSet(|c| c != MAIN_SEPARATOR)); // TODO: fix for windows
+        cursor.left(parse::trailing_filename_escaped(filepath.as_ref()).len());
 
         let Some(prefix) = path.components().next_back() else {
             return vec![];
@@ -543,29 +561,27 @@ pub fn complete_path(input: &EditRope, cursor: &mut Cursor) -> Vec<String> {
     }
 
     // Use custom sort to have `.` and `..` at the top
+    let cur = format!(".{MAIN_SEPARATOR}");
+    let parent = format!("..{MAIN_SEPARATOR}");
     res.sort_unstable_by(|a, b| {
-        if a == "./" {
+        if a == &cur {
             return Ordering::Less;
         }
-        if b == "./" {
+        if b == &cur {
             return Ordering::Greater;
         }
-        if a == "../" {
+        if a == &parent {
             return Ordering::Less;
         }
-        if b == "../" {
+        if b == &parent {
             return Ordering::Greater;
         }
 
         a.cmp(b)
     });
 
     for comp in &mut res {
-        for c in ["\\\\", "\\ ", "\\#", "\\%", "\\|", "\\\""] {
-            if comp.contains(&c[1..2]) {
-                *comp = comp.replace(&c[1..2], c);
-            }
-        }
+        parse::escape_string(comp);
     }
 
     return res;
