Merge pull request #2782 from hsanson/2777-add-ibm-openapi-validator

Fix 2777 - Add IBM openapi validator

3 files changed, 69 insertions, 41 deletions

diff --git a/ale_linters/openapi/ibm_validator.vim b/ale_linters/openapi/ibm_validator.vim
new file mode 100644
index 00000000..446931a2
--- /dev/null
+++ b/ale_linters/openapi/ibm_validator.vim
@@ -0,0 +1,58 @@
+" Author: Horacio Sanson <hsanson@gmail.com>
+
+call ale#Set('openapi_ibm_validator_executable', 'lint-openapi')
+call ale#Set('openapi_ibm_validator_options', '')
+
+function! ale_linters#openapi#ibm_validator#GetCommand(buffer) abort
+    return '%e' . ale#Pad(ale#Var(a:buffer, 'openapi_ibm_validator_options'))
+    \ . ' %t'
+endfunction
+
+function! ale_linters#openapi#ibm_validator#Handle(buffer, lines) abort
+    let l:output = []
+    let l:type = 'E'
+    let l:message = ''
+    let l:nr = -1
+
+    for l:line in a:lines
+        let l:match = matchlist(l:line, '^errors$')
+
+        if !empty(l:match)
+            let l:type = 'E'
+        endif
+
+        let l:match = matchlist(l:line, '^warnings$')
+
+        if !empty(l:match)
+            let l:type = 'W'
+        endif
+
+        let l:match = matchlist(l:line, '^ *Message : *\(.\+\)$')
+
+        if !empty(l:match)
+            let l:message = l:match[1]
+        endif
+
+        let l:match = matchlist(l:line, '^ *Line *: *\(\d\+\)$')
+
+        if !empty(l:match)
+            let l:nr = l:match[1]
+
+            call add(l:output, {
+            \   'lnum': l:nr + 0,
+            \   'col': 0,
+            \   'text': l:message,
+            \   'type': l:type,
+            \})
+        endif
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('openapi', {
+\   'name': 'ibm_validator',
+\   'executable': {b -> ale#Var(b, 'openapi_ibm_validator_executable')},
+\   'command': function('ale_linters#openapi#ibm_validator#GetCommand'),
+\   'callback': 'ale_linters#openapi#ibm_validator#Handle',
+\})
diff --git a/ale_linters/openapi/yamllint.vim b/ale_linters/openapi/yamllint.vim
new file mode 100644
index 00000000..2b8952cc
--- /dev/null
+++ b/ale_linters/openapi/yamllint.vim
@@ -0,0 +1,9 @@
+call ale#Set('yaml_yamllint_executable', 'yamllint')
+call ale#Set('yaml_yamllint_options', '')
+
+call ale#linter#Define('openapi', {
+\   'name': 'yamllint',
+\   'executable': {b -> ale#Var(b, 'yaml_yamllint_executable')},
+\   'command': function('ale#handlers#yamllint#GetCommand'),
+\   'callback': 'ale#handlers#yamllint#Handle',
+\})
diff --git a/ale_linters/yaml/yamllint.vim b/ale_linters/yaml/yamllint.vim
index bedb7bf1..39011df1 100644
--- a/ale_linters/yaml/yamllint.vim
+++ b/ale_linters/yaml/yamllint.vim
@@ -3,48 +3,9 @@
 call ale#Set('yaml_yamllint_executable', 'yamllint')
 call ale#Set('yaml_yamllint_options', '')
 
-function! ale_linters#yaml#yamllint#GetCommand(buffer) abort
-    return '%e' . ale#Pad(ale#Var(a:buffer, 'yaml_yamllint_options'))
-    \   . ' -f parsable %t'
-endfunction
-
-function! ale_linters#yaml#yamllint#Handle(buffer, lines) abort
-    " Matches patterns line the following:
-    " something.yaml:1:1: [warning] missing document start "---" (document-start)
-    " something.yml:2:1: [error] syntax error: expected the node content, but found '<stream end>'
-    let l:pattern = '\v^.*:(\d+):(\d+): \[(error|warning)\] (.+)$'
-    let l:output = []
-
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        let l:item = {
-        \   'lnum': l:match[1] + 0,
-        \   'col': l:match[2] + 0,
-        \   'text': l:match[4],
-        \   'type': l:match[3] is# 'error' ? 'E' : 'W',
-        \}
-
-        let l:code_match = matchlist(l:item.text, '\v^(.+) \(([^)]+)\)$')
-
-        if !empty(l:code_match)
-            if l:code_match[2] is# 'trailing-spaces'
-            \&& !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
-                " Skip warnings for trailing whitespace if the option is off.
-                continue
-            endif
-
-            let l:item.text = l:code_match[1]
-            let l:item.code = l:code_match[2]
-        endif
-
-        call add(l:output, l:item)
-    endfor
-
-    return l:output
-endfunction
-
 call ale#linter#Define('yaml', {
 \   'name': 'yamllint',
 \   'executable': {b -> ale#Var(b, 'yaml_yamllint_executable')},
-\   'command': function('ale_linters#yaml#yamllint#GetCommand'),
-\   'callback': 'ale_linters#yaml#yamllint#Handle',
+\   'command': function('ale#handlers#yamllint#GetCommand'),
+\   'callback': 'ale#handlers#yamllint#Handle',
 \})