Refactor to be less verbose

This commit is contained in:
Cyrille David
2019-06-11 00:11:14 +02:00
committed by Cyrille David
parent 3e4b8ea466
commit 86205967ea

View File

@@ -39,10 +39,15 @@ function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
let l:options = ale#Var(a:buffer, 'javascript_prettier_options') let l:options = ale#Var(a:buffer, 'javascript_prettier_options')
let l:parser = '' let l:parser = ''
let l:filetypes = split(getbufvar(a:buffer, '&filetype'), '\.')
if index(l:filetypes, 'handlebars') > -1
let l:parser = 'glimmer'
endif
" Append the --parser flag depending on the current filetype (unless it's " Append the --parser flag depending on the current filetype (unless it's
" already set in g:javascript_prettier_options). " already set in g:javascript_prettier_options).
if match(l:options, '--parser') == -1 if empty(expand('#' . a:buffer . ':e')) && l:parser is# '' && match(l:options, '--parser') == -1
if empty(expand('#' . a:buffer . ':e'))
" Mimic Prettier's defaults. In cases without a file extension or " Mimic Prettier's defaults. In cases without a file extension or
" filetype (scratch buffer), Prettier needs `parser` set to know how " filetype (scratch buffer), Prettier needs `parser` set to know how
" to process the buffer. " to process the buffer.
@@ -66,24 +71,12 @@ function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
\ 'html': 'html', \ 'html': 'html',
\} \}
for l:filetype in split(getbufvar(a:buffer, '&filetype'), '\.') for l:filetype in l:filetypes
if has_key(l:prettier_parsers, l:filetype) if has_key(l:prettier_parsers, l:filetype)
let l:parser = l:prettier_parsers[l:filetype] let l:parser = l:prettier_parsers[l:filetype]
break break
endif endif
endfor endfor
else
" Append a --parser flag. In cases the filetype has an exprimental
" support in Prettier and has to be appended manually.
let l:prettier_experimental_parsers = {
\ 'html.handlebars': 'glimmer',
\}
let l:filetype = getbufvar(a:buffer, '&filetype')
if has_key(l:prettier_experimental_parsers, l:filetype)
let l:parser = l:prettier_experimental_parsers[l:filetype]
endif
endif
endif endif
if !empty(l:parser) if !empty(l:parser)