fix: cleaned up rename logic, ref replace working

Author: neo451

lua/obsidian/lsp/handlers/completion.lua

@@ -69,7 +69,8 @@ local function gen_ref_item(label, path, new_text, range, style, is_snippet)
     insertTextFormat = 2, -- is snippet TODO: extract to config option
     textEdit = {
       range = range,
-      newText = insert_snippet_marker(new_text, style),
+      newText = new_text,
+      -- insert_snippet_marker(new_text, style),
     },
     labelDetails = { description = "Obsidian" },
     data = {

lua/obsidian/lsp/handlers/rename.lua

@@ -1,50 +1,10 @@
--- TODO: move to the idea of textEdits
-
 local lsp = vim.lsp
-local ms = lsp.protocol.Methods
-
----@type lsp.WorkspaceEdit
-local edits = {
-  documentChanges = {
-    {
-      kind = "rename",
-      oldUri = vim.uri_from_bufnr(vim.api.nvim_get_current_buf()),
-      newUri = vim.uri_from_fname "/home/n451/test3.lua",
-    },
-  },
-}
-
--- lsp.util.apply_workspace_edit(edits, "utf-8")
-
--- local function rename()
--- lsp.buf_request(0, ms.workspace_didRenameFiles, params, function(...)
--- 	vim.print(...)
--- end)
--- end
-
--- Search notes on disk for any references to `cur_note_id`.
--- We look for the following forms of references:
--- * '[[cur_note_id]]'
--- * '[[cur_note_id|ALIAS]]'
--- * '[[cur_note_id\|ALIAS]]' (a wiki link within a table)
--- * '[ALIAS](cur_note_id)'
--- And all of the above with relative paths (from the vault root) to the note instead of just the note ID,
--- with and without the ".md" suffix.
--- Another possible form is [[ALIAS]], but we don't change the note's aliases when renaming
--- so those links will still be valid.
----@param ref_link string
----@return string[]
-local function get_ref_forms(ref_link)
-  return {
-    "[[" .. ref_link .. "]]",
-    "[[" .. ref_link .. "|",
-    "[[" .. ref_link .. "\\|",
-    "[[" .. ref_link .. "#",
-    "](" .. ref_link .. ")",
-    "](" .. ref_link .. "#",
-  }
-end
+local Path = require "obsidian.path"
+local Note = require "obsidian.note"
+local search = require "obsidian.search"
 
+---@param old_uri string
+---@param new_uri string
 local function rename_file(old_uri, new_uri)
   ---@type lsp.WorkspaceEdit
   local edit = {
@@ -57,12 +17,27 @@ local function rename_file(old_uri, new_uri)
     },
   }
 
-  vim.lsp.util.apply_workspace_edit(edit, "utf-8")
+  lsp.util.apply_workspace_edit(edit, "utf-8")
 end
 
-local Path = require "obsidian.path"
-local Note = require "obsidian.note"
-local search = require "obsidian.search"
+-- Search notes on disk for any references to `cur_note_id`.
+-- We look for the following forms of references:
+-- * '[[cur_note_id]]'
+-- * '[[cur_note_id|ALIAS]]'
+-- * '[[cur_note_id\|ALIAS]]' (a wiki link within a table)
+-- * '[ALIAS](cur_note_id)'
+-- And all of the above with relative paths (from the vault root) to the note instead of just the note ID,
+-- with and without the ".md" suffix.
+-- Another possible form is [[ALIAS]], but we don't change the note's aliases when renaming
+-- so those links will still be valid.
+local ref_patterns = {
+  "[[%s]]", -- wiki
+  "[[%s|", -- wiki with alias
+  "[[%s\\|", -- wiki link within a table
+  "[[%s#", -- wiki with heading
+  "](%s)", -- markdown
+  "](%s#", -- markdown with heading
+}
 
 ---@param client obsidian.Client
 ---@param params table
@@ -83,63 +58,64 @@ local function rename_current_note(client, params)
   local cur_note_rel_path = tostring(client:vault_relative_path(cur_note_path, { strict = true }))
   local new_note_rel_path = tostring(client:vault_relative_path(new_note_path, { strict = true }))
 
-  local pats = {
-    "[[%s]]", -- wiki
-    "[[%s|", -- wiki with display
-    "[[%s\\|", -- ?
-    "[[%s#", -- wiki with heading
-    "](%s)", -- markdown
-    "](%s#", -- markdown with heading
-  }
-
   local replace_lookup = {}
 
-  for _, pat in ipairs(pats) do
+  for _, pat in ipairs(ref_patterns) do
     replace_lookup[pat:format(cur_note_id)] = pat:format(new_note_id)
     replace_lookup[pat:format(cur_note_rel_path)] = pat:format(new_note_rel_path)
     replace_lookup[pat:format(cur_note_rel_path:sub(1, -4))] = pat:format(new_note_rel_path:sub(1, -4))
   end
 
   local reference_forms = vim.tbl_keys(replace_lookup)
 
-  -- search.search_async(
-  --   client.dir,
-  --   reference_forms,
-  --   search.SearchOpts.from_tbl { fixed_strings = true, max_count_per_file = 1 },
-  --   function(match)
-  --     local file = match.path.text
-  --     local line = match.line_number
-  --     local start, _end = match.submatches[1].start, match.submatches[1]["end"]
-  --     local matched = match.submatches[1].match.text
-  --
-  --     handler(nil, {
-  --       changes = {
-  --         [vim.uri_from_fname(file)] = {
-  --           range = {
-  --             start = { line = line, character = start },
-  --             ["end"] = { line = line, character = _end },
-  --           },
-  --           newText = replace_lookup[matched],
-  --         },
-  --       },
-  --     })
-  --   end,
-  --   function(_)
-  --     -- all_tasks_submitted = true
-  --   end
-  -- )
-
+  search.search_async(
+    client.dir,
+    reference_forms,
+    search.SearchOpts.from_tbl { fixed_strings = true, max_count_per_file = 1 },
+    vim.schedule_wrap(function(match)
+      local file = match.path.text
+      local line = match.line_number - 1
+      local start, _end = match.submatches[1].start, match.submatches[1]["end"]
+      local matched = match.submatches[1].match.text
+      local edit = {
+        documentChanges = {
+          {
+            textDocument = {
+              uri = vim.uri_from_fname(file),
+            },
+            edits = {
+              {
+                range = {
+                  start = { line = line, character = start },
+                  ["end"] = { line = line, character = _end },
+                },
+                newText = replace_lookup[matched],
+              },
+            },
+          },
+        },
+      }
+      lsp.util.apply_workspace_edit(edit, "utf-8")
+    end),
+    function(_)
+      -- TODO: conclude the rename
+      -- all_tasks_submitted = true
+    end
+  )
   rename_file(uri, vim.uri_from_fname(new_path))
+
+  local note = client:current_note()
+  note.id = new_note_id
 end
 
 local function rename_note_at_cursor(params) end
 
 ---@param client obsidian.Client
 ---@param params table
----@param handler function
-return function(client, params, handler, _)
+return function(client, params, _, _)
   local position = params.position
 
+  -- TODO: check if cursor on link
   rename_current_note(client, params)
 
   -- require "obsidian.commands.rename"(obsidian_client, { args = params.newName })