fixup! feat(files): make file system actions LSP aware

Fix: join all checks within a single filter with AND and all the filters
for a given server with OR

Author: TheLeoP

lua/mini/files.lua

@@ -2740,7 +2740,7 @@ H.fs_actions_apply = function(fs_actions)
   )
   local filtered_delete = vim.tbl_filter(function(diff) return diff.action == 'delete' end, fs_actions)
   local filtered_rename = vim.tbl_filter(
-    function(diff) return diff.action == 'rename' and not H.fs_is_present_path(diff.from) end,
+    function(diff) return diff.action == 'rename' and not H.fs_is_present_path(diff.to) end,
     fs_actions
   )
 
@@ -2796,15 +2796,16 @@ H.lsp_fs_hook = function(method, params)
   local timeout = 1000
   for _, client in ipairs(clients) do
     local filters = client.server_capabilities.workspace.fileOperations[method].filters --[=[@as lsp.FileOperationFilter[]]=]
-    local matching_functions = {}
+    local grouped_matching_functions = {}
     for _, filter in ipairs(filters) do
       local ignore_case = filter.pattern.options and filter.pattern.options.ignoreCase
       local glob = filter.pattern.glob
       if ignore_case then glob = vim.fn.tolower(glob) end
 
+      local matching_functions = {}
       table.insert(matching_functions, function(uri)
         local path = vim.uri_to_fname(uri)
-        return vim.glob.to_lpeg(glob):match(path)
+        return vim.glob.to_lpeg(glob):match(path) ~= nil
       end)
       if filter.scheme then
         table.insert(matching_functions, function(uri) return uri:find('^' .. filter.scheme .. ':') ~= nil end)
@@ -2817,18 +2818,25 @@ H.lsp_fs_hook = function(method, params)
           if filter.pattern.matches == 'file' then return type == 'file' end
         end)
       end
+      table.insert(grouped_matching_functions, matching_functions)
     end
 
     local filtered_params = {
       files = {},
     }
     for _, file in ipairs(params.files) do
       local uri = file.uri or file.oldUri
-      local matches = true
-      for _, matching_function in ipairs(matching_functions) do
-        matches = matches and matching_function(uri)
+      local matches_any_filter = false
+      for _, matching_functions in ipairs(grouped_matching_functions) do
+        if not matches_any_filter then
+          local matches_current_filter = true
+          for _, matching_function in ipairs(matching_functions) do
+            matches_current_filter = matches_current_filter and matching_function(uri)
+          end
+          matches_any_filter = matches_any_filter or matches_current_filter
+        end
       end
-      if matches then table.insert(filtered_params.files, file) end
+      if matches_any_filter then table.insert(filtered_params.files, file) end
     end
 
     if method:sub(1, 3) == 'did' then