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

sources_non_forked/ale/ale_linters/yaml/circleci.vim

@@ -0,0 +1,35 @@
+function! ale_linters#yaml#circleci#Handle(buffer, lines) abort
+    let l:match_index = -1
+    let l:output = []
+
+    for l:index in range(len(a:lines))
+        let l:line = a:lines[l:index]
+
+        if l:line =~? 'Error: ERROR IN CONFIG FILE:'
+            let l:match_index = l:index + 1
+            break
+        endif
+    endfor
+
+    if l:match_index > 0
+        return [{
+        \   'type': 'E',
+        \   'lnum': 1,
+        \   'text': a:lines[l:match_index],
+        \   'detail': join(a:lines[l:match_index :], "\n"),
+        \}]
+    endif
+
+    return []
+endfunction
+
+" The circleci validate requires network requests, so we'll only run it when
+" files are saved to prevent the server from being hammered.
+call ale#linter#Define('yaml', {
+\   'name': 'circleci',
+\   'executable': {b -> expand('#' . b . ':p') =~? '\.circleci' ? 'circleci' : ''},
+\   'command': 'circleci config validate - < %s',
+\   'callback': 'ale_linters#yaml#circleci#Handle',
+\   'output_stream': 'stderr',
+\   'lint_file': 1,
+\})

sources_non_forked/ale/ale_linters/yaml/spectral.vim

@@ -6,7 +6,11 @@ call ale#Set('yaml_spectral_use_global', get(g:, 'ale_use_global_executables', 0
 
 call ale#linter#Define('yaml', {
 \   'name': 'spectral',
+<<<<<<< HEAD
 \   'executable': {b -> ale#node#FindExecutable(b, 'yaml_spectral', [
+=======
+\   'executable': {b -> ale#path#FindExecutable(b, 'yaml_spectral', [
+>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
 \       'node_modules/.bin/spectral',
 \   ])},
 \   'command': '%e lint --ignore-unknown-format -q -f text %t',

sources_non_forked/ale/ale_linters/yaml/swaglint.vim

@@ -32,7 +32,7 @@ endfunction
 
 call ale#linter#Define('yaml', {
 \   'name': 'swaglint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'yaml_swaglint', [
+\   'executable': {b -> ale#path#FindExecutable(b, 'yaml_swaglint', [
 \       'node_modules/.bin/swaglint',
 \   ])},
 \   'command': '%e -r compact --stdin',