Copilot.vim 1.0.4

Author: tpope

README.md

@@ -5,8 +5,8 @@ entire function bodies as you type. GitHub Copilot is powered by the OpenAI
 Codex AI system, trained on public Internet text and billions of lines of
 code.
 
-Copilot.vim is a Vim plugin for GitHub Copilot.  For now, it requires a Neovim
-0.6 prerelease (for virtual lines support) and a Node.js installation.
+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.
 
 To learn more about GitHub Copilot, visit https://copilot.github.com.
 
@@ -25,11 +25,9 @@ Service](https://docs.github.com/en/github/site-policy/github-terms-of-service#j
 
 ## Getting started
 
-1.  Install [Node.js][] v12 or newer.
+1.  Install [Node.js][] 12 or newer.
 
-2.  Install a [Neovim prerelease build][].  (Note: On macOS, [extra steps][]
-    are required to due to lack of notarization. Alternatively, Homebrew users
-    can run `brew install neovim --HEAD`).
+2.  Install [Neovim][] 0.6 or newer.
 
 3.  Install `github/copilot.vim` using vim-plug, packer.nvim, or any other
     plugin manager.  Or to install directly:
@@ -40,8 +38,7 @@ Service](https://docs.github.com/en/github/site-policy/github-terms-of-service#j
 4.  Start Neovim and invoke `:Copilot setup`.
 
 [Node.js]: https://nodejs.org/en/download/
-[Neovim prerelease build]: https://github.com/github/copilot.vim/releases/tag/neovim-nightlies
-[extra steps]: https://github.com/neovim/neovim/issues/11011#issuecomment-786413100
+[Neovim]: https://github.com/neovim/neovim/releases/latest
 
 Suggestions are displayed inline and can be accepted by pressing the tab key.
 See `:help copilot` for more information.

autoload/copilot.vim

@@ -43,7 +43,7 @@ function! s:OAuthToken() abort
   endif
   if getfsize(s:config_hosts) > 0
     try
-      let s:github = get(json_decode(join(readfile(s:config_hosts))), 'github.com')
+      let s:github = get(json_decode(join(readfile(s:config_hosts))), 'github.com', {})
     catch
       let s:github = {}
     endtry
@@ -130,60 +130,6 @@ function! s:TermsAccepted(force_reload) abort
   return s:terms_accepted
 endfunction
 
-function! s:AuthException(response, ...) abort
-  unlet! s:auth_request
-endfunction
-
-function! s:AuthCallback(response, ...) abort
-  unlet! s:auth_request
-  let data = s:JsonBody(a:response)
-  if a:response.status == 404
-    call s:OAuthSave('', '')
-  elseif has_key(data, 'token')
-    let s:auth_data = data
-  endif
-endfunction
-
-function! s:AuthRefresh() abort
-  let token = s:OAuthToken()
-  if !empty(token)
-    if exists('s:auth_request')
-      return
-    endif
-    let s:auth_request = copilot#HttpRequest(
-          \ 'https://api.github.com/copilot_internal/token',
-          \ {'headers': {'Authorization': 'Bearer ' . token}},
-          \ function('s:AuthCallback'),
-          \ function('s:AuthException'))
-  endif
-endfunction
-
-function! s:AuthFetch() abort
-  let auth = get(s:, 'auth_data', {})
-  if get(auth, 'expires_at') < localtime() - 1800
-    call s:AuthRefresh()
-    return exists('s:auth_request')
-  elseif get(auth, 'expires_at') < localtime() - 7200
-    call s:AuthRefresh()
-    return 0
-  endif
-endfunction
-
-function! s:Auth() abort
-  if s:AuthFetch()
-    call s:auth_request.Wait()
-  endif
-  if get(get(s:, 'auth_data', {}), 'expires_at') > localtime() + 600
-    return s:auth_data
-  else
-    unlet! s:auth_data
-    return {}
-  endif
-endfunction
-
-unlet! s:auth_data
-unlet! s:auth_request
-
 function! copilot#NvimNs() abort
   return nvim_create_namespace('github-copilot')
 endfunction
@@ -244,17 +190,11 @@ function! copilot#Enabled() abort
 endfunction
 
 function! copilot#Request(method, params, ...) abort
