Skip to content

Commit

Permalink
Fixed the issue with Black ignoring files is being processed. (#3406)
Browse files Browse the repository at this point in the history
Add test for stdin-filename on test/fixers/test_ruff_format_fixer_callback.vader
  • Loading branch information
nlaburu committed Jan 30, 2025
1 parent 0551602 commit 683b356
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
3 changes: 3 additions & 0 deletions autoload/ale/fixers/black.vim
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ function! ale#fixers#black#Fix(buffer) abort
call add(l:cmd, l:options)
endif

let l:fname = expand('#' . a:buffer . '...')
call add(l:cmd, '--stdin-filename '.ale#Escape(ale#path#Simplify(l:fname)))

if expand('#' . a:buffer . ':e') is? 'pyi'
call add(l:cmd, '--pyi')
endif
Expand Down
31 changes: 19 additions & 12 deletions test/fixers/test_black_fixer_callback.vader
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,46 @@ After:
unlet! b:bin_dir

Execute(The black callback should return the correct default values):
silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py')
let file_path = g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py'
silent execute 'file ' . fnameescape(file_path)
let fname = ale#Escape(ale#path#Simplify(file_path))
AssertEqual
\ {
\ 'cwd': '%s:h',
\ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' -'},
\ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --stdin-filename ' . fname . ' -'},
\ ale#fixers#black#Fix(bufnr(''))

Execute(The black callback should include options):
let g:ale_python_black_options = '--some-option'
let g:ale_python_black_change_directory = 0

silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py')
let file_path = g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py'
silent execute 'file ' . fnameescape(file_path)
let fname = ale#Escape(ale#path#Simplify(file_path))
AssertEqual
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option -' },
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option --stdin-filename ' . fname . ' -'},
\ ale#fixers#black#Fix(bufnr(''))

Execute(The black callback should include --pyi for .pyi files):
let g:ale_python_black_change_directory = 0

silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.pyi')
let file_path = g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.pyi'
silent execute 'file ' . fnameescape(file_path)
let fname = ale#Escape(ale#path#Simplify(file_path))

AssertEqual
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --pyi -' },
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --stdin-filename ' . fname . ' --pyi -'},
\ ale#fixers#black#Fix(bufnr(''))

Execute(The black callback should not concatenate options):
let g:ale_python_black_options = '--some-option'
let g:ale_python_black_change_directory = 0

silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.pyi')
let file_path = g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.pyi'
silent execute 'file ' . fnameescape(file_path)
let fname = ale#Escape(ale#path#Simplify(file_path))

AssertEqual
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option --pyi -' },
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option --stdin-filename ' . fname. ' --pyi -'},
\ ale#fixers#black#Fix(bufnr(''))

Execute(Pipenv is detected when python_black_auto_pipenv is set):
Expand All @@ -53,7 +60,7 @@ Execute(Pipenv is detected when python_black_auto_pipenv is set):
call ale#test#SetFilename('../test-files/python/pipenv/whatever.py')

AssertEqual
\ {'command': ale#Escape('pipenv') . ' run black -'},
\ {'command': ale#Escape('pipenv') . ' run black --stdin-filename ''/testplugin/test/test-files/python/pipenv/whatever.py'' -'},
\ ale#fixers#black#Fix(bufnr(''))

Execute(Poetry is detected when python_black_auto_poetry is set):
Expand All @@ -63,7 +70,7 @@ Execute(Poetry is detected when python_black_auto_poetry is set):
call ale#test#SetFilename('../test-files/python/poetry/whatever.py')

AssertEqual
\ {'command': ale#Escape('poetry') . ' run black -'},
\ {'command': ale#Escape('poetry') . ' run black --stdin-filename ''/testplugin/test/test-files/python/poetry/whatever.py'' -'},
\ ale#fixers#black#Fix(bufnr(''))

Execute(uv is detected when python_black_auto_uv is set):
Expand All @@ -73,5 +80,5 @@ Execute(uv is detected when python_black_auto_uv is set):
call ale#test#SetFilename('../test-files/python/uv/whatever.py')

AssertEqual
\ {'command': ale#Escape('uv') . ' run black -'},
\ {'command': ale#Escape('uv') . ' run black --stdin-filename ''/testplugin/test/test-files/python/uv/whatever.py'' -'},
\ ale#fixers#black#Fix(bufnr(''))

0 comments on commit 683b356

Please sign in to comment.