Copilot.vim 1.27.0

tpope · tpope · commit 7097b09e5262 · 2024-04-05T00:14:11.000Z
diff --git a/autoload/copilot.vim b/autoload/copilot.vim
@@ -187,7 +187,6 @@ endfunction
 function! copilot#Enabled() abort
   return get(g:, 'copilot_enabled', 1)
         \ && empty(s:BufferDisabled())
-        \ && empty(copilot#Agent().StartupError())
 endfunction
 
 function! copilot#Complete(...) abort
@@ -362,7 +361,7 @@ function! s:UpdatePreview() abort
       endif
       let data.hl_mode = 'combine'
       call nvim_buf_set_extmark(0, copilot#NvimNs(), line('.')-1, col('.')-1, data)
-    else
+    elseif s:has_vim_ghost_text
       call prop_add(line('.'), col('.'), {'type': s:hlgroup, 'text': text[0]})
       for line in text[1:]
         call prop_add(line('.'), 0, {'type': s:hlgroup, 'text_align': 'below', 'text': line})
@@ -412,7 +411,7 @@ function! s:Trigger(bufnr, timer) abort
 endfunction
 
 function! copilot#Schedule(...) abort
-  if !s:has_ghost_text || !copilot#Enabled()
+  if !s:has_ghost_text || !s:Running() || !copilot#Enabled()
     call copilot#Clear()
     return
   endif
diff --git a/autoload/copilot/agent.vim b/autoload/copilot/agent.vim
@@ -495,7 +495,7 @@ function! copilot#agent#EditorInfo() abort
     if has('nvim')
       let s:editor_version = matchstr(execute('version'), 'NVIM v\zs[^[:space:]]\+')
     else
-      let s:editor_version = (v:version / 100) . '.' . (v:version % 100) . (exists('v:versionlong') ? printf('.%04d', v:versionlong % 1000) : '')
+      let s:editor_version = (v:version / 100) . '.' . (v:version % 100) . (exists('v:versionlong') ? printf('.%04d', v:versionlong % 10000) : '')
     endif
   endif
   return {'name': has('nvim') ? 'Neovim': 'Vim', 'version': s:editor_version}
@@ -557,7 +557,6 @@ function! s:AgentStartupError() dict abort
 endfunction
 
 function! s:StatusNotification(params, agent) abort
-  call copilot#logger#Info('StatusNotification ' . string(a:params))
   let a:agent.status = a:params
 endfunction
 
diff --git a/autoload/copilot/panel.vim b/autoload/copilot/panel.vim
@@ -7,7 +7,7 @@ endif
 let s:separator = repeat('&#9472;', 72)
 
 function! s:Solutions(state) abort
-  return sort(values(get(a:state, 'solutions', {})), { a, b -> a.score < b.score })
+  return sort(values(get(a:state, 'solutions', {})), { a, b -> a.score != b.score ? b.score - a.score : a._index - b._index })
 endfunction
 
 function! s:Render(panel_id) abort
@@ -21,8 +21,8 @@ function! s:Render(panel_id) abort
     let lines = ['Error: ' . state.status]
   else
     let target = get(state, 'count_target', '?')
-    let received = has_key(state, 'status') ? target : len(sorted)
-    let lines = ['Synthesiz' . (has_key(state, 'status') ? 'ed ' : 'ing ') . received . '/' . target . ' solutions (Duplicates hidden)']
+    let received = state.count_received
+    let lines = ['Synthesiz' . (has_key(state, 'status') ? 'ed ' : 'ing ') . received . '/' . target . ' completions (Duplicates hidden)']
   endif
   if len(sorted)
     call add(lines, 'Press <CR> on a solution to accept')
@@ -44,7 +44,11 @@ function! copilot#panel#Solution(params, ...) abort
   if !bufloaded(a:params.panelId) || type(state) != v:t_dict
     return
   endif
-  let state.solutions[a:params.solutionId] = a:params
+  let state.count_received += 1
+  if !has_key(state.solutions, a:params.solutionId) || state.solutions[a:params.solutionId].score < a:params.score
+    let a:params._index = state.count_received
+    let state.solutions[a:params.solutionId] = a:params
+  endif
   call s:Render(a:params.panelId)
 endfunction
 
@@ -78,12 +82,12 @@ function! copilot#panel#Accept(...) abort
     let solution = solutions[solution_index - 1]
     let lnum = solution.range.start.line + 1
     if getbufline(state.bufnr, lnum) !=# [state.line]
-      return 'echoerr "Buffer has changed since synthesizing solution"'
+      return 'echoerr "Buffer has changed since synthesizing completion"'
     endif
     let lines = split(solution.completionText, "\n", 1)
-    let old_first = getline(solution.range.start.line + 1)
+    let old_first = getbufline(state.bufnr, solution.range.start.line + 1)[0]
     let lines[0] = strpart(old_first, 0, copilot#doc#UTF16ToByteIdx(old_first, solution.range.start.character)) . lines[0]
-    let old_last = getline(solution.range.end.line + 1)
+    let old_last = getbufline(state.bufnr, solution.range.end.line + 1)[0]
     let lines[-1] .= strpart(old_last, copilot#doc#UTF16ToByteIdx(old_last, solution.range.start.character))
     call setbufline(state.bufnr, solution.range.start.line + 1, lines[0])
     call appendbufline(state.bufnr, solution.range.start.line + 1, lines[1:-1])
@@ -126,16 +130,18 @@ endfunction
 
 function! copilot#panel#Open(opts) abort
   let s:panel_id += 1
-  let state = {'solutions': {}, 'filetype': &filetype, 'line': getline('.'), 'bufnr': bufnr(''), 'tabstop': &tabstop}
+  let state = {'solutions': {}, 'filetype': &filetype, 'was_insert': mode() =~# '^[iR]', 'bufnr': bufnr(''), 'tabstop': &tabstop}
+  let state.line = getline(state.was_insert ? '.' : a:opts.line1)
   let bufname = 'copilot:///panel/' . s:panel_id
   let params = copilot#doc#Params({'panelId': bufname})
-  let state.was_insert = mode() =~# '^[iR]'
   if state.was_insert
     stopinsert
   else
-    let params.doc.position.character = copilot#doc#UTF16Width(state.line)
-    let params.position.character = params.doc.position.character
+    let params.position.line = a:opts.line1 > 0 ? a:opts.line1 - 1 : 0
+    let params.position.character = copilot#doc#UTF16Width(state.line)
   endif
+  let params.doc.position = params.position
+  let state.count_received = 0
   let response = copilot#Request('getPanelCompletions', params).Wait()
   if response.status ==# 'error'
     return 'echoerr ' . string(response.error.message)
diff --git a/autoload/copilot/version.vim b/autoload/copilot/version.vim
@@ -1,3 +1,3 @@
 function! copilot#version#String() abort
-  return '1.26.0'
+  return '1.27.0'
 endfunction
diff --git a/dist/agent.js b/dist/agent.js
diff --git a/dist/agent.js.map b/dist/agent.js.map