-  let params = copy(a:params)
-  let auth = s:Auth()
-  if !empty(auth) && !has_key(params, 'token')
-    let params.token = auth.token
-  endif
-  return call('copilot#agent#Request', [a:method, params] + a:000)
+  return call('copilot#agent#Request', [a:method, a:params] + a:000)
 endfunction
 
 function! copilot#Call(method, params, ...) abort
-  let request = call('copilot#Request', [a:method, a:params] + a:000)
-  return a:0 ? request : request.Await()
+  return call('copilot#agent#Call', [a:method, a:params] + a:000)
 endfunction
 
 function! copilot#Complete(...) abort
@@ -266,12 +206,8 @@ function! copilot#Complete(...) abort
   endif
   let doc = copilot#doc#Get()
   if !exists('g:_copilot_completion.params.doc') || g:_copilot_completion.params.doc !=# doc
-    let auth = s:Auth()
-    if empty(auth)
-      return {}
-    endif
     let g:_copilot_completion =
-          \ copilot#agent#Request('getCompletions', {'doc': doc, 'options': {}, 'token': auth.token})
+          \ copilot#agent#Request('getCompletions', {'doc': doc, 'options': {}})
     let g:_copilot_last_completion = g:_copilot_completion
   endif
   let completion = g:_copilot_completion
@@ -316,6 +252,14 @@ function! s:SuggestionTextWithAdjustments() abort
   return ['', 0, 0]
 endfunction
 
+function! copilot#GetDisplayedSuggestion() abort
+  let [text, outdent, delete] = s:SuggestionTextWithAdjustments()
+  return {
+        \ 'text': text,
+        \ 'outdentSize': outdent,
+        \ 'deleteSize': delete}
+endfunction
+
 let s:dest = 0
 function! s:WindowPreview(lines, outdent, delete, ...) abort
   try
@@ -425,7 +369,6 @@ function! copilot#Schedule(...) abort
   if !s:is_mapped || !s:dest || !copilot#Enabled()
     return
   endif
-  call s:AuthFetch()
   let delay = a:0 ? a:1 : get(g:, 'copilot_idle_delay', 75)
   let g:_copilot_timer = timer_start(delay, function('s:Trigger', [bufnr('')]))
 endfunction
@@ -452,7 +395,7 @@ function! copilot#OnCursorMovedI() abort
   return copilot#Schedule()
 endfunction
 
-function! copilot#SuggestionText() abort
+function! copilot#TextQueuedForInsertion() abort
   try
     return remove(s:, 'suggestion_text')
   catch
@@ -461,13 +404,13 @@ function! copilot#SuggestionText() abort
 endfunction
 
 function! copilot#Accept(...) abort
-  let [text, outdent, delete] = s:SuggestionTextWithAdjustments()
-  if !empty(text)
+  let s = copilot#GetDisplayedSuggestion()
+  if !empty(s.text)
     unlet! b:_copilot_suggestion b:_copilot_completion
     call s:ClearPreview()
-    let s:suggestion_text = text
-    return repeat("\<Left>\<Del>", outdent) . repeat("\<Del>", delete) .
-            \ "\<C-R>\<C-O>=copilot#SuggestionText()\<CR>"
+    let s:suggestion_text = s.text
+    return repeat("\<Left>\<Del>", s.outdentSize) . repeat("\<Del>", s.deleteSize) .
+            \ "\<C-R>\<C-O>=copilot#TextQueuedForInsertion()\<CR>"
   endif
   let default = get(g:, 'copilot_tab_fallback', pumvisible() ? "\<C-N>" : "\t")
   if !a:0
@@ -621,7 +564,20 @@ function! s:commands.status(opts) abort
       return
   endif
 
-  echo 'Copilot: Enabled and engaged'
+  echo 'Copilot: Enabled and online'
+endfunction
+
+function! s:commands.signout(opts) abort
+  unlet! s:github
+  if empty(s:OAuthToken())
+    echo 'Copilot: Not signed in'
+  else
+    let user = get(s:github, 'user', '<unknown>')
+    let s:github = {}
+    echo 'Copilot: Signed out as GitHub user ' . user
+  endif
+  call delete(s:config_hosts)
+  call copilot#Call('signOut', {})
 endfunction
 
 function! s:commands.setup(opts) abort
@@ -720,6 +676,7 @@ function! s:commands.setup(opts) abort
     unlet! s:terms_accepted
   endif
 
