diff options
| -rw-r--r-- | autoload/prettier.vim | 85 | ||||
| -rw-r--r-- | ftplugin/css.vim | 2 | ||||
| -rw-r--r-- | ftplugin/less.vim | 2 | ||||
| -rw-r--r-- | ftplugin/scss.vim | 2 | ||||
| -rw-r--r-- | ftplugin/typescript.vim | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | plugin/prettier.vim | 6 |
7 files changed, 59 insertions, 42 deletions
diff --git a/autoload/prettier.vim b/autoload/prettier.vim index 6c655d2..fc0e14c 100644 --- a/autoload/prettier.vim +++ b/autoload/prettier.vim @@ -3,7 +3,9 @@ let s:prettier_job_running = 0 function! prettier#Prettier(...) abort let l:execCmd = s:Get_Prettier_Exec() - let l:async = a:0 > 0 ? a:1 : 0 + let l:async = a:0 > 0 ? a:1 : 0 + let l:startSelection = a:0 > 1 ? a:2 : 1 + let l:endSelection = a:0 > 2 ? a:3 : line('$') let l:config = getbufvar(bufnr('%'), 'prettier_ft_default_args', {}) if l:execCmd != -1 @@ -14,37 +16,37 @@ function! prettier#Prettier(...) abort cclose if l:async && v:version >= 800 && exists('*job_start') - call s:Prettier_Exec_Async(l:cmd) + call s:Prettier_Exec_Async(l:cmd, l:startSelection, l:endSelection) else - call s:Prettier_Exec_Sync(l:cmd) + call s:Prettier_Exec_Sync(l:cmd, l:startSelection, l:endSelection) endif else call s:Suggest_Install_Prettier() endif endfunction -function! prettier#Autoformat() abort +function! prettier#Autoformat(...) abort let l:curPos = getpos('.') - let l:maxLineLookup = 50 - let l:maxTimeLookupMs = 500 + let l:maxLineLookup = 50 + let l:maxTimeLookupMs = 500 let l:pattern = '@format' - " we need to move selection to the top before looking up to avoid + " we need to move selection to the top before looking up to avoid " scanning a very long file call cursor(1, 1) " Search starting at the start of the document if search(l:pattern, 'n', l:maxLineLookup, l:maxTimeLookupMs) > 0 " autoformat async - call prettier#Prettier(1) + call prettier#Prettier(1) endif " Restore the selection and if greater then before it defaults to end call cursor(curPos[1], curPos[2]) endfunction -function! s:Prettier_Exec_Sync(cmd) abort - let l:out = split(system(a:cmd, getbufline(bufnr('%'), 1, '$')), '\n') +function! s:Prettier_Exec_Sync(cmd, startSelection, endSelection) abort + let l:out = split(system(a:cmd, getbufline(bufnr('%'), a:startSelection, a:endSelection)), '\n') " check system exit code if v:shell_error @@ -52,21 +54,27 @@ function! s:Prettier_Exec_Sync(cmd) abort return endif - call s:Apply_Prettier_Format(l:out) + if (s:Has_Content_Changed(l:out, a:startSelection, a:endSelection) == 0) + return + endif + + call s:Apply_Prettier_Format(l:out, a:startSelection, a:endSelection) endfunction -function! s:Prettier_Exec_Async(cmd) abort +function! s:Prettier_Exec_Async(cmd, startSelection, endSelection) abort if s:prettier_job_running != 1 let s:prettier_job_running = 1 call job_start(a:cmd, { \ 'in_io': 'buffer', + \ 'in_top': a:startSelection, + \ 'in_bot': a:endSelection, \ 'in_name': bufname('%'), - \ 'err_cb': 'Prettier_Job_Error', - \ 'close_cb': 'Prettier_Job_Close' }) + \ 'err_cb': {channel, msg -> s:Prettier_Job_Error(msg)}, + \ 'close_cb': {channel -> s:Prettier_Job_Close(channel, a:startSelection, a:endSelection)}}) endif endfunction -function! Prettier_Job_Close(channel) abort +function! s:Prettier_Job_Close(channel, startSelection, endSelection) abort let l:out = [] while ch_status(a:channel, {'part': 'out'}) == 'buffered' @@ -74,19 +82,19 @@ function! Prettier_Job_Close(channel) abort endwhile " nothing to update - if (getbufline(bufnr('%'), 1, '$') == l:out) + if (s:Has_Content_Changed(l:out, a:startSelection, a:endSelection) == 0) let s:prettier_job_running = 0 return endif - - if len(l:out) - call s:Apply_Prettier_Format(l:out) + + if len(l:out) + call s:Apply_Prettier_Format(l:out, a:startSelection, a:endSelection) write let s:prettier_job_running = 0 endif endfunction -function! Prettier_Job_Error(channel, msg) abort +function! s:Prettier_Job_Error(msg) abort call s:Prettier_Parse_Error(split(a:msg, '\n')) let s:prettier_job_running = 0 endfunction @@ -106,21 +114,30 @@ function! s:Handle_Parsing_Errors(out) abort endif endfor - if len(l:errors) + if len(l:errors) call setqflist(l:errors) botright copen endif endfunction -function! s:Apply_Prettier_Format(lines) abort +function! s:Has_Content_Changed(content, startLine, endLine) abort + return getbufline(bufnr('%'), 1, line('$')) == s:Get_New_Buffer(a:content, a:startLine, a:endLine) ? 0 : 1 +endfunction + +function! s:Get_New_Buffer(lines, start, end) abort + return getbufline(bufnr('%'), 1, a:start - 1) + a:lines + getbufline(bufnr('%'), a:end + 1, '$') +endfunction + +function! s:Apply_Prettier_Format(lines, startSelection, endSelection) abort " store cursor position let l:curPos = getpos('.') + let l:newBuffer = s:Get_New_Buffer(a:lines, a:startSelection, a:endSelection) " delete all lines on the current buffer silent! execute 1 . ',' . line('$') . 'delete _' " replace all lines from the current buffer with output from prettier - call setline(1, a:lines) + call setline(1, l:newBuffer) " restore cursor position call cursor(l:curPos[1], l:curPos[2]) @@ -155,24 +172,24 @@ endfunction " By default we will search for the following " => locally installed prettier inside node_modules on any parent folder -" => globally installed prettier +" => globally installed prettier " => vim-prettier prettier installation " => if all fails suggest install function! s:Get_Prettier_Exec() abort let l:local_exec = s:Get_Prettier_Local_Exec() if executable(l:local_exec) return l:local_exec - endif + endif let l:global_exec = s:Get_Prettier_Global_Exec() if executable(l:global_exec) return l:global_exec - endif + endif let l:plugin_exec = s:Get_Prettier_Plugin_Exec() if executable(l:plugin_exec) return l:plugin_exec - endif + endif return -1 endfunction @@ -190,11 +207,11 @@ function! s:Get_Prettier_Plugin_Exec() abort endfunction function! s:Get_Exec(...) abort - let l:rootDir = a:0 > 0 ? a:1 : 0 + let l:rootDir = a:0 > 0 ? a:1 : 0 let l:exec = -1 - if isdirectory(l:rootDir) - let l:dir = s:Tranverse_Dir_Search(l:rootDir) + if isdirectory(l:rootDir) + let l:dir = s:Tranverse_Dir_Search(l:rootDir) if dir != -1 let l:exec = s:Get_Path_To_Exec(l:dir) endif @@ -206,8 +223,8 @@ function! s:Get_Exec(...) abort endfunction function! s:Get_Path_To_Exec(...) abort - let l:rootDir = a:0 > 0 ? a:1 : -1 - let l:dir = l:rootDir != -1 ? l:rootDir . '/.bin/' : '' + let l:rootDir = a:0 > 0 ? a:1 : -1 + let l:dir = l:rootDir != -1 ? l:rootDir . '/.bin/' : '' return dir . 'prettier' endfunction @@ -217,12 +234,12 @@ function! s:Tranverse_Dir_Search(rootDir) abort while 1 let l:search_dir = root . '/' . dir - if isdirectory(l:search_dir) + if isdirectory(l:search_dir) return l:search_dir endif let l:parent = fnamemodify(root, ':h') - if l:parent == l:root + if l:parent == l:root return -1 endif diff --git a/ftplugin/css.vim b/ftplugin/css.vim index 92bc628..f268f42 100644 --- a/ftplugin/css.vim +++ b/ftplugin/css.vim @@ -1,5 +1,5 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ 'parser': 'postcss' \ } augroup Prettier diff --git a/ftplugin/less.vim b/ftplugin/less.vim index 92bc628..f268f42 100644 --- a/ftplugin/less.vim +++ b/ftplugin/less.vim @@ -1,5 +1,5 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ 'parser': 'postcss' \ } augroup Prettier diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim index 92bc628..f268f42 100644 --- a/ftplugin/scss.vim +++ b/ftplugin/scss.vim @@ -1,5 +1,5 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ 'parser': 'postcss' \ } augroup Prettier diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim index b654a48..8151c09 100644 --- a/ftplugin/typescript.vim +++ b/ftplugin/typescript.vim @@ -1,5 +1,5 @@ let b:prettier_ft_default_args = { - \ 'parser': 'typescript' + \ 'parser': 'typescript' \ } augroup Prettier diff --git a/package.json b/package.json index 9f78cf2..9d6eb0a 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,6 @@ "url": "git://github.com/mitermayer/vim-prettier.git" }, "dependencies": { - "prettier": "^1.4.2" + "prettier": "^1.4.4" } } diff --git a/plugin/prettier.vim b/plugin/prettier.vim index d728353..207c46c 100644 --- a/plugin/prettier.vim +++ b/plugin/prettier.vim @@ -20,7 +20,7 @@ let g:loaded_prettier = 1 " autoformating enabled by default upon saving let g:prettier#autoformat = get(g:, 'prettier#autoformat', 1) -" calling :Prettier by default runs synchronous +" calling :Prettier by default runs synchronous let g:prettier#exec_cmd_async = get(g:, 'prettier#exec_cmd_async', 0) " when having formatting errors will open the quickfix by default @@ -55,10 +55,10 @@ let g:prettier#config#trailing_comma = get(g:,'prettier#config#trailing_comma', let g:prettier#config#parser = get(g:,'prettier#config#parser', 'flow') " synchronous by default -command! Prettier call prettier#Prettier(g:prettier#exec_cmd_async) +command! -nargs=? -range=% Prettier call prettier#Prettier(g:prettier#exec_cmd_async, <line1>, <line2>) " prettier async -command! PrettierAsync call prettier#Prettier(1) +command! -nargs=? -range=% PrettierAsync call prettier#Prettier(1, <line1>, <line2>) " map command if !hasmapto('<Plug>(Prettier)') && maparg('<Leader>p', 'n') ==# '' |