Copilot.vim 1.3.0

Author: tpope

autoload/copilot.vim

@@ -92,6 +92,15 @@ if !exists('s:github') && $CODESPACES ==# 'true' && len($GITHUB_TOKEN)
   let s:github = {'oauth_token': $GITHUB_TOKEN, 'user': empty($GITHUB_USER) ? 'codespace-user': $GITHUB_USER}
 endif
 
+function! s:StatusNotification(params, ...) abort
+  let status = get(a:params, 'status', '')
+  if status ==? 'error'
+    let s:agent_error = a:params.message
+  else
+    unlet! s:agent_error
+  endif
+endfunction
+
 function! copilot#Init(...) abort
   call timer_start(0, { _ -> s:Start() })
 endfunction
@@ -101,6 +110,7 @@ function! s:Start() abort
     return
   endif
   let s:agent = copilot#agent#New({'notifications': {
+        \ 'statusNotification': function('s:StatusNotification'),
         \ 'PanelSolution': function('copilot#panel#Solution'),
         \ 'PanelSolutionsDone': function('copilot#panel#SolutionsDone'),
         \ }})
@@ -622,8 +632,12 @@ function s:NetworkStatusMessage() abort
     return err
   endif
   try
+    let info = copilot#agent#EditorInfo()
     let response = copilot#HttpRequest('https://copilot-proxy.githubusercontent.com/_ping',
-          \ {'timeout': 5000, 'headers': {'Agent-Version': 'agent/' . copilot#agent#Version()}})
+          \ {'timeout': 5000, 'headers': {
+            \ 'Editor-Version': info.editorInfo.name . '/' . info.editorInfo.version,
+            \ 'Editor-Plugin-Version': info.editorPluginInfo.name . '/' . info.editorPluginInfo.version,
+            \ }})
     if response.status == 466
       return "Server error:\n" . substitute(response.body, "\n$", '', '')
     endif
@@ -695,8 +709,8 @@ function! s:commands.status(opts) abort
       return
   endif
 
-  if has_key(copilot#Agent(), 'upgrade_message')
-    echo 'Copilot: ' . copilot#Agent().upgrade_message
+  if exists('s:agent_error')
+    echo 'Copilot: ' . s:agent_error
     return
   endif
 

autoload/copilot/agent.vim

@@ -5,11 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.2.3'
-
-function! copilot#agent#Version() abort
-  return s:plugin_version
-endfunction
+let s:plugin_version = '1.3.0'
 
 let s:error_exit = -1
 
@@ -169,10 +165,6 @@ function! s:OnMessage(agent, body, ...) abort
         call timer_start(0, { _ -> a:agent.notifications[response.method](params) })
       elseif response.method ==# 'LogMessage'
         call copilot#logger#Raw(get(params, 'level', 3), get(params, 'message', ''))
-        let upgrade_message = matchstr(get(params, 'message', ''), '\<Unhandled status from server:,466,\zs.*')
-        if len(upgrade_message)
-          let a:agent.upgrade_message = upgrade_message
-        endif
       endif
     elseif has_key(a:agent.methods, response.method)
       call timer_start(0, function('s:DispatchMessage', [a:agent, a:agent.methods[response.method], id, params]))

autoload/copilot/doc.vim

@@ -5,6 +5,8 @@ let g:autoloaded_copilot_prompt = 1
 
 scriptencoding utf-8
 
+let s:slash = exists('+shellslash') ? '\' : '/'
+
 function copilot#doc#UTF16Width(str) abort
   return strchars(substitute(a:str, "\\%#=2[^\u0001-\uffff]", "  ", 'g'))
 endfunction
@@ -21,7 +23,7 @@ function copilot#doc#LanguageForFileType(filetype) abort
   return get(s:language_normalization_map, empty(filetype) ? "text" : filetype, filetype)
 endfunction
 
-function! copilot#doc#RelativePath() abort
+function! s:RelativePath(absolute) abort
   if exists('b:copilot_relative_path')
     return b:copilot_relative_path
   elseif exists('b:copilot_root')
@@ -31,20 +33,37 @@ function! copilot#doc#RelativePath() abort
   else
     let root = getcwd()
   endif
-  let root .= '/'
-  let absolute = expand('%:p')
-  if strpart(tr(absolute, 'A-Z\', 'a-z/'), 0, len(root)) ==# tr(root, 'A-Z\', 'a-z/')
-    return strpart(absolute, len(root))
+  let root = tr(root, s:slash, '/') . '/'
+  if strpart(tr(a:absolute, 'A-Z', 'a-z'), 0, len(root)) ==# tr(root, 'A-Z', 'a-z')
+    return strpart(a:absolute, len(root))
   else
-    return expand('%:t')
+    return fnamemodify(a:absolute, ':t')
   endif
 endfunction
 
+function! s:UrlEncode(str) abort
+  return substitute(iconv(a:str, 'latin1', 'utf-8'),'[^A-Za-z0-9._~!$&''()*+,;=:@/-]','\="%".printf("%02X",char2nr(submatch(0)))','g')
+endfunction
+
 function! copilot#doc#Get() abort
+  let absolute = tr(@%, s:slash, '/')
+  if absolute !~# '^\a\+:\|^/\|^$' && &buftype =~# '^\%(nowrite\)\=$'
+    let absolute = substitute(tr(getcwd(), s:slash, '/'), '/\=$', '/', '') . absolute
+  endif
+  if has('win32') && absolute =~# '^\a://\@!'
+    let uri = 'file:///' . strpart(absolute, 0, 2) . s:UrlEncode(strpart(absolute, 2))
+  elseif absolute =~# '^/'
+    let uri = 'file://' . s:UrlEncode(absolute)
+  elseif absolute =~# '^\a[[:alnum:].+-]*:\|^$'
+    let uri = absolute
+  else
+    let uri = ''
+  endif
   let doc = {
         \ 'languageId': copilot#doc#LanguageForFileType(&filetype),
-        \ 'path': expand('%:p'),
-        \ 'relativePath': copilot#doc#RelativePath(),
+        \ 'path': absolute,
+        \ 'uri': uri,
+        \ 'relativePath': s:RelativePath(absolute),
         \ 'insertSpaces': &expandtab ? v:true : v:false,
         \ 'tabSize': shiftwidth(),
         \ 'indentSize': shiftwidth(),