refactor(utils): split file operation to utils.files (CopilotC-Nvim#1367)

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

Author: deathbeam

lua/CopilotChat/client.lua

@@ -59,6 +59,7 @@ local notify = require('CopilotChat.notify')
 local tiktoken = require('CopilotChat.tiktoken')
 local utils = require('CopilotChat.utils')
 local class = require('CopilotChat.utils.class')
+local files = require('CopilotChat.utils.files')
 local orderedmap = require('CopilotChat.utils.orderedmap')
 local stringbuffer = require('CopilotChat.utils.stringbuffer')
 
@@ -97,7 +98,7 @@ local function generate_resource_block(content, mimetype, name, path, start_line
   end
 
   local updated_content = table.concat(lines, '\n')
-  local filetype = utils.mimetype_to_filetype(mimetype or 'text')
+  local filetype = files.mimetype_to_filetype(mimetype or 'text')
   if not start_line then
     start_line = 1
   end

lua/CopilotChat/config/functions.lua

@@ -1,5 +1,6 @@
 local resources = require('CopilotChat.resources')
 local utils = require('CopilotChat.utils')
+local files = require('CopilotChat.utils.files')
 
 ---@class CopilotChat.config.functions.Function
 ---@field description string?
@@ -23,7 +24,7 @@ return {
           type = 'string',
           description = 'Path to file to include in chat context.',
           enum = function(source)
-            return utils.glob(source.cwd(), {
+            return files.glob(source.cwd(), {
               max_count = 0,
             })
           end,
@@ -67,15 +68,15 @@ return {
     },
 
     resolve = function(input, source)
-      local files = utils.glob(source.cwd(), {
+      local out = files.glob(source.cwd(), {
         pattern = input.pattern,
       })
 
       return {
         {
           uri = 'files://glob/' .. input.pattern,
           mimetype = 'text/plain',
-          data = table.concat(files, '\n'),
+          data = table.concat(out, '\n'),
         },
       }
     end,
@@ -98,15 +99,15 @@ return {
     },
 
     resolve = function(input, source)
-      local files = utils.grep(source.cwd(), {
+      local out = files.grep(source.cwd(), {
         pattern = input.pattern,
       })
 
       return {
         {
           uri = 'files://grep/' .. input.pattern,
           mimetype = 'text/plain',
-          data = table.concat(files, '\n'),
+          data = table.concat(out, '\n'),
         },
       }
     end,
@@ -230,7 +231,7 @@ return {
         {
           uri = 'neovim://selection',
           name = selection.filename,
-          mimetype = utils.mimetype_to_filetype(selection.filetype),
+          mimetype = files.mimetype_to_filetype(selection.filetype),
           data = selection.content,
           annotations = {
             start_line = selection.start_line,

lua/CopilotChat/config/mappings.lua

@@ -4,6 +4,7 @@ local client = require('CopilotChat.client')
 local constants = require('CopilotChat.constants')
 local select = require('CopilotChat.select')
 local utils = require('CopilotChat.utils')
+local files = require('CopilotChat.utils.files')
 
 ---@class CopilotChat.config.mappings.Diff
 ---@field change string
@@ -45,16 +46,16 @@ local function get_diff(bufnr, block)
 
   -- If we have header info, use it as source of truth
   if header.start_line and header.end_line then
-    filename = utils.uri_to_filename(header.filename)
-    filetype = header.filetype or utils.filetype(filename)
+    filename = files.uri_to_filename(header.filename)
+    filetype = header.filetype or files.filetype(filename)
     start_line = header.start_line
     end_line = header.end_line
 
     -- Try to find matching buffer and window
     bufnr = nil
     for _, win in ipairs(vim.api.nvim_list_wins()) do
       local win_buf = vim.api.nvim_win_get_buf(win)
-      if utils.filename_same(vim.api.nvim_buf_get_name(win_buf), header.filename) then
+      if files.filename_same(vim.api.nvim_buf_get_name(win_buf), header.filename) then
         bufnr = win_buf
         break
       end
@@ -99,7 +100,7 @@ local function prepare_diff_buffer(diff, source)
   if not diff_bufnr then
     -- Try to find matching buffer first
     for _, buf in ipairs(vim.api.nvim_list_bufs()) do
-      if utils.filename_same(vim.api.nvim_buf_get_name(buf), diff.filename) then
+      if files.filename_same(vim.api.nvim_buf_get_name(buf), diff.filename) then
         diff_bufnr = buf
         break
       end
@@ -534,7 +535,7 @@ return {
           end
 
           table.insert(lines, header)
-          table.insert(lines, '```' .. utils.mimetype_to_filetype(resource.mimetype))
+          table.insert(lines, '```' .. files.mimetype_to_filetype(resource.mimetype))
           for _, line in ipairs(preview) do
             table.insert(lines, line)
           end

lua/CopilotChat/config/providers.lua

@@ -1,7 +1,8 @@
+local plenary_utils = require('plenary.async.util')
 local constants = require('CopilotChat.constants')
 local notify = require('CopilotChat.notify')
 local utils = require('CopilotChat.utils')
-local plenary_utils = require('plenary.async.util')
+local files = require('CopilotChat.utils.files')
 
 local EDITOR_VERSION = 'Neovim/' .. vim.version().major .. '.' .. vim.version().minor .. '.' .. vim.version().patch
 
@@ -14,7 +15,7 @@ local function load_tokens()
 
   local config_path = vim.fs.normalize(vim.fn.stdpath('data') .. '/copilot_chat')
   local cache_file = config_path .. '/tokens.json'
-  local file = utils.read_file(cache_file)
+  local file = files.read_file(cache_file)
   if file then
     token_cache = vim.json.decode(file)
   else
@@ -42,7 +43,7 @@ local function set_token(tag, token, save)
   local tokens = load_tokens()
   tokens[tag] = token
   local config_path = vim.fs.normalize(vim.fn.stdpath('data') .. '/copilot_chat')
-  utils.write_file(config_path .. '/tokens.json', vim.json.encode(tokens))
+  files.write_file(config_path .. '/tokens.json', vim.json.encode(tokens))
   return token
 end
 
@@ -141,7 +142,7 @@ local function get_github_copilot_token(tag)
     }
 
     for _, file_path in ipairs(file_paths) do
-      local file_data = utils.read_file(file_path)
+      local file_data = files.read_file(file_path)
       if file_data then
         local parsed_data = utils.json_decode(file_data)
         if parsed_data then

lua/CopilotChat/init.lua

@@ -7,6 +7,7 @@ local notify = require('CopilotChat.notify')
 local select = require('CopilotChat.select')
 local utils = require('CopilotChat.utils')
 local orderedmap = require('CopilotChat.utils.orderedmap')
+local files = require('CopilotChat.utils.files')
 
 local WORD = '([^%s:]+)'
 local WORD_NO_INPUT = '([^%s]+)'
@@ -435,7 +436,7 @@ function M.resolve_functions(prompt, config)
               table.insert(state.sticky, content_out)
             end
           else
-            content_out = string.format(BLOCK_OUTPUT_FORMAT, utils.mimetype_to_filetype(content.mimetype), content.data)
+            content_out = string.format(BLOCK_OUTPUT_FORMAT, files.mimetype_to_filetype(content.mimetype), content.data)
           end
 
           if not utils.empty(result) then

lua/CopilotChat/resources.lua

@@ -1,5 +1,6 @@
 local async = require('plenary.async')
 local utils = require('CopilotChat.utils')
+local files = require('CopilotChat.utils.files')
 local file_cache = {}
 local url_cache = {}
 
@@ -9,18 +10,19 @@ local M = {}
 ---@param filename string
 ---@return string?, string?
 function M.get_file(filename)
-  local filetype = utils.filetype(filename)
+  local filetype = files.filetype(filename)
   if not filetype then
     return nil
   end
-  local modified = utils.file_mtime(filename)
-  if not modified then
+  local err, stat = async.uv.fs_stat(filename)
+  if err or not stat then
     return nil
   end
+  local modified = stat.mtime.sec
 
   local data = file_cache[filename]
   if not data or data._modified < modified then
-    local content = utils.read_file(filename)
+    local content = files.read_file(filename)
     if not content or content == '' then
       return nil
     end
@@ -31,7 +33,7 @@ function M.get_file(filename)
     file_cache[filename] = data
   end
 
-  return data.content, utils.filetype_to_mimetype(filetype)
+  return data.content, files.filetype_to_mimetype(filetype)
 end
 
 --- Get data for a buffer
@@ -47,7 +49,7 @@ function M.get_buffer(bufnr)
     return nil
   end
 
-  return table.concat(content, '\n'), utils.filetype_to_mimetype(vim.bo[bufnr].filetype)
+  return table.concat(content, '\n'), files.filetype_to_mimetype(vim.bo[bufnr].filetype)
 end
 
 --- Get the content of an URL
@@ -58,7 +60,7 @@ function M.get_url(url)
     return nil
   end
 
-  local ft = utils.filetype(url)
+  local ft = files.filetype(url)
   local content = url_cache[url]
   if not content then
     local ok, out = async.util.apcall(utils.system, { 'lynx', '-dump', url })
@@ -96,7 +98,7 @@ function M.get_url(url)
     url_cache[url] = content
   end
 
-  return content, utils.filetype_to_mimetype(ft)
+  return content, files.filetype_to_mimetype(ft)
 end
 
 return M