Set prettier working directory to where .prettierignore is (#3101)
Prettier does not use `.prettierignore` unless the current directory is the root where the `.prettierignore` file resides. * Update Prettier tests * Look for prettierignore to determine project root
This commit is contained in:
parent
ecd7abecc0
commit
80bd2e18d6
4 changed files with 27 additions and 1 deletions
|
@ -34,6 +34,21 @@ function! ale#fixers#prettier#ProcessPrettierDOutput(buffer, output) abort
|
||||||
return a:output
|
return a:output
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
function! ale#fixers#prettier#GetProjectRoot(buffer) abort
|
||||||
|
let l:config = ale#path#FindNearestFile(a:buffer, '.prettierignore')
|
||||||
|
|
||||||
|
if !empty(l:config)
|
||||||
|
return fnamemodify(l:config, ':h')
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Fall back to the directory of the buffer
|
||||||
|
return fnamemodify(bufname(a:buffer), ':p:h')
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! ale#fixers#prettier#CdProjectRoot(buffer) abort
|
||||||
|
return ale#path#CdString(ale#fixers#prettier#GetProjectRoot(a:buffer))
|
||||||
|
endfunction
|
||||||
|
|
||||||
function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
|
function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
|
||||||
let l:executable = ale#fixers#prettier#GetExecutable(a:buffer)
|
let l:executable = ale#fixers#prettier#GetExecutable(a:buffer)
|
||||||
let l:options = ale#Var(a:buffer, 'javascript_prettier_options')
|
let l:options = ale#Var(a:buffer, 'javascript_prettier_options')
|
||||||
|
@ -97,7 +112,7 @@ function! ale#fixers#prettier#ApplyFixForVersion(buffer, version) abort
|
||||||
" 1.4.0 is the first version with --stdin-filepath
|
" 1.4.0 is the first version with --stdin-filepath
|
||||||
if ale#semver#GTE(a:version, [1, 4, 0])
|
if ale#semver#GTE(a:version, [1, 4, 0])
|
||||||
return {
|
return {
|
||||||
\ 'command': ale#path#BufferCdString(a:buffer)
|
\ 'command': ale#fixers#prettier#CdProjectRoot(a:buffer)
|
||||||
\ . ale#Escape(l:executable)
|
\ . ale#Escape(l:executable)
|
||||||
\ . (!empty(l:options) ? ' ' . l:options : '')
|
\ . (!empty(l:options) ? ' ' . l:options : '')
|
||||||
\ . ' --stdin-filepath %s --stdin',
|
\ . ' --stdin-filepath %s --stdin',
|
||||||
|
|
|
@ -297,6 +297,17 @@ Execute(Should set --parser for experimental language, Handlebars):
|
||||||
\ . ' --stdin-filepath %s --stdin',
|
\ . ' --stdin-filepath %s --stdin',
|
||||||
\ }
|
\ }
|
||||||
|
|
||||||
|
Execute(Changes to directory where .prettierignore is found):
|
||||||
|
call ale#test#SetFilename('../prettier-test-files/with_prettierignore/src/testfile.js')
|
||||||
|
|
||||||
|
GivenCommandOutput ['1.6.0']
|
||||||
|
AssertFixer
|
||||||
|
\ {
|
||||||
|
\ 'command': ale#path#CdString(expand('%:p:h:h'))
|
||||||
|
\ . ale#Escape(g:ale_javascript_prettier_executable)
|
||||||
|
\ . ' --stdin-filepath %s --stdin',
|
||||||
|
\ }
|
||||||
|
|
||||||
Execute(The prettier_d post-processor should permit regular JavaScript content):
|
Execute(The prettier_d post-processor should permit regular JavaScript content):
|
||||||
AssertEqual
|
AssertEqual
|
||||||
\ [
|
\ [
|
||||||
|
|
Reference in a new issue