From b7db095221088a6ece6bc92f9a16e216693fd032 Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok van der Werven Date: Wed, 20 Jun 2018 14:58:12 +0200 Subject: [PATCH] Make CloudFormation linter work again with latest - Fix regexp - Get rid of +0 since ALE does a str2nr() on lnum and col - Put all matches in numerical order for easier maintenance --- ale_linters/cloudformation/cfn_python_lint.vim | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ale_linters/cloudformation/cfn_python_lint.vim b/ale_linters/cloudformation/cfn_python_lint.vim index 25e86ca3..d0ac7b28 100644 --- a/ale_linters/cloudformation/cfn_python_lint.vim +++ b/ale_linters/cloudformation/cfn_python_lint.vim @@ -4,8 +4,8 @@ function! ale_linters#cloudformation#cfn_python_lint#Handle(buffer, lines) abort " Matches patterns line the following: " - " sample.template.yaml:96:7:96:15: [E3012] Property Resources/Sample/Properties/FromPort should be of type Integer - let l:pattern = '\v^(.*):(\d+):(\d+):(\d+):(\d+): \[([[:alnum:]]+)\] (.*)$' + " sample.template.yaml:96:7:96:15:E3012:Property Resources/Sample/Properties/FromPort should be of type Integer + let l:pattern = '\v^(.*):(\d+):(\d+):(\d+):(\d+):([[:alnum:]]+):(.*)$' let l:output = [] for l:match in ale#util#GetMatches(a:lines, l:pattern) @@ -13,13 +13,13 @@ function! ale_linters#cloudformation#cfn_python_lint#Handle(buffer, lines) abort if ale#path#IsBufferPath(a:buffer, l:match[1]) call add(l:output, { - \ 'lnum': l:match[2] + 0, - \ 'col': l:match[3] + 0, - \ 'end_lnum': l:match[4] + 0, - \ 'end_col': l:match[5] + 0, - \ 'text': l:match[7], + \ 'lnum': l:match[2], + \ 'col': l:match[3], + \ 'end_lnum': l:match[4], + \ 'end_col': l:match[5], \ 'code': l:code, \ 'type': l:code[:0] is# 'E' ? 'E' : 'W', + \ 'text': l:match[7] \}) endif endfor