Add support for relative file path completion with file hyperlinks. Closes #405

Author: kristijanhusak

lua/orgmode/org/autocompletion/cmp.lua

@@ -21,7 +21,7 @@ function Source:is_available()
 end
 
 function Source:get_trigger_characters(_)
-  return { '#', '+', ':', '*' }
+  return { '#', '+', ':', '*', '.', '/' }
 end
 
 function Source:complete(params, callback)

lua/orgmode/org/hyperlinks.lua

@@ -3,10 +3,7 @@ local utils = require('orgmode.utils')
 local Hyperlinks = {}
 
 local function get_file_from_context(ctx)
-  return (
-    ctx.hyperlinks and ctx.hyperlinks.filepath and Files.get(ctx.hyperlinks.filepath, true)
-    or Files.get_current_file()
-  )
+  return (ctx.hyperlinks and ctx.hyperlinks.filepath and Files.get(ctx.hyperlinks.filepath) or Files.get_current_file())
 end
 
 local function update_hyperlink_ctx(ctx)
@@ -22,7 +19,9 @@ local function update_hyperlink_ctx(ctx)
   }
 
   local file_match = ctx.line:match('file:(.-)::')
-  file_match = file_match and vim.fn.fnamemodify(file_match, ':p') or file_match
+  if file_match then
+    file_match = Hyperlinks.get_file_real_path(file_match)
+  end
 
   if file_match and Files.get(file_match) then
     hyperlinks_ctx.filepath = Files.get(file_match).filename
@@ -41,17 +40,28 @@ end
 function Hyperlinks.find_by_filepath(ctx)
   local filenames = Files.filenames()
   local file_base = ctx.base:gsub('^file:', '')
-  if vim.trim(file_base) ~= '' then
-    filenames = vim.tbl_filter(function(f)
-      return f:find('^' .. file_base)
-    end, filenames)
+  local file_base_no_start_path = file_base:gsub('^%./', '') .. ''
+  local is_relative_path = file_base:match('^%./')
+  local current_file_directory = vim.fn.fnamemodify(utils.current_file_path(), ':p:h')
+  local valid_filenames = {}
+  for _, f in ipairs(filenames) do
+    if is_relative_path then
+      local match = f:match('^' .. current_file_directory .. '/(' .. file_base_no_start_path .. '[^/]*%.org)$')
+      if match then
+        table.insert(valid_filenames, './' .. match)
+      end
+    else
+      if f:find('^' .. file_base) then
+        table.insert(valid_filenames, f)
+      end
+    end
   end
 
   -- Outer checks already filter cases where `ctx.skip_add_prefix` is truthy,
   -- so no need to check it here
   return vim.tbl_map(function(path)
     return 'file:' .. path
-  end, filenames)
+  end, valid_filenames)
 end
 
 function Hyperlinks.find_by_custom_id_property(ctx)
@@ -135,4 +145,14 @@ function Hyperlinks.find_matching_links(ctx)
   return all
 end
 
+function Hyperlinks.get_file_real_path(url_path)
+  local path = url_path
+  path = path:gsub('^file:', '')
+  if path:match('^/') then
+    return path
+  end
+  path = path:gsub('^./', '')
+  return vim.fn.fnamemodify(utils.current_file_path(), ':p:h') .. '/' .. path
+end
+
 return Hyperlinks

lua/orgmode/org/mappings.lua

@@ -653,6 +653,7 @@ function OrgMappings:open_at_point()
   if not link then
     return
   end
+
   local parts = vim.split(link, '][', true)
   local url = parts[1]
   local link_ctx = { base = url, skip_add_prefix = true }
@@ -661,15 +662,15 @@ function OrgMappings:open_at_point()
       parts = vim.split(url, ' +', true)
       url = parts[1]
       local line_number = parts[2]
-      vim.cmd(string.format('edit +%s %s', line_number, url:sub(6)))
+      vim.cmd(string.format('edit +%s %s', line_number, Hyperlinks.get_file_real_path(url)))
       vim.cmd([[normal! zv]])
       return
     end
 
     if url:find('^file:(.-)::') then
       link_ctx.line = url
     else
-      vim.cmd(string.format('edit %s', url:sub(6)))
+      vim.cmd(string.format('edit %s', Hyperlinks.get_file_real_path(url)))
       vim.cmd([[normal! zv]])
       return
     end

lua/orgmode/parser/file.lua

@@ -164,7 +164,7 @@ end
 
 function File:refresh()
   local bufnr = vim.fn.bufnr(self.filename)
-  if bufnr < 0 then
+  if bufnr < 0 or vim.fn.buflisted(bufnr) == 0 then
     return self
   end
   local changed = self.changedtick ~= vim.api.nvim_buf_get_var(bufnr, 'changedtick')