Copilot.vim 1.6.0

Author: tpope

autoload/copilot.vim

@@ -19,19 +19,16 @@ 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
-elseif has('win32')
-  let s:config_root = expand('~/AppData/Local')
-else
-  let s:config_root = expand('~/.config')
-endif
-let s:config_root .= '/github-copilot'
-if !isdirectory(s:config_root)
-  call mkdir(s:config_root, 'p', 0700)
-endif
-
-let s:config_hosts = s:config_root . '/hosts.json'
+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)),
+        \ 'disabledLanguages': sort(keys(filter(filetypes, { k, v -> empty(v) }))),
+        \ }
+endfunction
 
 function! s:StatusNotification(params, ...) abort
   let status = get(a:params, 'status', '')
@@ -46,15 +43,20 @@ function! copilot#Init(...) abort
   call timer_start(0, { _ -> s:Start() })
 endfunction
 
+function! s:Running() abort
+  return exists('s:agent.job') || exists('s:agent.client_id')
+endfunction
+
 function! s:Start() abort
-  if exists('s:agent.job') || exists('s:agent.client_id')
+  if s:Running()
     return
   endif
   let s:agent = copilot#agent#New({'notifications': {
         \ 'statusNotification': function('s:StatusNotification'),
         \ 'PanelSolution': function('copilot#panel#Solution'),
         \ 'PanelSolutionsDone': function('copilot#panel#SolutionsDone'),
-        \ }})
+        \ },
+        \ 'editorConfiguration' : s:EditorConfiguration()})
 endfunction
 
 function! s:Stop() abort
@@ -84,20 +86,6 @@ function! copilot#Notify(method, params, ...) abort
   return call(agent.Notify, [a:method, a:params] + a:000)
 endfunction
 
-function! s:ReadTerms() abort
-  let file = s:config_root . '/terms.json'
-  try
-    if filereadable(file)
-      let terms = json_decode(join(readfile(file)))
-      if type(terms) == v:t_dict
-        return terms
-      endif
-    endif
-  catch
-  endtry
-  return {}
-endfunction
-
 function! copilot#NvimNs() abort
   return nvim_create_namespace('github-copilot')
 endfunction
@@ -137,14 +125,14 @@ let s:filetype_defaults = {
 
 function! s:BufferDisabled() abort
   if exists('b:copilot_disabled')
-    return b:copilot_disabled ? 3 : 0
+    return empty(b:copilot_disabled) ? 0 : 3
   endif
   if exists('b:copilot_enabled')
-    return b:copilot_enabled ? 0 : 4
+    return empty(b:copilot_enabled) ? 4 : 0
   endif
   let short = empty(&l:filetype) ? '.' : split(&l:filetype, '\.', 1)[0]
   let config = get(g:, 'copilot_filetypes', {})
-  if has_key(config, &l:filetype)
+  if type(config) == v:t_dict && has_key(config, &l:filetype)
     return empty(config[&l:filetype])
   elseif has_key(config, short)
     return empty(config[short])
@@ -372,6 +360,11 @@ function! s:UpdatePreview() abort
       let data.hl_mode = 'combine'
       call nvim_buf_set_extmark(0, copilot#NvimNs(), line('.')-1, col('.')-1, data)
     else
+      let trail = strpart(getline('.'), col('.') - 1)
+      while !empty(trail) && trail[-1] ==# text[0][-1]
+        let trail = trail[:-2]
+        let text[0] = text[0][:-2]
+      endwhile
       call prop_add(line('.'), col('.'), {'type': s:hlgroup, 'text': text[0]})
       for line in text[1:]
         call prop_add(line('.'), 0, {'type': s:hlgroup, 'text_align': 'below', 'text': line})
@@ -398,21 +391,22 @@ function! s:HandleTriggerResult(result) abort
   call s:UpdatePreview()
 endfunction
 
+function! copilot#Suggest() abort
+  try
+    call copilot#Complete(function('s:HandleTriggerResult'), function('s:HandleTriggerResult'))
+  catch
+    call copilot#logger#Exception()
+  endtry
+  return ''
+endfunction
+
 function! s:Trigger(bufnr, timer) abort
   let timer = get(g:, '_copilot_timer', -1)
   unlet! g:_copilot_timer
   if a:bufnr !=# bufnr('') || a:timer isnot# timer || mode() !=# 'i'
     return
   endif
-  if exists('s:auth_request')
-    let g:_copilot_timer = timer_start(100, function('s:Trigger', [a:bufnr]))
-    return
-  endif
-  try
-    call copilot#Complete(function('s:HandleTriggerResult'), function('s:HandleTriggerResult'))
-  catch
-    call copilot#logger#Exception()
-  endtry
+  return copilot#Suggest()
 endfunction
 
 function! copilot#IsMapped() abort
@@ -579,6 +573,12 @@ function! s:commands.status(opts) abort
     return
   endif
 
+  let status = copilot#Call('checkStatus', {})
+  if status.status ==# 'NotAuthorized'
+    echo 'Copilot: Not authorized'
+    return
+  endif
+
   echo 'Copilot: Enabled and online'
 endfunction
 
@@ -610,8 +610,10 @@ function! s:commands.setup(opts) abort
 
   if has_key(data, 'verificationUri')
     let uri = data.verificationUri
-    let @+ = data.userCode
-    let @* = data.userCode
+    if has('clipboard')
+      let @+ = data.userCode
+      let @* = data.userCode
+    endif
     echo "First copy your one-time code: " . data.userCode
     try
       if len(&mouse)
@@ -677,6 +679,16 @@ function! s:commands.version(opts) abort
   endif
 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/github-community/community/discussions/categories/copilot'
 function! s:commands.feedback(opts) abort
   echo s:feedback_url
@@ -697,10 +709,12 @@ 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/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.5.4'
+let s:plugin_version = '1.6.0'
 
 let s:error_exit = -1
 
@@ -385,9 +385,9 @@ function! s:Command() abort
       return [v:null, node_version, 'Node.js version 12.x–17.x required but found ' . node_version]
     endif
   endif
-  let agent = s:root . '/copilot/dist/agent.js'
-  if !filereadable(agent)
-    let agent = get(g:, 'copilot_agent_command', '')
+  let agent = get(g:, 'copilot_agent_command', '')
+  if empty(agent) || !filereadable(agent)
+    let agent = s:root . '/copilot/dist/agent.js'
     if !filereadable(agent)
       return [v:null, node_version, 'Could not find agent.js (bad install?)']
     endif
@@ -417,7 +417,7 @@ function! copilot#agent#EditorInfo() abort
   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]}
