Copilot.vim 1.42.0

Author: tpope

README.md

@@ -1,22 +1,20 @@
 # GitHub Copilot for Vim and Neovim
 
-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.
+GitHub Copilot is an AI pair programmer tool that helps you write code faster
+and smarter. 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/Neovim plugin for GitHub Copilot.
 
 To learn more, visit
 [https://github.com/features/copilot](https://github.com/features/copilot).
 
-## Subscription
+## Getting access to GitHub Copilot
 
-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).
+To access GitHub Copilot, an active GitHub Copilot subscription is required.
+Sign up for [GitHub Copilot Free](https://github.com/settings/copilot), or
+request access from your enterprise admin.
 
 ## Getting started
 

autoload/copilot.vim

@@ -23,17 +23,6 @@ function! s:Echo(msg) abort
   endif
 endfunction
 
-function! s:EditorConfiguration() abort
-  let filetypes = copy(s:filetype_defaults)
-  if type(get(g:, 'copilot_filetypes')) == v:t_dict
-    call extend(filetypes, g:copilot_filetypes)
-  endif
-  return {
-        \ 'enableAutoCompletions': empty(get(g:, 'copilot_enabled', 1)) ? v:false : v:true,
-        \ 'disabledLanguages': map(sort(keys(filter(filetypes, { k, v -> empty(v) }))), { _, v -> {'languageId': v}}),
-        \ }
-endfunction
-
 function! copilot#Init(...) abort
   call copilot#util#Defer({ -> exists('s:client') || s:Start() })
 endfunction
@@ -46,7 +35,7 @@ function! s:Start() abort
   if s:Running() || exists('s:client.startup_error')
     return
   endif
-  let s:client = copilot#client#New({'editorConfiguration' : s:EditorConfiguration()})
+  let s:client = copilot#client#New()
 endfunction
 
 function! s:Stop() abort
@@ -599,20 +588,8 @@ function! s:VerifySetup() abort
     return
   endif
 
-  let status = copilot#Call('checkStatus', {})
-
-  if !has_key(status, 'user')
-    echo 'Copilot: Not authenticated. Invoke :Copilot setup'
-    return
-  endif
-
-  if status.status ==# 'NoTelemetryConsent'
-    echo 'Copilot: Telemetry terms not accepted. Invoke :Copilot setup'
-    return
-  endif
-
-  if status.status ==# 'NotAuthorized'
-    echo "Copilot: You don't have access to GitHub Copilot. Sign up by visiting https://github.com/settings/copilot"
+  if exists('s:client.status.kind') && s:client.status.kind ==# 'Error'
+    echo 'Copilot: Error: ' . get(s:client.status, 'message', 'unknown')
     return
   endif
 
@@ -624,11 +601,8 @@ function! s:commands.status(opts) abort
     return
   endif
 
-  if exists('s:client.status.status') && s:client.status.status =~# 'Warning\|Error'
-    echo 'Copilot: ' . s:client.status.status
-    if !empty(get(s:client.status, 'message', ''))
-      echon ': ' . s:client.status.message
-    endif
+  if exists('s:client.status.kind') && s:client.status.kind ==# 'Warning'
+    echo 'Copilot: Warning: ' . get(s:client.status, 'message', 'unknown')
     return
   endif
 
@@ -643,12 +617,7 @@ function! s:commands.status(opts) abort
 endfunction
 
 function! s:commands.signout(opts) abort
-  let status = copilot#Call('checkStatus', {'options': {'localChecksOnly': v:true}})
-  if has_key(status, 'user')
-    echo 'Copilot: Signed out as GitHub user ' . status.user
-  else
-    echo 'Copilot: Not signed in'
-  endif
+  echo 'Copilot: Signed out'
   call copilot#Call('signOut', {})
 endfunction
 
@@ -659,14 +628,7 @@ function! s:commands.setup(opts) abort
       return
   endif
 
-  let browser = copilot#Browser()
-
-  let status = copilot#Call('checkStatus', {})
-  if has_key(status, 'user')
-    let data = {'status': 'AlreadySignedIn', 'user': status.user}
-  else
-    let data = copilot#Call('signInInitiate', {})
-  endif
+  let data = copilot#Call('signIn', {})
 
   if has_key(data, 'verificationUri')
     let uri = data.verificationUri
@@ -688,24 +650,13 @@ function! s:commands.setup(opts) abort
       endif
       if get(a:opts, 'bang')
         call s:Echo(codemsg . "In your browser, visit " . uri)
-      elseif len(browser)
-        call input(codemsg . "Press ENTER to open GitHub in your browser\n")
-        let status = {}
-        call copilot#job#Stream(browser + [uri], v:null, v:null, function('s:BrowserCallback', [status]))
-        let time = reltime()
-        while empty(status) && reltimefloat(reltime(time)) < 5
-          sleep 10m
-        endwhile
-        if get(status, 'code', browser[0] !=# 'xdg-open') != 0
-          call s:Echo("Failed to open browser.  Visit " . uri)
-        else
-          call s:Echo("Opened " . uri)
-        endif
+        let request = copilot#Request('signInConfirm', {})
       else
-        call s:Echo(codemsg . "Could not find browser.  Visit " . uri)
+        call input(codemsg . "Press ENTER to open GitHub in your browser\n")
+        let request = copilot#Request('workspace/executeCommand', data.command)
       endif
-      call s:Echo("Waiting (could take up to 10 seconds)")
-      let request = copilot#Request('signInConfirm', {'userCode': data.userCode}).Wait()
+      call s:Echo("Waiting for " . data.userCode . " at " . uri . " (could take up to 10 seconds)")
+      call request.Wait()
     finally
       if exists('mouse')
         let &mouse = mouse
@@ -768,16 +719,6 @@ function! s:commands.version(opts) abort
   call s:EditorVersionWarning()
 endfunction
 
-function! s:UpdateEditorConfiguration() abort
-  try
-    if s:Running()
-      call copilot#Notify('notifyChangeConfiguration', {'settings': s:EditorConfiguration()})
-    endif
-  catch
-    call copilot#logger#Exception()
-  endtry
-endfunction
-
 let s:feedback_url = 'https://github.com/orgs/community/discussions/categories/copilot'
 function! s:commands.feedback(opts) abort
   echo s:feedback_url
@@ -795,12 +736,10 @@ endfunction
 
 function! s:commands.disable(opts) abort
   let g:copilot_enabled = 0
-  call s:UpdateEditorConfiguration()
 endfunction
 
 function! s:commands.enable(opts) abort
   let g:copilot_enabled = 1
-  call s:UpdateEditorConfiguration()
 endfunction
 
 function! s:commands.panel(opts) abort

autoload/copilot/client.vim

@@ -550,7 +550,10 @@ function! copilot#client#Settings() abort
     let settings.http.proxy = 'http://' . settings.http.proxy
   endif
   if type(get(g:, 'copilot_settings')) == v:t_dict
-    call extend(settings, g:copilot_settings)
+    let settings.github = {'copilot': g:copilot_settings}
+  endif
+  if type(get(g:, 'copilot_lsp_settings')) == v:t_dict
+    call extend(settings, g:copilot_lsp_settings)
   endif
   return settings
 endfunction
@@ -610,7 +613,7 @@ endfunction
 let s:notifications = {
       \ '$/progress': function('s:Progress'),
       \ 'featureFlagsNotification': function('s:Nop'),
-      \ 'statusNotification': function('s:StatusNotification'),
+      \ 'didChangeStatus': function('s:StatusNotification'),
       \ 'window/logMessage': function('copilot#handlers#window_logMessage'),
       \ }
 
@@ -624,8 +627,8 @@ let s:vim_capabilities = {
       \ 'window': {'showDocument': {'support': v:true}},
       \ }
 
-function! copilot#client#New(...) abort
-  let opts = a:0 ? a:1 : {}
+function! copilot#client#New() abort
+  let opts = {}
   let instance = {'requests': {},
         \ 'progress': {},
         \ 'workspaceFolders': {},
@@ -651,13 +654,12 @@ function! copilot#client#New(...) abort
   endif
   let instance.node = node
   let command = node + argv
-  let opts = {}
   let opts.initializationOptions = {
         \ 'editorInfo': copilot#client#EditorInfo(),
         \ 'editorPluginInfo': copilot#client#EditorPluginInfo(),
         \ }
   let opts.workspaceFolders = []
-  let settings = extend(copilot#client#Settings(), get(opts, 'editorConfiguration', {}))
+  let settings = copilot#client#Settings()
   if type(get(g:, 'copilot_workspace_folders')) == v:t_list
     for folder in g:copilot_workspace_folders
       if type(folder) == v:t_string && !empty(folder) && folder !~# '\*\*\|^/$'

autoload/copilot/panel.vim

@@ -108,7 +108,11 @@ function! copilot#panel#Accept(...) abort
 endfunction
 
 function! s:Initialize(state) abort
-  let &l:filetype = 'copilot' . (empty(a:state.filetype) ? '' : '.' . a:state.filetype)
+  try
+    let &l:filetype = 'copilot' . (empty(a:state.filetype) ? '' : '.' . a:state.filetype)
+  catch
+    let &l:filetype = 'copilot'
+  endtry
   let &l:tabstop = a:state.tabstop
   nmap <buffer><script> <CR> <Cmd>exe copilot#panel#Accept()<CR>
   nmap <buffer><script> [[ <Cmd>call search('^─\{9,}\n.', 'bWe')<CR>

autoload/copilot/version.vim

@@ -1,3 +1,3 @@
 function! copilot#version#String() abort
-  return '1.41.0'
+  return '1.42.0'
 endfunction