marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for rename (documentChanges)

Browse source
This commit is contained in:
Jerko Steiner 2020-02-22 07:52:50 +01:00
parent 4062b05669
commit b339a8bfa0
2 changed files with 137 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
autoload/ale/rename.vim
View file

@ -83,6 +83,30 @@ function! ale#rename#HandleTSServerResponse(conn_id, response) abort
\}, v:true)
endfunction
function! s:getChanges(workspace_edit) abort
let l:changes = {}
if has_key(a:workspace_edit, 'changes') && !empty(a:workspace_edit.changes)
return a:workspace_edit.changes
elseif has_key(a:workspace_edit, 'documentChanges')
let l:document_changes = []
if type(a:workspace_edit.documentChanges) is v:t_dict &&
\ has_key(a:workspace_edit.documentChanges, 'edits')
call add(l:document_changes, a:workspace_edit.documentChanges)
elseif type(a:workspace_edit.documentChanges) is v:t_list
let l:document_changes = a:workspace_edit.documentChanges
endif
for l:text_document_edit in l:document_changes
let l:filename = l:text_document_edit.textDocument.uri
let l:edits = l:text_document_edit.edits
let l:changes[l:filename] = l:edits
endfor
endif
return l:changes
endfunction
function! ale#rename#HandleLSPResponse(conn_id, response) abort
if has_key(a:response, 'id')
\&& has_key(s:rename_map, a:response.id)
@ -94,9 +118,9 @@ function! ale#rename#HandleLSPResponse(conn_id, response) abort
return
endif
let l:workspace_edit = a:response.result
let l:changes_map = s:getChanges(a:response.result)
if !has_key(l:workspace_edit, 'changes') || empty(l:workspace_edit.changes)
if empty(l:changes_map)
call s:message('No changes received from server')
return
@ -104,8 +128,8 @@ function! ale#rename#HandleLSPResponse(conn_id, response) abort
let l:changes = []
for l:file_name in keys(l:workspace_edit.changes)
let l:text_edits = l:workspace_edit.changes[l:file_name]
for l:file_name in keys(l:changes_map)
let l:text_edits = l:changes_map[l:file_name]
let l:text_changes = []
for l:edit in l:text_edits

109
test/test_rename.vader
View file

@ -327,6 +327,115 @@ Execute(Code actions from LSP should be handled):
\ ],
\ g:code_actions
Execute(DocumentChanges from LSP should be handled):
call ale#rename#HandleLSPResponse(1, {
\ 'id': 3,
\ 'result': {
\ 'documentChanges': [
\ {
\ 'textDocument': {
\ 'version': 1.0,
\ 'uri': 'file:///foo/bar/file1.ts',
\ },
\ 'edits': [
\ {
\ 'range': {
\ 'start': {
\ 'line': 1,
\ 'character': 2,
\ },
\ 'end': {
\ 'line': 3,
\ 'character': 4,
\ },
\ },
\ 'newText': 'bla123',
\ },
\ ],
\ },
\ ],
\ },
\})
AssertEqual
\ [
\ {
\ 'description': 'rename',
\ 'changes': [
\ {
\ 'fileName': '/foo/bar/file1.ts',
\ 'textChanges': [
\ {
\ 'start': {
\ 'line': 2,
\ 'offset': 3,
\ },
\ 'end': {
\ 'line': 4,
\ 'offset': 5,
\ },
\ 'newText': 'bla123',
\ },
\ ],
\ },
\ ],
\ }
\ ],
\ g:code_actions
Execute(Single DocumentChange from LSP should be handled):
call ale#rename#HandleLSPResponse(1, {
\ 'id': 3,
\ 'result': {
\ 'documentChanges': {
\ 'textDocument': {
\ 'version': 1.0,
\ 'uri': 'file:///foo/bar/file1.ts',
\ },
\ 'edits': [
\ {
\ 'range': {
\ 'start': {
\ 'line': 1,
\ 'character': 2,
\ },
\ 'end': {
\ 'line': 3,
\ 'character': 4,
\ },
\ },
\ 'newText': 'bla123',
\ },
\ ],
\ },
\ },
\})
AssertEqual
\ [
\ {
\ 'description': 'rename',
\ 'changes': [
\ {
\ 'fileName': '/foo/bar/file1.ts',
\ 'textChanges': [
\ {
\ 'start': {
\ 'line': 2,
\ 'offset': 3,
\ },
\ 'end': {
\ 'line': 4,
\ 'offset': 5,
\ },
\ 'newText': 'bla123',
\ },
\ ],
\ },
\ ],
\ }
\ ],
\ g:code_actions
Execute(LSP should perform no action when no result):
call ale#rename#HandleLSPResponse(1, {
\ 'id': 3,