summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ale_linters/html/tidy.vim44
1 files changed, 35 insertions, 9 deletions
diff --git a/ale_linters/html/tidy.vim b/ale_linters/html/tidy.vim
index 35834842..b5621f91 100644
--- a/ale_linters/html/tidy.vim
+++ b/ale_linters/html/tidy.vim
@@ -7,7 +7,37 @@ endif
let g:loaded_ale_linters_html_tidy = 1
-function! ale_linters#html#tidy#Handle(buffer, lines)
+" CLI options
+let g:ale_html_tidy_executable = get(g:, 'ale_html_tidy_executable', 'tidy')
+let g:ale_html_tidy_args = get(g:, 'ale_html_tidy_args', '-q -e -language en')
+
+function! ale_linters#html#tidy#GetCommand(buffer) abort
+
+ " Specify file encoding in options
+ " (Idea taken from https://github.com/scrooloose/syntastic/blob/master/syntax_checkers/html/tidy.vim)
+ let file_encoding = get({
+ \ 'ascii': '-ascii',
+ \ 'big5': '-big5',
+ \ 'cp1252': '-win1252',
+ \ 'cp850': '-ibm858',
+ \ 'cp932': '-shiftjis',
+ \ 'iso-2022-jp': '-iso-2022',
+ \ 'latin1': '-latin1',
+ \ 'macroman': '-mac',
+ \ 'sjis': '-shiftjis',
+ \ 'utf-16le': '-utf16le',
+ \ 'utf-16': '-utf16',
+ \ 'utf-8': '-utf8',
+ \ }, &fileencoding, '-utf8')
+
+ return printf('%s %s %s -',
+ \ g:ale_html_tidy_executable,
+ \ g:ale_html_tidy_args,
+ \ file_encoding
+ \ )
+endfunction
+
+function! ale_linters#html#tidy#Handle(buffer, lines) abort
" Matches patterns lines like the following:
" line 7 column 5 - Warning: missing </title> before </head>
@@ -24,7 +54,7 @@ function! ale_linters#html#tidy#Handle(buffer, lines)
let line = match[1] + 0
let col = match[2] + 0
let type = match[3] ==# 'Error' ? 'E' : 'W'
- let text = printf('[%s]%s', match[3], match[4])
+ let text = match[4]
" vcol is Needed to indicate that the column is a character.
call add(output, {
@@ -41,14 +71,10 @@ function! ale_linters#html#tidy#Handle(buffer, lines)
return output
endfunction
-" User options
-let g:ale_html_tidy_executable = get(g:, 'ale_html_tidy_executable', 'tidy')
-let g:ale_html_tidy_args = get(g:, 'ale_html_tidy_args', '-q -e -language en')
-
call ALEAddLinter('html', {
-\ 'name': g:ale_html_tidy_executable,
+\ 'name': 'tidy',
\ 'executable': g:ale_html_tidy_executable,
-\ 'command': printf('%s %s -', g:ale_html_tidy_executable, g:ale_html_tidy_args),
\ 'output_stream': 'stderr',
+\ 'command_callback': 'ale_linters#html#tidy#GetCommand',
\ 'callback': 'ale_linters#html#tidy#Handle',
-\})
+\ })