ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-07-26 14:35:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Linux' of https://github.com/Geezus42/vimrc into Linux

Browse Source
This commit is contained in:
geezus
2021-06-30 13:19:18 -05:00
parent 3afe70fe5a 1cca3b1df2
commit 29a3a22f6a
235 changed files with 6246 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources_non_forked/ale/ale_linters/dockerfile/hadolint.vim
View File

@ -9,7 +9,11 @@ function! ale_linters#dockerfile#hadolint#Handle(buffer, lines) abort
"
" /dev/stdin:19 DL3001 Pipe chain should start with a raw value.
" /dev/stdin:19:3 unexpected thing
<<<<<<< HEAD
let l:pattern = '\v^/dev/stdin:(\d+):?(\d+)? ((DL|SC)(\d+) )?((.+)?: )?(.+)$'
=======
let l:pattern = '\v^%(/dev/stdin|-):(\d+):?(\d+)? ((DL|SC)(\d+) )?((.+)?: )?(.+)$'
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
let l:output = []
for l:match in ale#util#GetMatches(a:lines, l:pattern)
@ -92,12 +96,15 @@ endfunction
function! ale_linters#dockerfile#hadolint#GetCommand(buffer) abort
let l:command = ale_linters#dockerfile#hadolint#GetExecutable(a:buffer)
let l:opts = '--no-color -'
if l:command is# 'docker'
return 'docker run --rm -i ' . ale#Var(a:buffer, 'dockerfile_hadolint_docker_image')
return printf('docker run --rm -i %s hadolint %s',
\ ale#Var(a:buffer, 'dockerfile_hadolint_docker_image'),
\ l:opts)
endif
return 'hadolint -'
return 'hadolint ' . l:opts
endfunction