Added in handling of ignored files.

lite-xl · adamharrison · Apr 1, 2023 · Jun 22, 2024 · Jun 22, 2024 · Jun 22, 2024
commit f2fd9baec3b16287168cb78be8e2fd8d264aba49
diff --git a/data/core/project.lua b/data/core/project.lua
@@ -81,16 +81,23 @@ local function fileinfo_pass_filter(info, ignore_compiled)
 end
 
 
--- compute a file's info entry completed with "filename" to be used
--- in project scan or falsy if it shouldn't appear in the list.
-function Project:get_file_info(path)
-  local info = system.get_file_info(path)
+
+function Project:is_ignored(info, path)
   -- info can be not nil but info.type may be nil if is neither a file neither
   -- a directory, for example for /dev/* entries on linux.
   if info and info.type then
-    info.filename = path
-    return fileinfo_pass_filter(info, self.compiled) and info
+    if path then info.filename = path end
+    return not fileinfo_pass_filter(info, self.compiled)
   end
+  return false
+end
+
+-- compute a file's info entry completed with "filename" to be used
+-- in project scan or falsy if it shouldn't appear in the list.
+function Project:get_file_info(path)
+  local info = system.get_file_info(path)
+  if self:is_ignored(info, path) then return nil end
+  return info
 end
 
 

diff --git a/data/plugins/treeview.lua b/data/plugins/treeview.lua
@@ -98,7 +98,8 @@ function TreeView:get_cached(project, path)
       project = project,
       name = basename,
       type = info.type,
-      project = project
+      project = project,
+      ignored = self.show_ignored and project:is_ignored(info, path)
     }
     if self.expanded[path] ~= nil then t.expanded = self.expanded[path] else t.expanded = (info.type == "dir" and #truncated <= 1) end
     if t.expanded then self.watches[project]:watch(path) end
@@ -117,6 +118,7 @@ function TreeView:get_cached(project, path)
       if f and f.type then
         f.name = file
         f.abs_filename = l
+        f.ignored = self.show_ignored and project:is_ignored(f, l)
         table.insert(t.files, f)
       end
       self.cache[l] = nil
@@ -363,6 +365,8 @@ function TreeView:get_item_icon(item, active, hovered)
   local color = style.text
   if active or hovered then
     color = style.accent
+  elseif item.ignored then
+    color = style.dim
   end
   return character, font, color
 end
@@ -373,6 +377,8 @@ function TreeView:get_item_text(item, active, hovered)
   local color = style.text
   if active or hovered then
     color = style.accent
+  elseif item.ignored then
+    color = style.dim
   end
   return text, font, color
 end