Copilot.vim 1.5.4

Author: tpope

README.md

@@ -20,7 +20,7 @@ Terms](https://docs.github.com/en/site-policy/github-terms/github-terms-for-addi
 
 ## Getting started
 
-1.  Install [Neovim][] or the latest patch of [Vim][] (9.0.0162 or newer).
+1.  Install [Neovim][] or the latest patch of [Vim][] (9.0.0185 or newer).
 
 2.  Install [Node.js][] version 16.  (Other versions should work too, except
     Node 18 which isn't supported yet.)

autoload/copilot.vim

@@ -6,7 +6,7 @@ let g:autoloaded_copilot = 1
 scriptencoding utf-8
 
 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_vim_ghost_text = has('patch-9.0.0185') && has('textprop')
 let s:has_ghost_text = s:has_nvim_ghost_text || s:has_vim_ghost_text
 
 let s:hlgroup = 'CopilotSuggestion'
@@ -374,10 +374,10 @@ function! s:UpdatePreview() abort
     else
       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})
+        call prop_add(line('.'), 0, {'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]})
+        call prop_add(line('.'), col('$'), {'type': s:annot_hlgroup, 'text': ' ' . annot})
       endif
     endif
     if uuid !=# get(s:, 'uuid', '')
@@ -656,33 +656,6 @@ function! s:commands.setup(opts) abort
 
   let user = get(status, 'user', '<unknown>')
 
-  if status.status ==# 'NoTelemetryConsent'
-    let terms_url = "https://github.co/copilot-telemetry-terms"
-    echo "I agree to these telemetry terms as part of the GitHub Copilot technical preview."
-    echo "<" . terms_url . ">"
-    let prompt = '[a]gree/[r]efuse'
-    if len(browser)
-      let prompt .= '/[o]pen in browser'
-    endif
-    while 1
-      let input = input(prompt . '> ')
-      if input =~# '^r'
-        redraw
-        return 'echoerr ' . string('Copilot: Terms must be accepted.')
-      elseif input =~# '^[ob]' && len(browser)
-        if copilot#job#Stream(browser + [terms_url], v:null, v:null) != 0
-          echo "\nCould not open browser."
-        endif
-      elseif input =~# '^a'
-        break
-      else
-        echo "\nUnrecognized response."
-      endif
-    endwhile
-    redraw
-    call copilot#Call('recordTelemetryConsent', {})
-  endif
-
   echo 'Copilot: Authenticated as GitHub user ' . user
 endfunction
 

autoload/copilot/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.5.3'
+let s:plugin_version = '1.5.4'
 
 let s:error_exit = -1
 
@@ -395,6 +395,10 @@ function! s:Command() abort
   return [node + [agent], node_version, '']
 endfunction
 
+function! s:UrlDecode(str) abort
+  return substitute(a:str, '%\(\x\x\)', '\=iconv(nr2char("0x".submatch(1)), "utf-8", "latin1")', 'g')
+endfunction
+
 function! copilot#agent#EditorInfo() abort
   if !exists('s:editor_version')
     if has('nvim')
@@ -403,9 +407,23 @@ function! copilot#agent#EditorInfo() abort
       let s:editor_version = (v:version / 100) . '.' . (v:version % 100) . (exists('v:versionlong') ? printf('.%04d', v:versionlong % 1000) : '')
     endif
   endif
-  return {
+  let info = {
         \ 'editorInfo': {'name': has('nvim') ? 'Neovim': 'Vim', 'version': s:editor_version},
         \ 'editorPluginInfo': {'name': 'copilot.vim', 'version': s:plugin_version}}
+  if type(get(g:, 'copilot_proxy')) == v:t_string
+    let proxy = g:copilot_proxy
+  else
+    let proxy = ''
+  endif
+  let match = matchlist(proxy, '\C^\%([^:]\+://\)\=\%(\([^/:#]\+@\)\)\=\%(\([^/:#]\+\)\|\[\([[:xdigit:]:]\+\)\]\)\%(:\(\d\+\)\)\=\%(/\|$\)')
+  if !empty(match)
+    let info.networkProxy = {'host': match[2] . match[3], 'port': empty(match[4]) ? 80 : match[4]}
+    if !empty(match[1])
+      let info.networkProxy.username = s:UrlDecode(matchstr(match[1], '^[^:]*'))
+      let info.networkProxy.password = s:UrlDecode(matchstr(match[1], ':\zs.*'))
+    endif
+  endif
+  return info
 endfunction
 
 function! s:GetCapabilitiesResult(result, agent) abort

copilot/dist/agent.js

@@ -73,7 +73,14 @@ g:copilot_node_command  Tell Copilot what `node` binary to use with
 >
                         let g:copilot_node_command =
                               \ "~/.nodenv/versions/16.15.0/bin/node"
-
+<
+                                                *g:copilot_proxy*
+g:copilot_proxy         Tell Copilot what proxy server to use.  This is a
+                        string in the format of `hostname:port` or
+                        `username:password@host:port`.
+>
+                        let g:copilot_proxy = 'localhost:3128'
+<
 MAPS                                            *copilot-maps*
 
                                                 *copilot-i_<Tab>*