Optimize file loading to trigger only when necessary

Author: kristijanhusak

lua/orgmode/init.lua

@@ -53,6 +53,7 @@ function Org:setup_autocmds()
     group = org_augroup,
     callback = function()
       require('orgmode').reload(vim.fn.expand('<afile>:p'))
+      require('orgmode.org.diagnostics').report()
     end,
   })
   vim.api.nvim_create_autocmd('FileType', {
@@ -62,13 +63,6 @@ function Org:setup_autocmds()
       require('orgmode').reload(vim.fn.expand('<afile>:p'))
     end,
   })
-  vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
-    pattern = { '*.org', '*.org_archive' },
-    group = org_augroup,
-    callback = function()
-      require('orgmode.org.diagnostics').report()
-    end,
-  })
 end
 
 --- @param revision string?

lua/orgmode/parser/file.lua

@@ -22,13 +22,20 @@ local utils = require('orgmode.utils')
 local File = {}
 
 function File:new(tree, file_content, file_content_str, category, filename, is_archive_file)
+  local changedtick = 0
+  if filename then
+    local bufnr = vim.fn.bufnr(filename)
+    if bufnr > 0 then
+      changedtick = vim.api.nvim_buf_get_var(bufnr, 'changedtick')
+    end
+  end
   local data = {
     tree = tree,
     file_content = file_content,
     file_content_str = file_content_str,
     category = category,
     filename = filename,
-    changedtick = 0,
+    changedtick = changedtick,
     sections = {},
     sections_by_line = {},
     source_code_filetypes = {},
@@ -128,6 +135,15 @@ function File:get_headlines()
   return self.sections
 end
 
+---@return boolean
+function File:should_reload()
+  local bufnr = vim.fn.bufnr(self.filename)
+  if bufnr < 0 then
+    return false
+  end
+  return self.changedtick ~= vim.api.nvim_buf_get_var(bufnr, 'changedtick')
+end
+
 ---@param path string
 ---@returns File
 function File.load(path, callback)
@@ -163,14 +179,10 @@ function File.from_content(content, category, filename, is_archive_file)
 end
 
 function File:refresh()
-  local bufnr = vim.fn.bufnr(self.filename)
-  if bufnr < 0 then
-    return self
-  end
-  local changed = self.changedtick ~= vim.api.nvim_buf_get_var(bufnr, 'changedtick')
-  if not changed then
+  if not self:should_reload() then
     return self
   end
+  local bufnr = vim.fn.bufnr(self.filename)
   local content = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
   local refreshed_file = File.from_content(content, self.category, self.filename, self.is_archive_file)
   refreshed_file.changedtick = vim.api.nvim_buf_get_var(bufnr, 'changedtick')

lua/orgmode/parser/files.lua

@@ -62,23 +62,33 @@ function Files._set_loaded_file(filename, orgfile)
 end
 
 function Files.reload(file, callback)
-  if file then
-    local prev_file = Files.get(file)
-    return File.load(file, function(orgfile)
-      if orgfile then
-        Files._set_loaded_file(file, orgfile)
-        Files._check_source_blocks(prev_file, Files.get(file))
-      end
-      Files.loaded = true
-      if callback then
-        callback()
-      end
-      Files._build_tags()
-      return Files.get(file)
-    end)
+  if not file then
+    return Files.load(callback)
+  end
+
+  local old_file = Files.orgfiles[file]
+  local new_file = Files.get(file)
+
+  if old_file then
+    Files._check_source_blocks(old_file, new_file)
+    if callback then
+      callback()
+    end
+    return new_file
   end
 
-  return Files.load(callback)
+  return File.load(file, function(orgfile)
+    if orgfile then
+      Files._set_loaded_file(file, orgfile)
+      Files._check_source_blocks(old_file, orgfile)
+    end
+    Files.loaded = true
+    if callback then
+      callback()
+    end
+    Files._build_tags()
+    return orgfile
+  end)
 end
 
 ---@return File[]
@@ -111,7 +121,7 @@ function Files.get(file)
   end
 
   if vim.bo.filetype == 'org' and vim.fn.filereadable(file) == 0 then
-    return File.from_content(vim.api.nvim_buf_get_lines(0, 0, -1, false))
+    return File.from_content(vim.api.nvim_buf_get_lines(0, 0, -1, false), nil, nil, false)
   end
 
   return nil