diff options
| author | mitermayer <mitermayer.reis@gmail.com> | 2019-09-12 23:54:51 +0000 |
|---|---|---|
| committer | mitermayer <mitermayer.reis@gmail.com> | 2019-09-12 23:58:31 +0000 |
| commit | 7ac46762931442491b13401411a1b4eb65272099 (patch) | |
| tree | 1ad98ac2154d698998fc545014c980d448476d94 | |
| parent | 758415cc88bbe7144964ef3ad770acd400567e55 (diff) | |
| download | vim-prettier-7ac46762931442491b13401411a1b4eb65272099.tar.xz | |
issues/184-fixing-undo-step - Adding support for require-pragma
- Our previous undo implementation tried to be naive on implementing
require-pragma, and created some undo bugs due to it. This diff enables
us to use the prettier upstream support for require-pragma
- On subsequent PR's we will completetly phase out the previous undo
implementation in favour to this one in order to fix bug https://github.com/prettier/vim-prettier/issues/184
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | autoload/prettier/resolver/config.vim | 2 | ||||
| -rw-r--r-- | doc/prettier.txt | 4 | ||||
| -rw-r--r-- | plugin/prettier.vim | 3 |
4 files changed, 13 insertions, 0 deletions
@@ -227,6 +227,10 @@ let g:prettier#config#prose_wrap = 'preserve' " css|strict|ignore " default: 'css' let g:prettier#config#html_whitespace_sensitivity = 'css' + +" false|true +" default: 'false' +let g:prettier#config#require_pragma = 'false' ``` ### REQUIREMENT(S) diff --git a/autoload/prettier/resolver/config.vim b/autoload/prettier/resolver/config.vim index 029bec4..b22f11a 100644 --- a/autoload/prettier/resolver/config.vim +++ b/autoload/prettier/resolver/config.vim @@ -28,6 +28,8 @@ function! prettier#resolver#config#resolve(config, hasSelection, start, end) abo \ ' --html-whitespace-sensitivity ' . \ get(a:config, 'htmlWhitespaceSensitivity', g:prettier#config#html_whitespace_sensitivity) . \ ' --stdin-filepath="'.simplify(expand('%:p')).'"' . + \ ' --require-pragma=' . + \ get(a:config, 'requirePragma', g:prettier#config#require_pragma) . \ ' --loglevel error '. \ ' --stdin ' return l:cmd diff --git a/doc/prettier.txt b/doc/prettier.txt index 0a8dc30..11ed194 100644 --- a/doc/prettier.txt +++ b/doc/prettier.txt @@ -185,6 +185,10 @@ However they can be configured by: " css|strict|ignore let g:prettier#config#html_whitespace_sensitivity = 'css' + + " false|true + " default: 'false' + let g:prettier#config#require_pragma = 'false' < ============================================================================== REQUIREMENT(S) *vim-prettier-requirements* diff --git a/plugin/prettier.vim b/plugin/prettier.vim index 19b4002..d3bee5a 100644 --- a/plugin/prettier.vim +++ b/plugin/prettier.vim @@ -97,6 +97,9 @@ let g:prettier#config#arrow_parens = get(g:,'prettier#config#arrow_parens', 'avo " default: 'none' let g:prettier#config#trailing_comma = get(g:,'prettier#config#trailing_comma', 'none') +" restrict itself to only format files that contain a special comment @prettier or @format +let g:prettier#config#require_pragma= get(g:, 'prettier#config#require_pragma', 'false') + " synchronous by default command! -nargs=? -range=% Prettier call prettier#Prettier(g:prettier#exec_cmd_async, <line1>, <line2>, g:prettier#partial_format) |