summaryrefslogtreecommitdiff
path: root/ale_linters/puppet
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2018-09-04 16:51:18 +0100
committerw0rp <devw0rp@gmail.com>2018-09-04 16:51:18 +0100
commitd476578a402763f2c6e4e0ada2eb345d0ac938d7 (patch)
tree77f5a61c6eada15821391ecb4f78b87fa8e406db /ale_linters/puppet
parent8f2e1c393f74326979e1c74af8dc9b6ca8004778 (diff)
downloadale-d476578a402763f2c6e4e0ada2eb345d0ac938d7.zip
Improve ALE project style checking
* The project style linter now runs while you type. * Now the scripts for checking the project require blank lines. * Many style issues have been found and fixed.
Diffstat (limited to 'ale_linters/puppet')
-rw-r--r--ale_linters/puppet/languageserver.vim2
-rw-r--r--ale_linters/puppet/puppet.vim1
2 files changed, 2 insertions, 1 deletions
diff --git a/ale_linters/puppet/languageserver.vim b/ale_linters/puppet/languageserver.vim
index a08b7653..a3060e65 100644
--- a/ale_linters/puppet/languageserver.vim
+++ b/ale_linters/puppet/languageserver.vim
@@ -8,6 +8,7 @@ function! ale_linters#puppet#languageserver#GetProjectRoot(buffer) abort
" there's no requirement to have it, so fall back to the other possible
" Puppet module directories
let l:root_path = ale#path#FindNearestFile(a:buffer, 'metadata.json')
+
if !empty(l:root_path)
return fnamemodify(l:root_path, ':h')
endif
@@ -17,6 +18,7 @@ function! ale_linters#puppet#languageserver#GetProjectRoot(buffer) abort
\ 'templates',
\]
let l:root_path = ale#path#FindNearestDirectory(a:buffer, l:test_path)
+
if !empty(l:root_path)
return fnamemodify(l:root_path, ':h:h')
endif
diff --git a/ale_linters/puppet/puppet.vim b/ale_linters/puppet/puppet.vim
index d44bb517..0e37bdbd 100644
--- a/ale_linters/puppet/puppet.vim
+++ b/ale_linters/puppet/puppet.vim
@@ -8,7 +8,6 @@ function! ale_linters#puppet#puppet#Handle(buffer, lines) abort
" Error: Could not parse for environment production: Syntax error at ':' at /root/puppetcode/modules/nginx/manifests/init.pp:43:12
" Error: Could not parse for environment production: Syntax error at '='; expected '}' at /root/puppetcode/modules/pancakes/manifests/init.pp:5"
" Error: Could not parse for environment production: Syntax error at 'parameter1' (file: /tmp/modules/mariadb/manifests/slave.pp, line: 4, column: 5)
-
let l:pattern = '^Error: .*: \(.\+\) \((file:\|at\) .\+\.pp\(, line: \|:\)\(\d\+\)\(, column: \|:\)\=\(\d*\)'
let l:output = []