Fix wrong path truncation can happen

Fix #4
mityu · Dec 17, 2024 · bff0996 · bff0996
1 parent 104d8a2
commit bff0996
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/autoload/wispath.vim b/autoload/wispath.vim
@@ -85,17 +85,15 @@ export def GetCompletion(target_path: string, cursor_col: number, in_cmdline: bo
     truncate_len = 0
     truncate_len_buffer = 0
   else
-    var dir_buffer = fnamemodify(target_path, ':h')
-    var dir = ExpandEnviron(dir_buffer, in_cmdline)
+    var dir_buffer = fnamemodify(target_path, ':h')  # Directory path as is on buffer.
+    var dir = ExpandEnviron(dir_buffer, in_cmdline)  # Expanded directory path.
     while true
       if stridx(completions[0], dir) == 0
-        if dir == '/'
-          truncate_len = 1
-          truncate_len_buffer = 1
-        else
-          truncate_len = strchars(dir) + 1
-          truncate_len_buffer = strlen(dir_buffer) + 1
-        endif
+        # Additinonal truncation length for path separator.
+        const addition = fnamemodify(dir, ':t') ==# '' ? 0 : 1
+
+        truncate_len = strchars(dir) + addition
+        truncate_len_buffer = strlen(dir_buffer) + addition
         break
       elseif fnamemodify(dir_buffer, ':t') ==# dir_buffer
         truncate_len = 0

diff --git a/test/wispath.vimspec b/test/wispath.vimspec
@@ -243,6 +243,8 @@ Describe wispath#GetCompletion()
       endif
     endfor
     call CompareCandidates(GetCompletion('/'), [2, candidates])
+    call CompareCandidates(GetCompletion('//'), [3, candidates])
+    call CompareCandidates(GetCompletion('///'), [4, candidates])
   End
 
   It lists completions with multibyte file/dir name 1