Merge pull request #488 from prabirshrestha/fix-textedit

Fix textEdit

Author: mattn

autoload/lsp/utils/text_edit.vim

@@ -162,15 +162,14 @@ endfunction
 function! s:generate_sub_cmd_insert(text_edit) abort
     let l:start_line = a:text_edit['range']['start']['line']
     let l:start_character = a:text_edit['range']['start']['character']
-    let l:new_text = s:parse(a:text_edit['newText'])
 
     let l:sub_cmd = s:preprocess_cmd(a:text_edit['range'])
     let l:sub_cmd .= s:generate_move_start_cmd(l:start_line, l:start_character)
 
     if l:start_character >= strchars(getline(l:start_line))
         let l:sub_cmd .= "\"=l:merged_text_edit['merged']['newText']\<CR>p"
     else
-        let l:sub_cmd .= "\"=l:merged_text_edit['merged']['newText']\<CR>P"
+        let l:sub_cmd .= "\"=l:merged_text_edit['merged']['newText'].'?'\<CR>gPh\"_x"
     endif
 
     return l:sub_cmd
@@ -181,7 +180,7 @@ function! s:generate_sub_cmd_replace(text_edit) abort
     let l:start_character = a:text_edit['range']['start']['character']
     let l:end_line = a:text_edit['range']['end']['line']
     let l:end_character = a:text_edit['range']['end']['character']
-    let l:new_text = substitute(a:text_edit['newText'], '\n$', '', '')
+    let l:new_text = a:text_edit['newText']
 
     let l:sub_cmd = s:preprocess_cmd(a:text_edit['range'])
     let l:sub_cmd .= s:generate_move_start_cmd(l:start_line, l:start_character) " move to the first position
@@ -199,8 +198,10 @@ function! s:generate_sub_cmd_replace(text_edit) abort
 
     if len(l:new_text) == 0
         let l:sub_cmd .= 'x'
-    else
+    elseif l:start_character == 0 && l:end_character == 0
         let l:sub_cmd .= "\"=l:merged_text_edit['merged']['newText']\<CR>p"
+    else
+        let l:sub_cmd .= "\"=l:merged_text_edit['merged']['newText'].'?'\<CR>gph\"_x"
     endif
 
     return l:sub_cmd
@@ -224,11 +225,6 @@ function! s:generate_move_end_cmd(line_pos, character_pos) abort
     return l:result
 endfunction
 
-function! s:parse(text) abort
-    " https://stackoverflow.com/questions/71417/why-is-r-a-newline-for-vim
-    return substitute(a:text, '\(^\n|\n$\|\r\n\)', '\r', 'g')
-endfunction
-
 function! s:preprocess_cmd(range) abort
     " preprocess by opening the folds, this is needed because the line you are
     " going might have a folding

test/lsp/utils/text_edit.vimspec

@@ -390,6 +390,59 @@ Describe lsp#utils#text_edit
             Assert Equals(l:buffer_text, ['x', 'y', 'z', ''])
         End
 
+        It multiple textEdit with inserting \r.
+            " Add some text to buffer
+            call s:set_text(['class ABC {', '  private:', '  ', 'int a;};', ])
+
+            " Format
+            call lsp#utils#text_edit#apply_text_edits(
+                    \ expand('%'),
+                    \ [
+                    \   {
+                    \     "range": {
+                    \       "end": {
+                    \         "character": 2,
+                    \         "line": 1
+                    \       },
+                    \       "start": {
+                    \         "character": 11,
+                    \         "line": 0
+                    \       }
+                    \     },
+                    \     "newText": "\n"
+                    \   },
+                    \   {
+                    \     "range": {
+                    \       "end": {
+                    \         "character": 0,
+                    \         "line": 3
+                    \       },
+                    \       "start": {
+                    \         "character": 10,
+                    \         "line": 1
+                    \       }
+                    \     },
+                    \     "newText": "\n  "
+                    \   },
+                    \   {
+                    \     "range": {
+                    \       "end": {
+                    \         "character": 6,
+                    \         "line": 3
+                    \       },
+                    \       "start": {
+                    \         "character": 6,
+                    \         "line": 3
+                    \       }
+                    \     },
+                    \     "newText": "\n"
+                    \   }
+                    \ ])
+
+            let l:buffer_text = s:get_text()
+            Assert Equals(l:buffer_text, ['class ABC {', 'private:', '  int a;', '};', ''])
+        End
+
         It preserves v:completed_item
             " Add some text to buffer
             call s:set_text(['foo', 'bar'])