summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2017-04-24 23:00:43 +0100
committerw0rp <devw0rp@gmail.com>2017-04-24 23:00:43 +0100
commita25b55b954730b4cce2af358f56d3ba2f663ebf5 (patch)
treed3a876743818ebb93862672fbd17f6e88802266f
parent3345bf20ca92d75e80bae880030268ae49890f6c (diff)
downloadale-a25b55b954730b4cce2af358f56d3ba2f663ebf5.zip
Fix #469 - Remove Unicode quotes from GCC errors, which cause issues
-rw-r--r--autoload/ale/handlers/gcc.vim10
-rw-r--r--test/handler/test_common_handlers.vader14
-rw-r--r--test/handler/test_vint_handler.vader4
3 files changed, 24 insertions, 4 deletions
diff --git a/autoload/ale/handlers/gcc.vim b/autoload/ale/handlers/gcc.vim
index 0755e951..fe941734 100644
--- a/autoload/ale/handlers/gcc.vim
+++ b/autoload/ale/handlers/gcc.vim
@@ -18,6 +18,14 @@ function! s:IsHeaderFile(filename) abort
return a:filename =~? '\v\.(h|hpp)$'
endfunction
+function! s:RemoveUnicodeQuotes(text) abort
+ let l:text = a:text
+ let l:text = substitute(l:text, '[`´‘’]', '''', 'g')
+ let l:text = substitute(l:text, '[“”]', '"', 'g')
+
+ return l:text
+endfunction
+
function! ale#handlers#gcc#HandleGCCFormat(buffer, lines) abort
let l:include_pattern = '\v^(In file included | *)from ([^:]*):(\d+)'
let l:include_lnum = 0
@@ -76,7 +84,7 @@ function! ale#handlers#gcc#HandleGCCFormat(buffer, lines) abort
\ 'lnum': l:match[2] + 0,
\ 'col': l:match[3] + 0,
\ 'type': l:match[4] =~# 'error' ? 'E' : 'W',
- \ 'text': l:match[5],
+ \ 'text': s:RemoveUnicodeQuotes(l:match[5]),
\})
endif
endfor
diff --git a/test/handler/test_common_handlers.vader b/test/handler/test_common_handlers.vader
index 345d7f40..21a6f6a0 100644
--- a/test/handler/test_common_handlers.vader
+++ b/test/handler/test_common_handlers.vader
@@ -53,7 +53,7 @@ Execute (HandleGCCFormat should handle the correct lines of output):
\ 'lnum': 10,
\ 'col': 27,
\ 'type': 'E',
- \ 'text': 'invalid operands to binary - (have ‘int’ and ‘char *’)',
+ \ 'text': 'invalid operands to binary - (have ''int'' and ''char *'')',
\ },
\ ],
\ ale#handlers#gcc#HandleGCCFormat(42, [
@@ -61,6 +61,18 @@ Execute (HandleGCCFormat should handle the correct lines of output):
\ '<stdin>:10:27: error: invalid operands to binary - (have ‘int’ and ‘char *’)',
\ ])
+Execute (HandleGCCFormat should replace Unicode quotes):
+ AssertEqual
+ \ [
+ \ {
+ \ 'lnum': 8,
+ \ 'col': 5,
+ \ 'type': 'W',
+ \ 'text': "'''' \"\"",
+ \ },
+ \ ],
+ \ ale#handlers#gcc#HandleGCCFormat(42, ['<stdin>:8:5: warning: `´‘’ “”'])
+
Execute (HandleUnixFormatAsError should handle some example lines of output):
AssertEqual
\ [
diff --git a/test/handler/test_vint_handler.vader b/test/handler/test_vint_handler.vader
index efd33d10..c5af85c4 100644
--- a/test/handler/test_vint_handler.vader
+++ b/test/handler/test_vint_handler.vader
@@ -12,13 +12,13 @@ Execute(The vint handler should parse error messages correctly):
\ {
\ 'lnum': 3,
\ 'col': 17,
- \ 'text': 'Use robust operators `==#` or `==?` instead of `==` (see Google VimScript Style Guide (Matching))',
+ \ 'text': 'Use robust operators ''==#'' or ''==?'' instead of ''=='' (see Google VimScript Style Guide (Matching))',
\ 'type': 'W',
\ },
\ {
\ 'lnum': 3,
\ 'col': 8,
- \ 'text': 'Make the scope explicit like `l:filename` (see Anti-pattern of vimrc (Scope of identifier))',
+ \ 'text': 'Make the scope explicit like ''l:filename'' (see Anti-pattern of vimrc (Scope of identifier))',
\ 'type': 'W',
\ },
\ {