Fix: bookmark columns.

obaland · Feb 21, 2022 · 80eb2bb · 80eb2bb
1 parent a6efe25
commit 80eb2bb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/lua/vfiler/extensions/bookmark/columns/icon.lua b/lua/vfiler/extensions/bookmark/columns/icon.lua
@@ -8,6 +8,7 @@ IconColumn.configs = {
   directory = ' ',
   closed = '+',
   opened = '-',
+  unknown = '?',
 }
 
 function IconColumn.setup(configs)
@@ -33,6 +34,11 @@ function IconColumn.new()
         start_mark = 'i@c\\',
         highlight = 'vfilerBookmarkCategory',
       },
+      unknown = {
+        group = 'vfilerBookmarkIcon_Unknown',
+        start_mark = 'i@u\\',
+        highlight = 'vfilerBookmarkUnknown',
+      },
     },
     end_mark = '\\i@',
   })
@@ -49,13 +55,13 @@ function IconColumn:get_width(items)
 end
 
 function IconColumn:_get_text(item, width)
-  local iname
+  local key
   if item.type == 'category' then
-    iname = item.opened and 'opened' or 'closed'
+    key = item.opened and 'opened' or 'closed'
   else
-    iname = item.type
+    key = item.type
   end
-  local icon = self.configs[iname]
+  local icon = self.configs[key]
   return icon .. (' '):rep(self.icon_width - vim.fn.strwidth(icon))
 end
 

diff --git a/lua/vfiler/extensions/bookmark/columns/name.lua b/lua/vfiler/extensions/bookmark/columns/name.lua
@@ -27,6 +27,11 @@ function NameColumn.new()
         start_mark = 'n@l\\',
         highlight = 'vfilerBookmarkLink',
       },
+      unknown = {
+        group = 'vfilerBookmarkName_Unknown',
+        start_mark = 'n@u\\',
+        highlight = 'vfilerBookmarkUnknown',
+      },
     },
     end_mark = '\\n@',
   })

diff --git a/lua/vfiler/extensions/bookmark/items/item.lua b/lua/vfiler/extensions/bookmark/items/item.lua
@@ -10,8 +10,8 @@ function Item.new(name, path)
     level = 2,
     parent = nil,
     path = path,
-    link = fstat.link,
-    type = fstat.type,
+    link = fstat and fstat.link or false,
+    type = fstat and fstat.type or 'unknown',
   }, Item)
 end
 

diff --git a/lua/vfiler/libs/filesystem.lua b/lua/vfiler/libs/filesystem.lua
@@ -46,6 +46,9 @@ if core.is_nvim then
 
   function M.stat(path)
     local stat = uv.fs_lstat(path)
+    if not stat then
+      return nil
+    end
     local link = stat.type == 'link'
     if link then
       stat = uv.fs_stat(path)

diff --git a/plugin/vfiler.vim b/plugin/vfiler.vim
@@ -64,6 +64,7 @@ highlight default link vfilerBookmarkCategory  Title
 highlight default link vfilerBookmarkDirectory Directory
 highlight default link vfilerBookmarkFile      None
 highlight default link vfilerBookmarkLink      Constant
+highlight default link vfilerBookmarkUnknown   Comment
 highlight default link vfilerBookmarkPath      Comment
 highlight default link vfilerBookmarkWarning   WarningMsg