+  call copilot#Call('checkStatus', {})
   echo 'Copilot: Authenticated as GitHub user ' . s:github.user
 endfunction
 

autoload/copilot/agent.vim

@@ -30,14 +30,7 @@ function! s:AgentClose() dict abort
 endfunction
 
 function! s:LogSend(request, line) abort
-  if type(get(a:request, 'params')) == v:t_dict && has_key(a:request.params, 'token')
-    let request = deepcopy(a:request)
-    let request.params.token = 'REDACTED'
-    let line = json_encode(request)
-  else
-    let line = a:line
-  endif
-  return '--> ' . line
+  return '--> ' . a:line
 endfunction
 
 let s:chansend = function(exists('*chansend') ? 'chansend' : 'ch_sendraw')
@@ -168,7 +161,7 @@ endfunction
 function! s:OnExit(agent, code) abort
   let a:agent.exit_status = a:code
   call remove(a:agent, 'job')
-  for id in sort(keys(a:agent.requests), { a, b -> a > b })
+  for id in sort(keys(a:agent.requests), { a, b -> +a > +b })
     let request = remove(a:agent.requests, id)
     if request.status ==# 'canceled'
       return
@@ -177,7 +170,8 @@ function! s:OnExit(agent, code) abort
     call remove(request, 'resolve')
     let reject = remove(request, 'reject')
     let request.status = 'error'
-    let request.error = {'code': s:error_exit, 'message': 'Agent exited', 'data': {'status': a:code}}
+    let code = a:code < 0 || a:code > 255 ? 256 : a:code
+    let request.error = {'code': code, 'message': 'Agent exited', 'data': {'status': a:code}}
     for Cb in reject
       let request.waiting[timer_start(0, function('s:Callback', [request, 'error', Cb]))] = 1
     endfor
@@ -192,6 +186,20 @@ function! copilot#agent#Close() abort
   endif
 endfunction
 
+unlet! s:is_arm_macos
+function! s:IsArmMacOS() abort
+  if exists('s:is_arm_macos')
+    return s:is_arm_macos
+  elseif has('win32') || !isdirectory('/private')
+    let s:is_arm_macos = 0
+  else
+    let out = []
+    call copilot#job#Stream(['uname', '-s', '-p'], function('add', [out]), v:null)
+    let s:is_arm_macos = get(out, 0, '') ==# 'Darwin arm'
+  endif
+  return s:is_arm_macos
+endfunction
+
 function! s:Command() abort
   if !has('nvim-0.5') && v:version < 802
     return [v:null, 'Vim version too old']
@@ -214,8 +222,12 @@ function! s:Command() abort
     return [v:null, 'Node exited with status ' . status]
   endif
   let major = +matchstr(get(out, 0, ''), '^v\zs\d\+\ze\.')
-  if major < 12
-    return [v:null, 'Node v12+ required but found ' . get(out, 0, 'nothing')]
+  if !get(g:, 'copilot_ignore_node_version')
+    if major < 16 && s:IsArmMacOS()
+      return [v:null, 'Node v16+ required on Apple Silicon but found ' . get(out, 0, 'nothing')]
+    elseif major < 12
+      return [v:null, 'Node v12+ required but found ' . get(out, 0, 'nothing')]
+    endif
   endif
   let agent = s:root . '/copilot/dist/agent.js'
   if !filereadable(agent)

autoload/copilot/doc.vim

@@ -49,7 +49,7 @@ function! copilot#doc#Get() abort
         \ 'indentSize': shiftwidth(),
         \ }
   let line = getline('.')
-  let col_byte = col('.') - (mode() !~# '^[iR]' || empty(line))
+  let col_byte = col('.') - (mode() =~# '^[iR]' || empty(line))
   let col_utf16 = copilot#doc#UTF16Width(strpart(line, 0, col_byte))
   let doc.position = {'line': line('.') - 1, 'character': col_utf16}
   let lines = getline(1, '$')

copilot/dist/agent.js

@@ -23,6 +23,9 @@ COMMANDS                                        *:Copilot*
                                                 *:Copilot_setup*
 :Copilot setup          Authenticate and enable GitHub Copilot.
 
+                                                *:Copilot_signout*
+:Copilot signout        Sign out of GitHub Copilot.
+
                                                 *:Copilot_status*
 :Copilot status         Check if GitHub Copilot is operational for the current
                         buffer and report on any issues.