Copilot.vim 1.47.0

tpope · tpope · commit 716795895453 · 2025-04-25T04:59:30.000Z
diff --git a/autoload/copilot.vim b/autoload/copilot.vim
@@ -211,9 +211,9 @@ function! s:SuggestionTextWithAdjustments() abort
     endif
     let delete = strpart(line, offset, end_offset - offset)
     if typed =~# '^\s*$'
-      let leading = matchstr(choice_text, '^\s\+')
+      let leading = strpart(matchstr(choice_text, '^\s\+'), 0, len(typed))
       let unindented = strpart(choice_text, len(leading))
-      if strpart(typed, 0, len(leading)) == leading && unindented !=# delete
+      if strpart(typed, 0, len(leading)) ==# leading && unindented !=# delete
         return [unindented, len(typed) - len(leading), strchars(delete), choice]
       endif
     elseif typed ==# strpart(choice_text, 0, offset)
diff --git a/autoload/copilot/client.vim b/autoload/copilot/client.vim
@@ -469,7 +469,7 @@ function! s:NvimClose() dict abort
     return
   endif
   let self.kill = v:true
-  return luaeval('vim.lsp.get_client_by_id(_A).stop()', self.client_id)
+  return luaeval('vim.lsp.stop_client(_A)', self.client_id)
 endfunction
 
 function! s:NvimNotify(method, params) dict abort
diff --git a/autoload/copilot/panel.vim b/autoload/copilot/panel.vim
@@ -86,9 +86,11 @@ function! copilot#panel#Accept(...) abort
     endif
     let lines = split(item.insertText, "\n", 1)
     let old_first = getbufline(state.bufnr, item.range.start.line + 1)[0]
-    let lines[0] = strpart(old_first, 0, copilot#util#UTF16ToByteIdx(old_first, item.range.start.character)) . lines[0]
+    let byte_offset_start = copilot#util#UTF16ToByteIdx(old_first, item.range.start.character)
+    let lines[0] = strpart(old_first, 0, byte_offset_start) . lines[0]
     let old_last = getbufline(state.bufnr, item.range.end.line + 1)[0]
-    let lines[-1] .= strpart(old_last, copilot#util#UTF16ToByteIdx(old_last, item.range.end.character))
+    let byte_offset_end = copilot#util#UTF16ToByteIdx(old_last, item.range.end.character)
+    let lines[-1] .= strpart(old_last, byte_offset_end)
     call deletebufline(state.bufnr, item.range.start.line + 1, item.range.end.line + 1)
     call appendbufline(state.bufnr, item.range.start.line, lines)
     call copilot#Request('workspace/executeCommand', item.command)
diff --git a/autoload/copilot/version.vim b/autoload/copilot/version.vim
@@ -1,3 +1,3 @@
 function! copilot#version#String() abort
-  return '1.46.0'
+  return '1.47.0'
 endfunction
diff --git a/dist/main.js b/dist/main.js
diff --git a/dist/main.js.map b/dist/main.js.map
diff --git a/lua/_copilot.lua b/lua/_copilot.lua
@@ -28,7 +28,10 @@ copilot.lsp_start_client = function(cmd, handler_names, opts, settings)
   if #workspace_folders == 0 then
     workspace_folders = nil
   end
-  id = (vim.lsp.start or vim.lsp.start_client)({
+  -- start_client() is deprecated, but the replacement start() breaks our
+  -- restart workflow by returning the old client that's shutting down.
+  -- https://github.com/neovim/neovim/issues/33616
+  id = vim.lsp.start_client({
     cmd = cmd,
     cmd_cwd = vim.call('copilot#job#Cwd'),
     name = 'GitHub Copilot',
@@ -60,9 +63,14 @@ copilot.lsp_request = function(client_id, method, params, bufnr)
     bufnr = nil
   end
   local _, id
-  _, id = client.request(method, params, function(err, result)
+  local handler = function(err, result)
     vim.call('copilot#client#LspResponse', client_id, { id = id, error = err, result = result })
-  end, bufnr)
+  end
+  if vim.fn.has('nvim-0.11') == 1 then
+    _, id = client:request(method, params, handler, bufnr)
+  else
+    _, id = client.request(method, params, handler, bufnr)
+  end
   return id
 end
 
