Remove suffix (#723)

* Remove suffix

* Get default value in placeholder

* Fix make_valid_word

* Fix test

Author: mattn

autoload/lsp/omni.vim

@@ -120,6 +120,14 @@ function! s:contains_filter(item, last_typed_word) abort
     endif
 endfunction
 
+let s:pair = {
+\  '"':  '"',
+\  '''':  '''',
+\  '{':  '}',
+\  '(':  ')',
+\  '[':  ']',
+\}
+
 function! s:display_completions(timer, info) abort
     " TODO: Allow multiple servers
     let l:server_name = a:info['server_names'][0]
@@ -131,6 +139,15 @@ function! s:display_completions(timer, info) abort
 
     if l:filter['name'] ==? 'prefix'
         let s:completion['matches'] = filter(s:completion['matches'], {_, item -> s:prefix_filter(item, l:last_typed_word)})
+	    if has_key(s:pair, l:last_typed_word[0])
+            let [l:lhs, l:rhs] = [l:last_typed_word[0], s:pair[l:last_typed_word[0]]]
+            for l:item in s:completion['matches']
+                let l:str = l:item['word']
+                if len(l:str) > 1 && l:str[0] ==# l:lhs && l:str[-1:] ==# l:rhs
+                    let l:item['word'] = l:str[:-2]
+                endif
+            endfor
+        endif
     elseif l:filter['name'] ==? 'contains'
         let s:completion['matches'] = filter(s:completion['matches'], {_, item -> s:contains_filter(item, l:last_typed_word)})
     endif
@@ -254,7 +271,7 @@ function! lsp#omni#default_get_vim_completion_item(item, ...) abort
     let l:abbr = a:item['label']
 
     if has_key(a:item, 'insertTextFormat') && a:item['insertTextFormat'] == 2
-        let l:word = substitute(l:word, '\<\$[0-9]\+\|\${[^}]\+}\>', '', 'g')
+        let l:word = substitute(l:word, '\$[0-9]\+\|\${\%(\\.\|[^}]\)\+}', '', 'g')
     endif
 
     let l:completion = {

autoload/lsp/ui/vim/completion.vim

@@ -233,8 +233,8 @@ function! s:simple_expand_text(text) abort
 
   " Remove placeholders and get first placeholder position that use to cursor position.
   " e.g. `|getbufline(${1:expr}, ${2:lnum})${0}` to getbufline(|,)
-  let l:text = substitute(a:text, '\$\%({[0-9]*[^}]*}\|[0-9]*\)', '', 'g')
-  let l:offset = match(a:text, '\$\%({[0-9]*[^}]*}\|[0-9]*\)')
+  let l:text = substitute(a:text, '\$\%({[0-9]\+\%(:\(\\.\|[^}]\+\)*\)}\|[0-9]\+\)', '\=substitute(submatch(1), "\\", "", "g")', 'g')
+  let l:offset = match(a:text, '\$\%({[0-9]\+\%(:\(\\.\|[^}]\+\)*\)}\|[0-9]\+\)')
   if l:offset == -1
     let l:offset = strchars(l:text)
   endif

autoload/lsp/utils.vim

@@ -313,11 +313,16 @@ function! lsp#utils#base64_decode(data) abort
 endfunction
 
 function! lsp#utils#make_valid_word(str) abort
-   let l:str = matchstr(a:str, '^[^ (<{\[\t\r\n]\+')
-   if l:str =~# ':$'
-     return l:str[:-2]
+   let l:str = substitute(a:str, '\$[0-9]\+\|\${\%(\\.\|[^}]\)\+}', '', 'g')
+   let l:str = substitute(l:str, '\\\(.\)', '\1', 'g')
+   let l:valid = matchstr(l:str, '^[^"'' (<{\[\t\r\n]\+')
+   if empty(l:valid)
+       return l:str
    endif
-   return l:str
+   if l:valid =~# ':$'
+       return l:valid[:-2]
+   endif
+   return l:valid
 endfunction
 
 function! lsp#utils#_split_by_eol(text) abort

test/lsp/utils.vimspec

@@ -176,7 +176,6 @@ Describe lsp#utils
     Describe lsp#utils#make_valid_word
         It should make valid word
             Assert Equals(lsp#utils#make_valid_word('my-word'), 'my-word')
-            Assert Equals(lsp#utils#make_valid_word(' my-word'), '')
             Assert Equals(lsp#utils#make_valid_word("my\nword"), 'my')
             Assert Equals(lsp#utils#make_valid_word('my-word: description'), 'my-word')
             Assert Equals(lsp#utils#make_valid_word('my-word : description'), 'my-word')