aboutsummaryrefslogtreecommitdiff
path: root/autoload/prettier/resolver
diff options
context:
space:
mode:
authorVictor S <victorplentz@gmail.com>2023-10-04 19:25:19 -0300
committerVictor S <victorplentz@gmail.com>2023-10-04 19:25:19 -0300
commitc194baf8b30a27ed0075ca0eece270431bdaa913 (patch)
tree824a366a0603078a19f9d43aaef48405ffd84c5f /autoload/prettier/resolver
parent5e6cca21e12587c02e32a06bf423519eb1e9f1b2 (diff)
downloadvim-prettier-c194baf8b30a27ed0075ca0eece270431bdaa913.tar.xz
refactor: split range getter into two parts
Split the function that returns the visual selection range into two parts that return the start and the end of the range respectively, and use them in the CLI-command composer. This is part of a plan to use a general object with details about flags to compose the CLI command.
Diffstat (limited to 'autoload/prettier/resolver')
-rw-r--r--autoload/prettier/resolver/config.vim22
1 files changed, 17 insertions, 5 deletions
diff --git a/autoload/prettier/resolver/config.vim b/autoload/prettier/resolver/config.vim
index 9a18444..be36a7c 100644
--- a/autoload/prettier/resolver/config.vim
+++ b/autoload/prettier/resolver/config.vim
@@ -8,7 +8,8 @@ function! prettier#resolver#config#resolve(config, hasSelection, start, end) abo
\ s:Flag_tab_width(a:config) . ' ' .
\ s:Flag_print_width(a:config) . ' ' .
\ s:Flag_parser(a:config) . ' ' .
- \ s:Flag_range_delimiter(a:config, a:hasSelection, a:start, a:end) . ' ' .
+ \ s:Flag_range_start(a:config, a:hasSelection, a:start) . ' ' .
+ \ s:Flag_range_end(a:config, a:hasSelection, a:end) . ' ' .
\ ' --semi=' .
\ get(a:config, 'semi', g:prettier#config#semi) .
\ ' --single-quote=' .
@@ -38,15 +39,26 @@ function! prettier#resolver#config#resolve(config, hasSelection, start, end) abo
return l:cmd
endfunction
-" Returns either '--range-start X --range-end Y' or an empty string.
-function! s:Flag_range_delimiter(config, partialFormatEnabled, start, end) abort
+" Returns either '--range-start X' or an empty string.
+function! s:Flag_range_start(config, partialFormatEnabled, start) abort
if (!a:partialFormatEnabled)
return ''
endif
- let l:range = prettier#utils#buffer#getCharRange(a:start, a:end)
+ let l:rangeStart = prettier#utils#buffer#getCharRangeStart(a:start)
- return '--range-start=' . l:range[0] . ' --range-end=' . l:range[1]
+ return '--range-start=' . l:rangeStart
+endfunction
+
+" Returns either '--range-end Y' or an empty string.
+function! s:Flag_range_end(config, partialFormatEnabled, end) abort
+ if (!a:partialFormatEnabled)
+ return ''
+ endif
+
+ let l:rangeEnd = prettier#utils#buffer#getCharRangeEnd(a:end)
+
+ return '--range-end=' . l:rangeEnd
endfunction
" Returns '--tab-width=NN'