Remove typed_pattern (#704)

* Remove typed_pattern

* Rename asyncomplete_refresh_pattern to vim_lsp_refresh_pattern

* Fix textEdit to clear inserted text

* Fix when startcol can not be found

* Find first item for refresh_pattenr

* Fix

* Update doc

* Trim empty spaces right

* Use space

Author: mattn

autoload/lsp/omni.vim

@@ -58,6 +58,22 @@ function! lsp#omni#complete(findstart, base) abort
             let s:completion['status'] = s:completion_status_pending
         endif
 
+        " Find first item which has refresh_pattern
+        let l:refresh_pattern = '\(\k\+$\)'
+        for l:server_name in l:info['server_names']
+            let l:server_info = lsp#get_server_info(l:server_name)
+            if has_key (l:server_info, 'config') && has_key(l:server_info['config'], 'refresh_pattern')
+                let l:refresh_pattern = l:server_info['config']['refresh_pattern']
+                break
+            endif
+        endfor
+        let l:curpos = getcurpos()
+        let l:left = strpart(getline(l:curpos[1]), 0, l:curpos[2]-1)
+        let s:completion['startcol'] = matchstrpos(l:left, l:refresh_pattern)[1]
+        if s:completion['startcol'] == -1
+            let s:completion['startcol'] = strlen(l:left)
+        endif
+
         call s:send_completion_request(l:info)
 
         if g:lsp_async_completion
@@ -76,24 +92,9 @@ function! lsp#omni#complete(findstart, base) abort
     endif
 endfunction
 
-function! s:get_insertion_point(item, current_line, typed_pattern) abort
-    let l:insert_start = -1
-
-    let l:user_data = lsp#omni#get_managed_user_data_from_completed_item(a:item)
-    if has_key(l:user_data, 'completion_item') && has_key(l:user_data['completion_item'], 'textEdit')
-        let l:insert_start = l:user_data['completion_item']['textEdit']['range']['start']['character']
-    endif
-
-    if l:insert_start >= 0
-        return l:insert_start
-    else
-        return match(a:current_line, a:typed_pattern)
-    endif
-endfunction
-
 function! s:get_filter_label(item) abort
     let l:user_data = lsp#omni#get_managed_user_data_from_completed_item(a:item)
-    if has_key(l:user_data, 'completion_item') && has_key(l:user_data['completion_item'], 'filterText')
+    if has_key(l:user_data, 'completion_item') && has_key(l:user_data['completion_item'], 'filterText') && !empty(l:user_data['completion_item']['filterText'])
         return trim(l:user_data['completion_item']['filterText'])
     endif
     return trim(a:item['word'])
@@ -124,13 +125,9 @@ function! s:display_completions(timer, info) abort
     let l:server_name = a:info['server_names'][0]
     let l:server_info = lsp#get_server_info(l:server_name)
 
-    let l:typed_pattern = has_key(l:server_info, 'config') && has_key(l:server_info['config'], 'typed_pattern') ? l:server_info['config']['typed_pattern'] : '\k*$'
     let l:current_line = strpart(getline('.'), 0, col('.') - 1)
-
-    let s:start_pos = min(map(copy(s:completion['matches']), {_, item -> s:get_insertion_point(item, l:current_line, l:typed_pattern) }))
-
     let l:filter = has_key(l:server_info, 'config') && has_key(l:server_info['config'], 'filter') ? l:server_info['config']['filter'] : { 'name': 'prefix' }
-    let l:last_typed_word = strpart(l:current_line, s:start_pos)
+    let l:last_typed_word = strpart(l:current_line, s:completion['startcol'])
 
     if l:filter['name'] ==? 'prefix'
         let s:completion['matches'] = filter(s:completion['matches'], {_, item -> s:prefix_filter(item, l:last_typed_word)})
@@ -141,7 +138,7 @@ function! s:display_completions(timer, info) abort
     let s:completion['status'] = ''
 
     if mode() is# 'i'
-        call complete(s:start_pos + 1, s:completion['matches'])
+        call complete(s:completion['startcol'] + 1, s:completion['matches'])
     endif
 endfunction
 

autoload/lsp/ui/vim/completion.vim

@@ -192,10 +192,7 @@ function! s:clear_inserted_text(line, position, completed_item, completion_item)
 
   " Expand remove range to textEdit.
   if has_key(a:completion_item, 'textEdit')
-    let l:range['start']['character'] = min([
-          \   l:range['start']['character'],
-          \   a:completion_item['textEdit']['range']['start']['character']
-          \ ])
+    let l:range['start']['character'] = a:completion_item['textEdit']['range']['start']['character']
     let l:range['end']['character'] = max([
           \   l:range['end']['character'],
           \   a:completion_item['textEdit']['range']['end']['character']

doc/vim-lsp.txt

@@ -794,7 +794,7 @@ The vim |dict| containing information about the server.
 <
     Using the `config` key, you can also specify a custom 'typed word
     pattern', or a custom filter for completion items, see
-    |vim-lsp-typed_pattern| and |vim-lsp-completion-filter|.
+    |vim-lsp-completion-filter|.
 
     The following per-server configuration options are supported by vim-lsp.
 
@@ -830,28 +830,28 @@ The vim |dict| containing information about the server.
 	    Example: >
 		'config': { 'completion_item_kinds': {'26': 'type' } }
 <
-typed_pattern                                        *vim-lsp-typed_pattern*
+refresh_pattern                                    *vim-lsp-refresh_pattern*
     Type: |String| (|pattern|)
     Default: `'\k*$'`
 
-Vim-lsp will automatically detect the text you have typed so far when invoking
-completion. It does this by checking the textEdit's range of each completion
-item.
+Vim-lsp will automatically detect start column of completion so far when
+invoking completion. It does this by checking the textEdit's range of each
+completion item.
 
-If the language server doesn't use textEdits, you can use a |regexp| to
-determine what you have typed so far. The pattern is matched against the
-current line, from column 0 up until the cursor's position. Thus, |/$| means
-"current cursor position" in this context.
+You can use a |regexp| to determine what you want to start completion with
+matched text so far. The pattern is matched against the current line, from
+column 0 up until the cursor's position. Thus, |/$| means "current cursor
+position" in this context.
 
 For example: >
-	'config': { 'typed_pattern': '\k*$' }
+	'config': { 'refresh_pattern': '\k*$' }
 <
 This uses all characters in `'iskeyword'` in front of the cursor as typed
 word.
 
 This key is also used to align the completion menu: the completion menu is
 placed so its left border is at the column that matches the start of the
-`typed_pattern`.
+`refresh_pattern`.
 
 filter                                           *vim-lsp-completion-filter*
 
@@ -860,9 +860,7 @@ completion filter using the `filter` key in the server info's `config` |dict|.
 The value of the `filter` key is itself a |dict| containing at least a key
 `name`, which specifies which filter to use.
 
-For the meaning of "already typed text" in the remainder of this section, see
-|vim-lsp-typed_pattern|. The case (in)sensitivity of the matching is
-determined by |g:lsp_ignorecase|.
+The case (in)sensitivity of the matching is determined by |g:lsp_ignorecase|.
 
     Example: >
         'config': { 'filter': { 'name': 'none' } }