feat(core): enhance org-insert-link, add completion for relative path or ~/

_squash: keep Url.path, and add a realpath filed

Author: PannenetsF

lua/orgmode/org/hyperlinks/init.lua

@@ -24,20 +24,13 @@ function Hyperlinks.find_by_filepath(url)
     return {}
   end
   --TODO integrate with orgmode.utils.fs or orgmode.objects.url
-  local file_base_no_start_path = vim.pesc(file_base:gsub('^%./', '') .. '')
-  local is_relative_path = file_base:match('^%./')
-  local current_file_directory = vim.pesc(fs.get_current_file_dir())
   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)
+    if f:find('^' .. file_base) then
+      if url.realpath then
+        f = f:gsub(file_base, url.path)
       end
+      table.insert(valid_filenames, f)
     end
   end
 

lua/orgmode/org/hyperlinks/url.lua

@@ -1,3 +1,4 @@
+local fs = require('orgmode.utils.fs')
 ---@alias OrgUrlPathType 'file' | 'headline' | 'custom-id' | 'id' | 'external-url' | 'plain' | nil
 ---@alias OrgUrlTargetType 'headline' | 'custom-id' | 'line-number' | 'unknown' | nil
 
@@ -116,7 +117,7 @@ function Url:get_file()
   if not self:is_file() then
     return nil
   end
-  return self.path
+  return self.realpath or self.path
 end
 
 ---@return string | nil
@@ -246,8 +247,12 @@ function Url:_parse_path_type()
     return
   end
 
-  if first_char == '.' and (self.path:sub(1, 3) == '../' or self.path:sub(1, 2) == './') then
+  if
+    (first_char == '.' and (self.path:sub(1, 3) == '../' or self.path:sub(1, 2) == './'))
+    or (first_char == '~' and self.path:sub(2, 2) == '/')
+  then
     self.path_type = 'file'
+    self.realpath = fs.substitute_path(self.path) or self.path
     return
   end