diff options
| author | Bert JW Regeer <xistence@0x58.com> | 2018-09-25 03:02:01 -0600 |
|---|---|---|
| committer | w0rp <w0rp@users.noreply.github.com> | 2018-09-25 10:02:01 +0100 |
| commit | 8e7e810db6f54c045474ae7d36575ee01804b885 (patch) | |
| tree | 740ca68fe05332c842389183132acc0031cb4450 /autoload | |
| parent | aa5c82b1718f44d04f6dd11bc63f6eeed2089d9d (diff) | |
| download | ale-8e7e810db6f54c045474ae7d36575ee01804b885.zip | |
Bugfix: python add blank lines (#1944)
* Don't add newlines when not a control statement for Python
* Add test for accidental newline fix
* Add docstring detection to avoid adding unnecessarily newlines
* Add tests for docstring detection
Diffstat (limited to 'autoload')
| -rw-r--r-- | autoload/ale/fixers/generic_python.vim | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/autoload/ale/fixers/generic_python.vim b/autoload/ale/fixers/generic_python.vim index 124146be..d55a23c3 100644 --- a/autoload/ale/fixers/generic_python.vim +++ b/autoload/ale/fixers/generic_python.vim @@ -6,13 +6,28 @@ function! ale#fixers#generic_python#AddLinesBeforeControlStatements(buffer, line let l:new_lines = [] let l:last_indent_size = 0 let l:last_line_is_blank = 0 + let l:in_docstring = 0 for l:line in a:lines let l:indent_size = len(matchstr(l:line, '^ *')) + if !l:in_docstring + " Make sure it is not just a single line docstring and then verify + " it's starting a new docstring + if match(l:line, '\v^ *("""|'''''').*("""|'''''')') == -1 + \&& match(l:line, '\v^ *("""|'''''')') >= 0 + let l:in_docstring = 1 + endif + else + if match(l:line, '\v^ *.*("""|'''''')') >= 0 + let l:in_docstring = 0 + endif + endif + if !l:last_line_is_blank + \&& !l:in_docstring \&& l:indent_size <= l:last_indent_size - \&& match(l:line, '\v^ *(return|if|for|while|break|continue)') >= 0 + \&& match(l:line, '\v^ *(return|if|for|while|break|continue)(\(| |$)') >= 0 call add(l:new_lines, '') endif |