From cc8e5502c8fd9d0d2ba405214e05f90b4152e2b2 Mon Sep 17 00:00:00 2001 From: w0rp Date: Tue, 19 Dec 2017 17:42:51 +0000 Subject: [PATCH] Fix #1240 - Parse line and column numbers for fatal embertemplatelint errors --- ale_linters/handlebars/embertemplatelint.vim | 6 ++---- test/handler/test_embertemplatelint_handler.vader | 11 ++++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ale_linters/handlebars/embertemplatelint.vim b/ale_linters/handlebars/embertemplatelint.vim index 963ab56..68ea715 100644 --- a/ale_linters/handlebars/embertemplatelint.vim +++ b/ale_linters/handlebars/embertemplatelint.vim @@ -22,15 +22,13 @@ function! ale_linters#handlebars#embertemplatelint#Handle(buffer, lines) abort for l:error in get(values(l:json), 0, []) if has_key(l:error, 'fatal') call add(l:output, { - \ 'bufnr': a:buffer, - \ 'lnum': 1, - \ 'col': 1, + \ 'lnum': get(l:error, 'line', 1), + \ 'col': get(l:error, 'column', 1), \ 'text': l:error.message, \ 'type': l:error.severity == 1 ? 'W' : 'E', \}) else call add(l:output, { - \ 'bufnr': a:buffer, \ 'lnum': l:error.line, \ 'col': l:error.column, \ 'text': l:error.rule . ': ' . l:error.message, diff --git a/test/handler/test_embertemplatelint_handler.vader b/test/handler/test_embertemplatelint_handler.vader index ea5313c..97ca439 100644 --- a/test/handler/test_embertemplatelint_handler.vader +++ b/test/handler/test_embertemplatelint_handler.vader @@ -32,14 +32,12 @@ Execute(The ember-template-lint handler should parse lines correctly): AssertEqual \ [ \ { - \ 'bufnr': 347, \ 'lnum': 1, \ 'col': 10, \ 'text': 'bare-strings: Non-translated string used', \ 'type': 'E', \ }, \ { - \ 'bufnr': 347, \ 'lnum': 3, \ 'col': 6, \ 'text': 'invalid-interactive: Interaction added to non-interactive element', @@ -55,8 +53,8 @@ Execute(The ember-template-lint handler should handle template parsing error cor \ "fatal": true, \ "moduleId": "app/templates/application", \ "message": "Parse error on line 5 ...", - \ "line": 1, - \ "column": 1, + \ "line": 5, + \ "column": 3, \ "source": "Error: Parse error on line 5 ...", \ "severity": 2 \ } @@ -66,9 +64,8 @@ Execute(The ember-template-lint handler should handle template parsing error cor AssertEqual \ [ \ { - \ 'bufnr': 347, - \ 'lnum': 1, - \ 'col': 1, + \ 'lnum': 5, + \ 'col': 3, \ 'text': 'Parse error on line 5 ...', \ 'type': 'E', \ },