diff options
| author | Mitermayer Reis <mitermayer.reis@gmail.com> | 2020-08-06 16:03:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 16:03:39 +1000 |
| commit | f0076df891baf71fc5df61dce214acbb14f9d230 (patch) | |
| tree | c9c7ab284bbce11090ad82d868da43eac8585696 | |
| parent | 1033199e52a6a6b32a14c4d5cc9ae1fba6386f69 (diff) | |
| parent | 0f797652138dc1b69e2562fbff30b6a1e86fc0c8 (diff) | |
| download | vim-prettier-f0076df891baf71fc5df61dce214acbb14f9d230.tar.xz | |
Merge branch 'master' into prettier-exec-cmd-buffer
| -rw-r--r-- | autoload/prettier/job/async/neovim.vim | 2 | ||||
| -rw-r--r-- | ftplugin/ruby.vim | 2 | ||||
| -rw-r--r-- | ftplugin/yaml.vim | 2 | ||||
| -rw-r--r-- | yarn.lock | 12 |
4 files changed, 10 insertions, 8 deletions
diff --git a/autoload/prettier/job/async/neovim.vim b/autoload/prettier/job/async/neovim.vim index 7f69f4e..35e5f82 100644 --- a/autoload/prettier/job/async/neovim.vim +++ b/autoload/prettier/job/async/neovim.vim @@ -42,6 +42,8 @@ endfunction " " note that somehow we exectuing both async and sync on nvim when using the autoformat function! s:onExit(status, info, out, err) abort + if len(a:out) == 0 | return | endif + let l:currentBufferNumber = bufnr('%') let l:isInsideAnotherBuffer = a:info.buf_nr != l:currentBufferNumber ? 1 : 0 let l:last = a:out[len(a:out) - 1] diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim index f93997d..53d13cf 100644 --- a/ftplugin/ruby.vim +++ b/ftplugin/ruby.vim @@ -4,5 +4,5 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - autocmd BufWritePre *.ruby call prettier#Autoformat() + autocmd BufWritePre *.rb,*.ruby call prettier#Autoformat() augroup end diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim index 2d0564d..60f669b 100644 --- a/ftplugin/yaml.vim +++ b/ftplugin/yaml.vim @@ -4,5 +4,5 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - autocmd BufWritePre *.yaml call prettier#Autoformat() + autocmd BufWritePre *.yml,*.yaml call prettier#Autoformat() augroup end @@ -75,9 +75,9 @@ acorn-walk@^6.0.1: integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== acorn@^6.0.1: version "6.4.0" @@ -2131,9 +2131,9 @@ lodash.sortby@^4.7.0: integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== loose-envify@^1.0.0: version "1.4.0" |