averello/vim-lsp-mirror
1
0
Fork 0
mirror of https://github.com/prabirshrestha/vim-lsp.git synced 2025-12-14 20:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Follow vscode textEdit behavior (#764)

Browse Source 
* Follo vscode textEdit behavior

* Remove unnecessary cursor position fixing
This commit is contained in:
hrsh7th
2020-03-25 00:56:27 +09:00
committed by GitHub
parent f79bf39922
commit 4d8cd302bb
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
autoload/lsp/utils/text_edit.vim
View File

@@ -1,21 +1,18 @@
function! lsp#utils#text_edit#apply_text_edits(uri, text_edits) abort
let l:current_bufname = bufname('%')
let l:target_bufname = lsp#utils#uri_to_path(a:uri)
let l:cursor_pos = getpos('.')[1 : 3]
let l:cursor_position = lsp#get_position()
let l:cursor_offset = 0
let l:topline = line('w0')
call s:_switch(l:target_bufname)
for l:text_edit in s:_normalize(a:text_edits)
let l:cursor_offset += s:_apply(bufnr(l:target_bufname), l:text_edit, l:cursor_pos)
let l:cursor_offset += s:_apply(bufnr(l:target_bufname), l:text_edit, l:cursor_position)
endfor
call s:_switch(l:current_bufname)
if bufnr(l:current_bufname) == bufnr(l:target_bufname)
let l:length = strlen(getline(l:cursor_pos[0])) + 1
let l:cursor_pos[2] = max([0, l:cursor_pos[1] + l:cursor_pos[2] - l:length])
let l:cursor_pos[1] = min([l:length, l:cursor_pos[1] + l:cursor_pos[2]])
call cursor(l:cursor_pos)
call cursor(lsp#utils#position#lsp_to_vim('%', l:cursor_position))
call winrestview({ 'topline': l:topline + l:cursor_offset })
endif
endfunction
@@ -23,7 +20,7 @@ endfunction
"
" _apply
"
function! s:_apply(bufnr, text_edit, cursor_pos) abort
function! s:_apply(bufnr, text_edit, cursor_position) abort
" create before/after line.
let l:start_line = getline(a:text_edit.range.start.line + 1)
let l:end_line = getline(a:text_edit.range.end.line + 1)
@@ -47,11 +44,20 @@ function! s:_apply(bufnr, text_edit, cursor_pos) abort
let l:new_lines_len = len(l:new_lines)
" fix cursor pos
" fix cursor col
if a:text_edit.range.end.line == a:cursor_position.line
if a:text_edit.range.end.character <= a:cursor_position.character
let l:end_character = strchars(l:new_lines[-1]) - strchars(l:after_line)
let l:end_offset = a:cursor_position.character - a:text_edit.range.end.character
let a:cursor_position.character = l:end_character + l:end_offset
endif
endif
" fix cursor line
let l:cursor_offset = 0
if a:text_edit.range.end.line + 1 < a:cursor_pos[0]
let l:cursor_offset = l:new_lines_len - (a:text_edit.range.end.line - a:text_edit.range.start.line) - 1
let a:cursor_pos[0] += l:cursor_offset
if a:text_edit.range.end.line <= a:cursor_position.line
let l:cursor_offset = l:new_lines_len - (a:text_edit.range.end.line - a:text_edit.range.start.line) - 1
let a:cursor_position.line += l:cursor_offset
endif
" append new lines.

12
autoload/lsp/utils/workspace_edit.vim
View File

@@ -1,24 +1,12 @@
" Applies WorkspaceEdit changes.
function! lsp#utils#workspace_edit#apply_workspace_edit(workspace_edit) abort
if has_key(a:workspace_edit, 'documentChanges')
let l:cur_buffer = bufnr('%')
let l:view = winsaveview()
for l:text_document_edit in a:workspace_edit['documentChanges']
call lsp#utils#text_edit#apply_text_edits(l:text_document_edit['textDocument']['uri'], l:text_document_edit['edits'])
endfor
if l:cur_buffer !=# bufnr('%')
execute 'keepjumps keepalt b ' . l:cur_buffer
endif
call winrestview(l:view)
elseif has_key(a:workspace_edit, 'changes')
let l:cur_buffer = bufnr('%')
let l:view = winsaveview()
for [l:uri, l:text_edits] in items(a:workspace_edit['changes'])
call lsp#utils#text_edit#apply_text_edits(l:uri, l:text_edits)
endfor
if l:cur_buffer !=# bufnr('%')
execute 'keepjumps keepalt b ' . l:cur_buffer
endif
call winrestview(l:view)
endif
endfunction