Merge branch 'github:release' into release

Author: abdullah8a0

LICENSE.md

@@ -1,4 +1,4 @@
-This technical preview is a Beta Preview under the [GitHub Terms of
-Service](https://docs.github.com/en/github/site-policy/github-terms-of-service#j-beta-previews).
+GitHub Copilot is offered under the [GitHub Terms of
+Service](https://docs.github.com/en/site-policy/github-terms/github-terms-for-additional-products-and-features#github-copilot).
 
-Copyright (C) 2021 GitHub, Inc. - All Rights Reserved.
+Copyright (C) 2023 GitHub, Inc. - All Rights Reserved.

autoload/copilot.vim

@@ -206,12 +206,17 @@ function! s:SuggestionTextWithAdjustments() abort
       return ['', 0, 0, '']
     endif
     let typed = strpart(line, 0, offset)
-    let delete = strpart(line, offset)
-    if choice.range.end.line == line('.') - 1 && choice.range.end.character < copilot#doc#UTF16Width(line)
-      let append = delete
+    if exists('*utf16idx')
+      let end_offset = byteidx(line, choice.range.end.character, 1)
+    elseif has('nvim')
+      let end_offset = v:lua.vim.str_byteindex(line, choice.range.end.character, 1)
     else
-      let append = ''
+      let end_offset = len(line)
+      while copilot#doc#UTF16Width(strpart(line, 0, end_offset)) > choice.range.end.character && end_offset > 0
+        let end_offset -= 1
+      endwhile
     endif
+    let delete = strpart(line, offset, end_offset - offset)
     let uuid = get(choice, 'uuid', '')
     if typed =~# '^\s*$'
       let leading = matchstr(choice.text, '^\s\+')
@@ -220,7 +225,7 @@ function! s:SuggestionTextWithAdjustments() abort
         return [unindented, len(typed) - len(leading), strchars(delete), uuid]
       endif
     elseif typed ==# strpart(choice.text, 0, offset)
-      return [strpart(choice.text . append, offset), 0, strchars(delete), uuid]
+      return [strpart(choice.text, offset), 0, strchars(delete), uuid]
     endif
   catch
     call copilot#logger#Exception()
@@ -369,7 +374,8 @@ function! s:UpdatePreview() abort
     if s:has_nvim_ghost_text
       let data = {'id': 1}
       let data.virt_text_win_col = virtcol('.') - 1
-      let data.virt_text = [[text[0] . repeat(' ', delete - len(text[0])), s:hlgroup]]
+      let append = strpart(getline('.'), col('.') - 1 + delete)
+      let data.virt_text = [[text[0] . append . repeat(' ', delete - len(text[0])), s:hlgroup]]
       if len(text) > 1
         let data.virt_lines = map(text[1:-1], { _, l -> [[l, s:hlgroup]] })
         if !empty(annot)
@@ -381,11 +387,6 @@ 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})
@@ -540,7 +541,7 @@ function! copilot#AcceptAll(...) abort
     call s:ClearPreview()
     let s:suggestion_text = s.text
     return repeat("\<Left>\<Del>", s.outdentSize) . repeat("\<Del>", s.deleteSize) .
-            \ "\<C-R>\<C-O>=copilot#TextQueuedForInsertion()\<CR>"
+            \ "\<C-R>\<C-O>=copilot#TextQueuedForInsertion()\<CR>\<End>"
   endif
   let default = get(g:, 'copilot_tab_fallback', pumvisible() ? "\<C-N>" : "\t")
   if !a:0

autoload/copilot/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.8.3'
+let s:plugin_version = '1.8.4'
 
 let s:error_exit = -1
 
@@ -453,7 +453,7 @@ function! copilot#agent#EditorInfo() abort
   else
     let proxy = ''
   endif
-  let match = matchlist(proxy, '\c^\%([^:]\+://\)\=\%(\([^/:#]\+@\)\)\=\%(\([^/:#]\+\)\|\[\([[:xdigit:]:]\+\)\]\)\%(:\(\d\+\)\)\=\%(/\|$\|?strict_\=ssl=\(.*\)\)')
+  let match = matchlist(proxy, '\c^\%([^:]\+://\)\=\%(\([^/#]\+@\)\)\=\%(\([^/:#]\+\)\|\[\([[:xdigit:]:]\+\)\]\)\%(:\(\d\+\)\)\=\%(/\|$\|?strict_\=ssl=\(.*\)\)')
   if !empty(match)
     let info.networkProxy = {'host': match[2] . match[3], 'port': empty(match[4]) ? 80 : +match[4]}
     if match[5] =~? '^[0f]'
@@ -464,8 +464,8 @@ function! copilot#agent#EditorInfo() abort
       let info.networkProxy.rejectUnauthorized = empty(g:copilot_proxy_strict_ssl) ? v:false : v:true
     endif
     if !empty(match[1])
-      let info.networkProxy.username = s:UrlDecode(matchstr(match[1], '^[^:]*'))
-      let info.networkProxy.password = s:UrlDecode(matchstr(match[1], ':\zs.*'))
+      let info.networkProxy.username = s:UrlDecode(matchstr(match[1], '^[^:@]*'))
+      let info.networkProxy.password = s:UrlDecode(matchstr(match[1], ':\zs[^@]*'))
     endif
   endif
   return info

copilot/dist/agent.js

@@ -1,3 +1,8 @@
+/*!
+ * Application Insights JavaScript SDK - Web Snippet, 1.0.1
+ * Copyright (c) Microsoft and contributors. All rights reserved.
+ */
+
 /*!
  * buildToken
  * Builds OAuth token prefix (helper function)
@@ -8,6 +13,19 @@
  * @return {String} token prefix
  */
 
+/*!
+ * mime-db
+ * Copyright(c) 2014 Jonathan Ong
+ * MIT Licensed
+ */
+
+/*!
+ * mime-types
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
 /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
 
 /** @preserve

copilot/dist/agent.js.LICENSE.txt

@@ -98,15 +98,26 @@ if !get(g:, 'copilot_no_maps')
   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
+  try
+    if !has('nvim') && &encoding ==# 'utf-8'
+      " avoid 8-bit meta collision with UTF-8 characters
+      let s:restore_encoding = 1
+      set encoding=cp949
+    endif
+    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
+  finally
+    if exists('s:restore_encoding')
+      set encoding=utf-8
+    endif
+  endtry
 endif
 
 call copilot#Init()