+    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.*'))
@@ -428,7 +428,7 @@ endfunction
 
 function! s:GetCapabilitiesResult(result, agent) abort
   let a:agent.capabilities = get(a:result, 'capabilities', {})
-  call a:agent.Request('setEditorInfo', copilot#agent#EditorInfo())
+  call a:agent.Request('setEditorInfo', extend({'editorConfiguration': a:agent.editorConfiguration}, copilot#agent#EditorInfo()))
 endfunction
 
 function! s:GetCapabilitiesError(error, agent) abort
@@ -456,6 +456,7 @@ function! copilot#agent#New(...) abort
   let instance = {'requests': {},
         \ 'methods': get(opts, 'methods', {}),
         \ 'notifications': get(opts, 'notifications', {}),
+        \ 'editorConfiguration': get(opts, 'editorConfiguration', {}),
         \ 'Close': function('s:AgentClose'),
         \ 'Notify': function('s:AgentNotify'),
         \ 'Request': function('s:AgentRequest'),

autoload/copilot/doc.vim

@@ -12,12 +12,22 @@ function copilot#doc#UTF16Width(str) abort
 endfunction
 
 let s:language_normalization_map = {
+      \ "bash":            "shellscript",
+      \ "bst":             "bibtex",
+      \ "cs":              "csharp",
+      \ "cuda":            "cuda-cpp",
+      \ "dosbatch":        "bat",
+      \ "dosini":          "ini",
+      \ "gitcommit":       "git-commit",
+      \ "gitrebase":       "git-rebase",
+      \ "make":            "makefile",
+      \ "objc":            "objective-c",
+      \ "objcpp":          "objective-cpp",
+      \ "ps1":             "powershell",
+      \ "raku":            "perl6",
+      \ "sh":              "shellscript",
       \ "text":            "plaintext",
-      \ "javascriptreact": "javascript",
-      \ "jsx":             "javascript",
-      \ "typescriptreact": "typescript",
       \ }
-
 function copilot#doc#LanguageForFileType(filetype) abort
   let filetype = substitute(a:filetype, '\..*', '', '')
   return get(s:language_normalization_map, empty(filetype) ? "text" : filetype, filetype)

copilot/dist/agent.js

@@ -1,3 +1,13 @@
+/*!
+ * buildToken
+ * Builds OAuth token prefix (helper function)
+ *
+ * @name buildToken
+ * @function
+ * @param {GitUrl} obj The parsed Git url object.
+ * @return {String} token prefix
+ */
+
 /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
 
 /** @preserve

copilot/dist/agent.js.LICENSE.txt

@@ -113,6 +113,10 @@ Other Maps ~
 <M-[>                   Cycle to the previous suggestion.
 <Plug>(copilot-previous)
 
+                                                *copilot-i_ALT-\*
+<M-\>                   Explicitly request a suggestion, even if Copilot
+<Plug>(copilot-suggest) is disabled.
+
 SYNTAX HIGHLIGHTING                             *copilot-highlighting*
 
 Inline suggestions are highlighted using the CopilotSuggestion group,

doc/copilot.txt

@@ -72,12 +72,16 @@ if !get(g:, 'copilot_no_maps')
   endif
   imap <Plug>(copilot-next)     <Cmd>call copilot#Next()<CR>
   imap <Plug>(copilot-previous) <Cmd>call copilot#Previous()<CR>
+  imap <Plug>(copilot-suggest)  <Cmd>call copilot#Suggest()<CR>
   if empty(mapcheck('<M-]>', 'i'))
     imap <M-]> <Plug>(copilot-next)
   endif
   if empty(mapcheck('<M-[>', 'i'))
     imap <M-[> <Plug>(copilot-previous)
   endif
+  if empty(mapcheck('<M-Bslash>', 'i'))
+    imap <M-Bslash> <Plug>(copilot-suggest)
+  endif
 endif
 
 call copilot#Init()