Copilot.vim 1.5.0

Author: tpope

README.md

@@ -1,48 +1,65 @@
 # Copilot.vim
 
 GitHub Copilot uses OpenAI Codex to suggest code and entire functions in
-real-time right from your editor. Trained on billions of lines of public code,
-GitHub Copilot turns natural language prompts including comments and method
-names into coding suggestions across dozens of languages.
+real-time right from your editor.  Trained on billions of lines of public
+code, GitHub Copilot turns natural language prompts including comments and
+method names into coding suggestions across dozens of languages.
 
-Copilot.vim is a Vim plugin for GitHub Copilot.  For now, it requires Neovim
-0.6 (for virtual lines support) and a Node.js installation.
+Copilot.vim is a Vim/Neovim plugin for GitHub Copilot.
 
 To learn more, visit
 [github.com/features/copilot](https://github.com/features/copilot).
 
 ## Subscription
 
-GitHub Copilot requires a subscription. It is free for verified students and
+GitHub Copilot requires a subscription.  It is free for verified students and
 maintainers of popular open source projects on GitHub.
 
+GitHub Copilot is subject to the [GitHub Additional Product
+Terms](https://docs.github.com/en/site-policy/github-terms/github-terms-for-additional-products-and-features).
+
 ## Getting started
 
-1.  Install [Neovim][].
+1.  Install [Neovim][] or the latest patch of [Vim][] (9.0.0162 or newer).
 
 2.  Install [Node.js][] version 16.  (Other versions should work too, except
     Node 18 which isn't supported yet.)
 
 3.  Install `github/copilot.vim` using vim-plug, packer.nvim, or any other
-    plugin manager.  Or to install directly:
+    plugin manager.  Or to install manually, run one of the following
+    commands:
+
+    * Vim, Linux/macOS:
+
+          git clone https://github.com/github/copilot.vim.git \
+            ~/.vim/pack/github/start/copilot.vim
+
+    * Neovim, Linux/macOS:
+
+          git clone https://github.com/github/copilot.vim.git \
+            ~/.config/nvim/pack/github/start/copilot.vim
 
-        git clone https://github.com/github/copilot.vim.git \
-          ~/.config/nvim/pack/github/start/copilot.vim
+    * Vim, Windows (PowerShell command):
+
+          git clone https://github.com/github/copilot.vim.git `
+            $HOME/vimfiles/pack/github/start/copilot.vim
+
+    * Neovim, Windows (PowerShell command):
+
+          git clone https://github.com/github/copilot.vim.git `
+            $HOME/AppData/Local/nvim/pack/github/start/copilot.vim
 
 4.  Start Neovim and invoke `:Copilot setup`.
 
 [Node.js]: https://nodejs.org/en/download/
 [Neovim]: https://github.com/neovim/neovim/releases/latest
+[Vim]: https://github.com/vim/vim
 
 Suggestions are displayed inline and can be accepted by pressing the tab key.
 See `:help copilot` for more information.
 
-GitHub Copilot is subject to the [GitHub Additional Product
-Terms](https://docs.github.com/en/site-policy/github-terms/github-terms-for-additional-products-and-features).
-
-
 ## Troubleshooting
 
-We’d love to get your help in making GitHub Copilot better! If you have
+We’d love to get your help in making GitHub Copilot better!  If you have
 feedback or encounter any problems, please reach out on our [Feedback
 forum](https://github.com/github-community/community/discussions/categories/copilot).

autoload/copilot.vim

@@ -5,9 +5,19 @@ let g:autoloaded_copilot = 1
 
 scriptencoding utf-8
 
-let s:has_ghost_text = has('nvim-0.6') && exists('*nvim_buf_get_mark')
+let s:has_nvim_ghost_text = has('nvim-0.6') && exists('*nvim_buf_get_mark')
+let s:has_vim_ghost_text = has('patch-9.0.0162') && has('textprop')
+let s:has_ghost_text = s:has_nvim_ghost_text || s:has_vim_ghost_text
 
 let s:hlgroup = 'CopilotSuggestion'
+let s:annot_hlgroup = 'CopilotAnnotation'
+
+if s:has_vim_ghost_text && empty(prop_type_get(s:hlgroup))
+  call prop_type_add(s:hlgroup, {'highlight': s:hlgroup})
+endif
+if s:has_vim_ghost_text && empty(prop_type_get(s:annot_hlgroup))
+  call prop_type_add(s:annot_hlgroup, {'highlight': s:annot_hlgroup})
+endif
 
 if len($XDG_CONFIG_HOME)
   let s:config_root = $XDG_CONFIG_HOME
@@ -205,15 +215,16 @@ function! s:SuggestionTextWithAdjustments() abort
       return ['', 0, 0, '']
     endif
     let typed = strpart(line, 0, offset)
-    let delete = strchars(strpart(line, offset))
+    let delete = strpart(line, offset)
     let uuid = get(choice, 'uuid', '')
-    if typed ==# strpart(choice.text, 0, offset)
-      return [strpart(choice.text, offset), 0, delete, uuid]
-    elseif typed =~# '^\s*$'
+    if typed =~# '^\s*$'
       let leading = matchstr(choice.text, '^\s\+')
-      if strpart(typed, 0, len(leading)) == leading
-        return [strpart(choice.text, len(leading)), len(typed) - len(leading), delete, uuid]
+      let unindented = strpart(choice.text, len(leading))
+      if strpart(typed, 0, len(leading)) == leading && unindented !=# delete
+        return [unindented, len(typed) - len(leading), strchars(delete), uuid]
       endif
+    elseif typed ==# strpart(choice.text, 0, offset)
+      return [strpart(choice.text, offset), 0, strchars(delete), uuid]
     endif
   catch
     call copilot#logger#Exception()
@@ -330,8 +341,11 @@ function! s:WindowPreview(lines, outdent, delete, ...) abort
 endfunction
 
 function! s:ClearPreview() abort
-  if exists('*nvim_buf_del_extmark')
+  if s:has_nvim_ghost_text
     call nvim_buf_del_extmark(0, copilot#NvimNs(), 1)
+  elseif s:has_vim_ghost_text
+    call prop_remove({'type': s:hlgroup, 'all': v:true})
+    call prop_remove({'type': s:annot_hlgroup, 'all': v:true})
   endif
 endfunction
 
@@ -349,24 +363,36 @@ function! s:UpdatePreview() abort
       return s:ClearPreview()
     endif
     if exists('b:_copilot.cycling_callbacks')
-      let annot = [[' '], ['(1/…)', 'CopilotAnnotation']]
+      let annot = '(1/…)'
     elseif exists('b:_copilot.cycling')
-      let annot = [[' '], ['(' . (b:_copilot.choice + 1) . '/' . len(b:_copilot.suggestions) . ')', 'CopilotAnnotation']]
+      let annot = '(' . (b:_copilot.choice + 1) . '/' . len(b:_copilot.suggestions) . ')'
     else
-      let annot = []
+      let annot = ''
     endif
-    let data = {'id': 1}
-    let data.virt_text_win_col = virtcol('.') - 1
-    let data.virt_text = [[text[0] . repeat(' ', delete - len(text[0])), s:hlgroup]]
-    if len(text) > 1
-      let data.virt_lines = map(text[1:-1], { _, l -> [[l, s:hlgroup]] })
-      let data.virt_lines[-1] += annot
+    call s:ClearPreview()
+    if s:has_nvim_ghost_text
+      let data = {'id': 1}
+      let data.virt_text_win_col = virtcol('.') - 1
+      let data.virt_text = [[text[0] . repeat(' ', delete - len(text[0])), s:hlgroup]]
+      if len(text) > 1
+        let data.virt_lines = map(text[1:-1], { _, l -> [[l, s:hlgroup]] })
+        if !empty(annot)
+          let data.virt_lines[-1] += [[' '], [annot, s:annot_hlgroup]]
+        endif
+      elseif len(annot)
+        let data.virt_text += [[' '], [annot, s:annot_hlgroup]]
+      endif
+      let data.hl_mode = 'combine'
+      call nvim_buf_set_extmark(0, copilot#NvimNs(), line('.')-1, col('.')-1, data)
     else
-      let data.virt_text += annot
+      call prop_add(line('.'), col('.'), {'type': s:hlgroup, 'text': text[0]})
+      for line in text[1:]
+        call prop_add(line('.'), col('.'), {'type': s:hlgroup, 'text_align': 'below', 'text': line})
+      endfor
+      if !empty(annot)
+        call prop_add(line('.'), col('$'), {'type': s:annot_hlgroup, 'text': ' ' . annot[1][0]})
+      endif
     endif
-    let data.hl_mode = 'combine'
-    call nvim_buf_del_extmark(0, copilot#NvimNs(), 1)
-    call nvim_buf_set_extmark(0, copilot#NvimNs(), line('.')-1, col('.')-1, data)
     if uuid !=# get(s:, 'uuid', '')
       let s:uuid = uuid
       call copilot#Request('notifyShown', {'uuid': uuid})

autoload/copilot/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.4.3'
+let s:plugin_version = '1.5.0'
 
 let s:error_exit = -1
 

copilot/dist/agent.js

@@ -17,6 +17,7 @@ function! s:ColorScheme() abort
   else
     hi def CopilotSuggestion guifg=#808080 ctermfg=8
   endif
+  hi def link CopilotAnnotation Normal
 endfunction
 
 function! s:MapTab() abort