diff options
author | Bjorn Neergaard <bjorn@neersighted.com> | 2016-10-10 18:43:45 -0500 |
---|---|---|
committer | Bjorn Neergaard <bjorn@neersighted.com> | 2016-10-11 06:14:26 -0500 |
commit | fb4b797dd22b2ec225542c97e5c0c4195edf037e (patch) | |
tree | be6bc337e1403aaded57cfaaf0ce506e73cfb225 /ale_linters/php | |
parent | ca4badfb3a0ae73d4fcac3512c8cfae2a6a94f03 (diff) | |
download | ale-fb4b797dd22b2ec225542c97e5c0c4195edf037e.zip |
Use explicit scope in all ale_linters
vint -s is now clean
Diffstat (limited to 'ale_linters/php')
-rw-r--r-- | ale_linters/php/php.vim | 12 | ||||
-rw-r--r-- | ale_linters/php/phpcs.vim | 26 |
2 files changed, 19 insertions, 19 deletions
diff --git a/ale_linters/php/php.vim b/ale_linters/php/php.vim index 57519a24..21288428 100644 --- a/ale_linters/php/php.vim +++ b/ale_linters/php/php.vim @@ -11,18 +11,18 @@ function! ale_linters#php#php#Handle(buffer, lines) " Matches patterns like the following: " " Parse error: parse error in - on line 7 - let pattern = 'Parse error:\s\+\(.\+\) on line \(\d\+\)' - let output = [] + let l:pattern = 'Parse error:\s\+\(.\+\) on line \(\d\+\)' + let l:output = [] - for line in a:lines - let l:match = matchlist(line, pattern) + for l:line in a:lines + let l:match = matchlist(l:line, l:pattern) if len(l:match) == 0 continue endif " vcol is needed to indicate that the column is a character. - call add(output, { + call add(l:output, { \ 'bufnr': a:buffer, \ 'lnum': l:match[2] + 0, \ 'vcol': 0, @@ -33,7 +33,7 @@ function! ale_linters#php#php#Handle(buffer, lines) \}) endfor - return output + return l:output endfunction call ale#linter#Define('php', { diff --git a/ale_linters/php/phpcs.vim b/ale_linters/php/phpcs.vim index ed74b443..67ac6b5a 100644 --- a/ale_linters/php/phpcs.vim +++ b/ale_linters/php/phpcs.vim @@ -8,46 +8,46 @@ endif let g:loaded_ale_linters_php_phpcs = 1 function! ale_linters#php#phpcs#GetCommand(buffer) - let command = 'phpcs -s --report=emacs --stdin-path=%s' + let l:command = 'phpcs -s --report=emacs --stdin-path=%s' " This option can be set to change the standard used by phpcs if exists('g:ale_php_phpcs_standard') - let command .= ' --standard=' . g:ale_php_phpcs_standard + let l:command .= ' --standard=' . g:ale_php_phpcs_standard endif - return command + return l:command endfunction function! ale_linters#php#phpcs#Handle(buffer, lines) " Matches against lines like the following: " " /path/to/some-filename.php:18:3: error - Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact) - let pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\) - \(.\+\) \(\(.\+\)\)$' - let output = [] + let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\) - \(.\+\) \(\(.\+\)\)$' + let l:output = [] - for line in a:lines - let l:match = matchlist(line, pattern) + for l:line in a:lines + let l:match = matchlist(l:line, l:pattern) if len(l:match) == 0 continue endif - let text = l:match[4] - let type = l:match[3] + let l:text = l:match[4] + let l:type = l:match[3] " vcol is Needed to indicate that the column is a character. - call add(output, { + call add(l:output, { \ 'bufnr': a:buffer, \ 'lnum': l:match[1] + 0, \ 'vcol': 0, \ 'col': l:match[2] + 0, - \ 'text': text, - \ 'type': type ==# 'warning' ? 'W' : 'E', + \ 'text': l:text, + \ 'type': l:type ==# 'warning' ? 'W' : 'E', \ 'nr': -1, \}) endfor - return output + return l:output endfunction call ale#linter#Define('php', { |