Copilot.vim 1.18.0

Author: tpope

autoload/copilot.vim

@@ -226,7 +226,7 @@ function! s:SuggestionTextWithAdjustments() abort
     endif
     let line = getline('.')
     let offset = col('.') - 1
-    let choice_text = strpart(line, 0, copilot#doc#UTF16ToByteIdx(line, choice.range.start.character)) . choice.text
+    let choice_text = strpart(line, 0, copilot#doc#UTF16ToByteIdx(line, choice.range.start.character)) . substitute(choice.text, "\n*$", '', '')
     let typed = strpart(line, 0, offset)
     let end_offset = copilot#doc#UTF16ToByteIdx(line, choice.range.end.character)
     if end_offset < 0

autoload/copilot/agent.vim

@@ -151,7 +151,7 @@ function! s:BufferText(bufnr) abort
 endfunction
 
 function! s:LogMessage(params) abort
-  call copilot#logger#Raw(get(a:params, 'level', 3), get(a:params, 'message', ''))
+  call copilot#logger#Raw(get(a:params, 'type', 6), get(a:params, 'message', ''))
 endfunction
 
 function! s:ShowMessageRequest(params) abort
@@ -294,7 +294,9 @@ function! s:OnResponse(agent, response, ...) abort
 endfunction
 
 function! s:OnErr(agent, line, ...) abort
-  call copilot#logger#Debug('<-! ' . a:line)
+  if !has_key(a:agent, 'capabilities')
+    call copilot#logger#Bare('<-! ' . a:line)
+  endif
 endfunction
 
 function! s:OnExit(agent, code, ...) abort
@@ -508,7 +510,6 @@ function! copilot#agent#New(...) abort
         \ 'StartupError': function('s:AgentStartupError'),
         \ }
   let instance.methods = extend({
-        \ 'LogMessage': function('s:LogMessage'),
         \ 'window/logMessage': function('s:LogMessage'),
         \ }, get(opts, 'methods', {}))
   let [command, node_version, command_error] = s:Command()

autoload/copilot/logger.vim

@@ -10,11 +10,14 @@ function! copilot#logger#File() abort
   return s:log_file
 endfunction
 
+let s:level_prefixes = ['', '[ERROR] ', '[WARN] ', '[INFO] ', '[DEBUG] ', '[TRACE] ']
+
 function! copilot#logger#Raw(level, message) abort
-  if $COPILOT_AGENT_VERBOSE !~# '^\%(1\|true\)$' && a:level < 1
+  if $COPILOT_AGENT_VERBOSE !~# '^\%(1\|true\)$' && a:level > 3
     return
   endif
   let lines = type(a:message) == v:t_list ? copy(a:message) : split(a:message, "\n", 1)
+  let lines[0] = strftime('[%Y-%m-%dT%H:%M:%S] ') . get(s:level_prefixes, a:level, '[UNKNOWN] ') . get(lines, 0, '')
   try
     if !filewritable(s:log_file)
       return
@@ -26,23 +29,27 @@ function! copilot#logger#Raw(level, message) abort
 endfunction
 
 function! copilot#logger#Trace(...) abort
-  call copilot#logger#Raw(-1, a:000)
+  call copilot#logger#Raw(5, a:000)
 endfunction
 
 function! copilot#logger#Debug(...) abort
-  call copilot#logger#Raw(0, a:000)
+  call copilot#logger#Raw(4, a:000)
 endfunction
 
 function! copilot#logger#Info(...) abort
-  call copilot#logger#Raw(1, a:000)
+  call copilot#logger#Raw(3, a:000)
 endfunction
 
 function! copilot#logger#Warn(...) abort
   call copilot#logger#Raw(2, a:000)
 endfunction
 
 function! copilot#logger#Error(...) abort
-  call copilot#logger#Raw(3, a:000)
+  call copilot#logger#Raw(1, a:000)
+endfunction
+
+function! copilot#logger#Bare(...) abort
+  call copilot#logger#Raw(0, a:000)
 endfunction
 
 function! copilot#logger#Exception(...) abort

autoload/copilot/version.vim

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