Merge branch 'master' into fix-subtree-up-and-down

kristijanhusak · web-flow · commit 361435fa45dd · 2025-09-03T15:25:23.000+02:00
diff --git a/README.org b/README.org
@@ -198,5 +198,5 @@ issue.
 
 - [[https://github.com/dhruvasagar][@dhruvasagar]] and his [[https://github.com/dhruvasagar/vim-dotoo][vim-dotoo]] plugin
   that got me started using orgmode. Without him this plugin would not happen.
-- [[https://github.com/milisims][@milisims]] for writing a treesitter parser for org
+- [[https://github.com/emiasims][@emiasims]] for writing a treesitter parser for org
 - [[https://github.com/jceb/vim-orgmode][vim-orgmode]] for some parts of the code (mostly syntax)
diff --git a/docs/contributing.org b/docs/contributing.org
@@ -98,7 +98,7 @@ can be installed, and exit with a success message.
 :PROPERTIES:
 :CUSTOM_ID: parser
 :END:
-Parsing is done via builtin treesitter parser and the [[https://github.com/milisims/tree-sitter-org][tree-sitter-org]] grammar.
+Parsing is done via builtin treesitter parser and the [[https://github.com/nvim-orgmode/tree-sitter-org][tree-sitter-org]] grammar.
 
 **** Commits
 :PROPERTIES:
diff --git a/lua/orgmode/api/file.lua b/lua/orgmode/api/file.lua
@@ -1,5 +1,6 @@
 ---@diagnostic disable: invisible
 local OrgHeadline = require('orgmode.api.headline')
+local utils = require('orgmode.utils')
 local org = require('orgmode')
 
 ---@class OrgApiFile
@@ -113,7 +114,7 @@ end
 --- @return string
 function OrgFile:get_link()
   local filename = self.filename
-  local bufnr = vim.fn.bufnr('^' .. filename .. '$')
+  local bufnr = utils.get_buffer_by_filename(filename)
 
   if bufnr == -1 or not vim.api.nvim_buf_is_loaded(bufnr) then
     -- do remote edit
diff --git a/lua/orgmode/api/headline.lua b/lua/orgmode/api/headline.lua
@@ -4,6 +4,7 @@ local PriorityState = require('orgmode.objects.priority_state')
 local Date = require('orgmode.objects.date')
 local Calendar = require('orgmode.objects.calendar')
 local Promise = require('orgmode.utils.promise')
+local utils = require('orgmode.utils')
 local org = require('orgmode')
 
 ---@class OrgApiHeadline
@@ -276,7 +277,7 @@ end
 --- @return string
 function OrgHeadline:get_link()
   local filename = self.file.filename
-  local bufnr = vim.fn.bufnr('^' .. filename .. '$')
+  local bufnr = utils.get_buffer_by_filename(filename)
 
   if bufnr == -1 or not vim.api.nvim_buf_is_loaded(bufnr) then
     -- do remote edit
diff --git a/lua/orgmode/api/init.lua b/lua/orgmode/api/init.lua
@@ -4,6 +4,7 @@ local OrgHeadline = require('orgmode.api.headline')
 local orgmode = require('orgmode')
 local validator = require('orgmode.utils.validator')
 local Promise = require('orgmode.utils.promise')
+local utils = require('orgmode.utils')
 
 ---@class OrgApiRefileOpts
 ---@field source OrgApiHeadline
@@ -81,7 +82,7 @@ function OrgApi.refile(opts)
     refile_opts.destination_headline = opts.destination._section
   end
 
-  local source_bufnr = vim.fn.bufnr('^' .. opts.source.file.filename .. '$') or -1
+  local source_bufnr = utils.get_buffer_by_filename(opts.source.file.filename)
   local is_capture = source_bufnr > -1 and vim.b[source_bufnr].org_capture
 
   if is_capture and orgmode.capture._window then
diff --git a/lua/orgmode/files/file.lua b/lua/orgmode/files/file.lua
@@ -60,7 +60,7 @@ end
 ---Load the file
 ---@return OrgPromise<OrgFile | false>
 function OrgFile.load(filename)
-  local bufnr = vim.fn.bufnr('^' .. filename .. '$') or -1
+  local bufnr = utils.get_buffer_by_filename(filename)
 
   if
     bufnr > -1
@@ -534,7 +534,7 @@ end
 
 ---@return number
 function OrgFile:bufnr()
-  local bufnr = vim.fn.bufnr('^' .. self.filename .. '$') or -1
+  local bufnr = utils.get_buffer_by_filename(self.filename)
   -- Do not consider unloaded buffers as valid
   -- Treesitter is not working in them
   if bufnr > -1 and vim.api.nvim_buf_is_loaded(bufnr) then
@@ -546,7 +546,7 @@ end
 ---Return valid buffer handle or throw an error if it's not valid
 ---@return number
 function OrgFile:get_valid_bufnr()
-  local bufnr = vim.fn.bufnr('^' .. self.filename .. '$') or -1
+  local bufnr = utils.get_buffer_by_filename(self.filename)
   if bufnr < 0 then
     error('[orgmode] No valid buffer for file ' .. self.filename .. ' to edit', 0)
   end
diff --git a/lua/orgmode/org/autocompletion/_meta.lua b/lua/orgmode/org/autocompletion/_meta.lua
@@ -1,6 +1,6 @@
 ---@meta
 
----@alias OrgCompletionContext { line: string, base?: string }
+---@alias OrgCompletionContext { line: string, base?: string, fuzzy?: boolean, matcher?: fun(value?: string, pattern?: string): boolean }
 ---@alias OrgCompletionItem { word: string, menu: string }
 
 ---@class OrgCompletionSource
diff --git a/lua/orgmode/org/autocompletion/blink.lua b/lua/orgmode/org/autocompletion/blink.lua
@@ -21,6 +21,7 @@ function Source:get_completions(ctx, callback)
   local results = org.completion:complete({
     line = line,
     base = base,
+    fuzzy = true,
   })
 
   local cb = function(items)
diff --git a/lua/orgmode/org/autocompletion/cmp.lua b/lua/orgmode/org/autocompletion/cmp.lua
@@ -30,6 +30,7 @@ function Source:complete(params, callback)
   local results = org.completion:complete({
     line = params.context.cursor_before_line,
     base = base,
+    fuzzy = true,
   })
   local items = {}
   for _, item in ipairs(results) do
diff --git a/lua/orgmode/org/autocompletion/init.lua b/lua/orgmode/org/autocompletion/init.lua
@@ -44,6 +44,19 @@ end
 ---@return OrgCompletionItem
 function OrgCompletion:complete(context)
   local results = {}
+  context.base = context.base or ''
+  if not context.matcher then
+    context.matcher = function(value, pattern)
+      pattern = pattern or ''
+      if pattern == '' then
+        return true
+      end
+      if context.fuzzy then
+        return #vim.fn.matchfuzzy({ value }, pattern) > 0
+      end
+      return value:find('^' .. vim.pesc(pattern)) ~= nil
+    end
+  end
   for _, source in ipairs(self.sources) do
     if source:get_start(context) then
       vim.list_extend(results, self:_get_valid_results(source:get_results(context), context))
@@ -53,12 +66,13 @@ function OrgCompletion:complete(context)
   return results
 end
 
+---@param results string[]
+---@param context OrgCompletionContext
+---@return OrgCompletionItem[]
 function OrgCompletion:_get_valid_results(results, context)
-  local base = context.base or ''
-
   local valid_results = {}
   for _, item in ipairs(results) do
-    if base == '' or item:find('^' .. vim.pesc(base)) then
+    if context.matcher(item, context.base) then
       table.insert(valid_results, {
         word = item,
         menu = self.menu,
@@ -89,6 +103,9 @@ function OrgCompletion:omnifunc(findstart, base)
 
   self._context = self._context or { line = self:get_line() }
   self._context.base = base
+  if vim.tbl_contains(vim.opt_local.completeopt:get(), 'fuzzy') then
+    self._context.fuzzy = true
+  end
   return self:complete(self._context)
 end
 
diff --git a/lua/orgmode/org/autocompletion/sources/hyperlinks.lua b/lua/orgmode/org/autocompletion/sources/hyperlinks.lua
@@ -25,7 +25,7 @@ end
 ---@param context OrgCompletionContext
 ---@return string[]
 function OrgCompletionHyperlinks:get_results(context)
-  return self.completion.links:autocomplete(context.base)
+  return self.completion.links:autocomplete(context)
 end
 
 return OrgCompletionHyperlinks
diff --git a/lua/orgmode/org/links/_meta.lua b/lua/orgmode/org/links/_meta.lua
@@ -3,4 +3,4 @@
 ---@class OrgLinkType
 ---@field get_name fun(self: OrgLinkType): string
 ---@field follow fun(self: OrgLinkType, link: string): boolean
----@field autocomplete fun(self: OrgLinkType, link: string): string[]
+---@field autocomplete fun(self: OrgLinkType, context: OrgCompletionContext): string[]
diff --git a/lua/orgmode/org/links/init.lua b/lua/orgmode/org/links/init.lua
@@ -56,22 +56,20 @@ function OrgLinks:follow(link)
   return self.headline_search:follow(link)
 end
 
----@param link string
+---@param context OrgCompletionContext
 ---@return string[]
-function OrgLinks:autocomplete(link)
-  local pattern = '^' .. vim.pesc(link:lower())
-
+function OrgLinks:autocomplete(context)
   local items = vim.tbl_filter(function(stored_link)
-    return stored_link:lower():match(pattern)
+    return context.matcher(stored_link, context.base)
   end, vim.tbl_keys(self.stored_links))
 
   for _, source in ipairs(self.types) do
     if source.autocomplete then
-      utils.concat(items, source:autocomplete(link))
+      utils.concat(items, source:autocomplete(context))
     end
   end
 
-  utils.concat(items, self.headline_search:autocomplete(link))
+  utils.concat(items, self.headline_search:autocomplete(context))
   return items
 end
 
diff --git a/lua/orgmode/org/links/types/custom_id.lua b/lua/orgmode/org/links/types/custom_id.lua
@@ -42,10 +42,10 @@ function OrgLinkCustomId:follow(link)
   return link_utils.open_file_and_search(opts.file_path, opts.custom_id)
 end
 
----@param link string
+---@param context OrgCompletionContext
 ---@return string[]
-function OrgLinkCustomId:autocomplete(link)
-  local opts = self:_parse(link)
+function OrgLinkCustomId:autocomplete(context)
+  local opts = self:_parse(context.base)
   if not opts then
     return {}
   end
diff --git a/lua/orgmode/org/links/types/headline.lua b/lua/orgmode/org/links/types/headline.lua
@@ -38,10 +38,10 @@ function OrgLinkHeadline:follow(link)
   return link_utils.open_file_and_search(opts.file_path, opts.headline)
 end
 
----@param link string
+---@param context OrgCompletionContext
 ---@return string[]
-function OrgLinkHeadline:autocomplete(link)
-  local opts = self:_parse(link)
+function OrgLinkHeadline:autocomplete(context)
+  local opts = self:_parse(context.base)
   if not opts then
     return {}
   end
@@ -52,7 +52,9 @@ function OrgLinkHeadline:autocomplete(link)
     return {}
   end
 
-  local headlines = file:find_headlines_by_title(opts.headline)
+  local headlines = vim.tbl_filter(function(headline)
+    return context.matcher(headline:get_title(), opts.headline)
+  end, file:get_headlines())
   local prefix = opts.type == 'internal' and '' or opts.link_url:get_path_with_protocol() .. '::'
 
   return vim.tbl_map(function(headline)
diff --git a/lua/orgmode/org/links/types/headline_search.lua b/lua/orgmode/org/links/types/headline_search.lua
@@ -59,10 +59,10 @@ function OrgLinkHeadlineSearch:follow(link)
   return link_utils.open_file_and_search(opts.file_path, search_text)
 end
 
----@param link string
+---@param context OrgCompletionContext
 ---@return string[]
-function OrgLinkHeadlineSearch:autocomplete(link)
-  local opts = self:_parse(link)
+function OrgLinkHeadlineSearch:autocomplete(context)
+  local opts = self:_parse(context.base)
   if not opts then
     return {}
   end
@@ -71,22 +71,9 @@ function OrgLinkHeadlineSearch:autocomplete(link)
     local filenames = self.files:filenames()
     local valid_filenames = {}
     for _, f in ipairs(filenames) do
-      if f:find('^' .. opts.file_path) then
-        f = f:gsub('^' .. opts.file_path, opts.link_url.path)
-        table.insert(valid_filenames, f)
-      end
-
-      local real_path = opts.link_url:get_real_path()
-
-      if not real_path then
-        local substitute_path = fs.substitute_path(opts.file_path)
-        if substitute_path then
-          local full_path = vim.fn.fnamemodify(substitute_path, ':p')
-          if f:find('^' .. full_path) then
-            f = f:gsub('^' .. full_path, opts.link_url.path)
-            table.insert(valid_filenames, f)
-          end
-        end
+      local converted_path = fs.convert_path(opts.link_url.path, f)
+      if context.matcher(converted_path, opts.link_url.path) then
+        table.insert(valid_filenames, converted_path)
       end
     end
 
@@ -108,11 +95,15 @@ function OrgLinkHeadlineSearch:autocomplete(link)
     return headline:get_title()
   end, file:find_headlines_matching_search_term(pattern, true))
 
+  local matching_headlines = vim.tbl_filter(function(headline)
+    return context.matcher(headline:get_title(), opts.headline_text)
+  end, file:get_headlines())
+
   utils.concat(
     headlines,
     vim.tbl_map(function(headline)
       return headline:get_title()
-    end, file:find_headlines_by_title(opts.headline_text)),
+    end, matching_headlines),
     true
   )
   local prefix = opts.type == 'internal' and '' or opts.link_url:get_path_with_protocol() .. '::'
diff --git a/lua/orgmode/utils/fs.lua b/lua/orgmode/utils/fs.lua
@@ -20,6 +20,37 @@ function M.substitute_path(path_str)
   return false
 end
 
+--Convert absolute path to the same format as source path
+--If source path has relative parts, like ~, ./ or ../,
+--apply same to the long path and return
+---@param source_path string
+---@param long_path string
+function M.convert_path(source_path, long_path)
+  if source_path:match('^/') then
+    return long_path
+  end
+
+  if source_path:match('^~/') then
+    local home_path = os.getenv('HOME')
+    if home_path then
+      return long_path:gsub('^' .. vim.pesc(home_path), '~')
+    end
+    return long_path
+  end
+
+  if source_path:match('^%./') then
+    local base = vim.fn.fnamemodify(utils.current_file_path(), ':p:h')
+    return long_path:gsub('^' .. vim.pesc(base), '.')
+  end
+
+  if source_path:match('^%.%./') then
+    local base = vim.fn.fnamemodify(utils.current_file_path(), ':p:h:h')
+    return long_path:gsub('^' .. vim.pesc(base), '..')
+  end
+
+  return long_path
+end
+
 ---@param filepath string
 function M.get_real_path(filepath)
   if not filepath then
diff --git a/lua/orgmode/utils/init.lua b/lua/orgmode/utils/init.lua
@@ -622,4 +622,11 @@ function utils.if_nil(...)
   return nil
 end
 
+---Get buffer number by filename with proper regex escaping
+---@param filename string The filename to search for
+---@return number Buffer number or -1 if not found/loaded
+function utils.get_buffer_by_filename(filename)
+  return vim.fn.bufnr('^' .. vim.fn.escape(filename, '^$.*?/\\[]~') .. '$')
+end
+
 return utils
diff --git a/lua/orgmode/utils/treesitter/install.lua b/lua/orgmode/utils/treesitter/install.lua
@@ -114,14 +114,22 @@ function M.not_installed()
   return not ok or (not result and err ~= nil)
 end
 
+function M._write_lock_file(content)
+  local lock_file = M.get_lock_file()
+  local file = assert(io.open(lock_file, 'w'))
+  file:write(vim.json.encode(content))
+  file:close()
+end
+
 function M.get_installed_version()
   local lock_file = M.get_lock_file()
-  -- No lock file, assume that version is 1.3.4 (when lock file was introduced)
   if not vim.uv.fs_stat(lock_file) then
-    utils.writefile(lock_file, vim.json.encode({ version = '1.3.4' })):wait()
+    M._write_lock_file({ version = '1.3.4' })
     return '1.3.4'
   end
-  local file_content = vim.json.decode(utils.readfile(lock_file, { raw = true }):wait())
+  local lock_file_handle = assert(io.open(lock_file, 'r'))
+  local file_content = vim.json.decode(lock_file_handle:read('*a'))
+  lock_file_handle:close()
   return file_content.version
 end
 
@@ -275,7 +283,6 @@ function M.run(type)
 
   local compiler_args = M.select_compiler_args(compiler)
   local ts_grammar_dir = nil
-  local lock_file = M.get_lock_file()
   local is_win = vim.fn.has('win32') == 1
   local shellslash = is_win and vim.opt.shellslash:get() or false
 
@@ -298,7 +305,7 @@ function M.run(type)
       if code ~= 0 then
         error('[orgmode] Failed to move generated tree-sitter parser to runtime folder', 0)
       end
-      return utils.writefile(lock_file, vim.json.encode({ version = required_version }))
+      return M._write_lock_file({ version = required_version })
     end)
     :next(vim.schedule_wrap(function()
       local msg = { 'Tree-sitter grammar installed!' }
diff --git a/store.md b/store.md
diff --git a/tests/plenary/files/file_spec.lua b/tests/plenary/files/file_spec.lua
diff --git a/tests/plenary/utils_spec.lua b/tests/plenary/utils_spec.lua
