summaryrefslogtreecommitdiff
path: root/ale_linters/sml
diff options
context:
space:
mode:
Diffstat (limited to 'ale_linters/sml')
-rw-r--r--ale_linters/sml/smlnj.vim46
-rw-r--r--ale_linters/sml/smlnj_cm.vim25
2 files changed, 29 insertions, 42 deletions
diff --git a/ale_linters/sml/smlnj.vim b/ale_linters/sml/smlnj.vim
index 4acfc9e6..f15579ea 100644
--- a/ale_linters/sml/smlnj.vim
+++ b/ale_linters/sml/smlnj.vim
@@ -1,47 +1,9 @@
-" Author: Paulo Alem <paulo.alem@gmail.com>
-" Description: Rudimentary SML checking with smlnj compiler
-
-function! ale_linters#sml#smlnj#Handle(buffer, lines) abort
- " Try to match basic sml errors
-
- let l:out = []
- let l:pattern = '^.*\:\([0-9\.]\+\)\ \(\w\+\)\:\ \(.*\)'
- let l:pattern2 = '^.*\:\([0-9]\+\)\.\?\([0-9]\+\).* \(\(Warning\|Error\): .*\)'
-
- for l:line in a:lines
- let l:match2 = matchlist(l:line, l:pattern2)
-
- if len(l:match2) != 0
- call add(l:out, {
- \ 'bufnr': a:buffer,
- \ 'lnum': l:match2[1] + 0,
- \ 'col' : l:match2[2] - 1,
- \ 'text': l:match2[3],
- \ 'type': l:match2[3] =~# '^Warning' ? 'W' : 'E',
- \})
- continue
- endif
-
- let l:match = matchlist(l:line, l:pattern)
-
- if len(l:match) != 0
- call add(l:out, {
- \ 'bufnr': a:buffer,
- \ 'lnum': l:match[1] + 0,
- \ 'text': l:match[2] . ': ' . l:match[3],
- \ 'type': l:match[2] is# 'error' ? 'E' : 'W',
- \})
- continue
- endif
-
- endfor
-
- return l:out
-endfunction
+" Author: Paulo Alem <paulo.alem@gmail.com>, Jake Zimmerman <jake@zimmerman.io>
+" Description: Single-file SML checking with SML/NJ compiler
call ale#linter#Define('sml', {
\ 'name': 'smlnj',
-\ 'executable': 'sml',
+\ 'executable_callback': 'ale#handlers#sml#GetExecutableSmlnjFile',
\ 'command': 'sml',
-\ 'callback': 'ale_linters#sml#smlnj#Handle',
+\ 'callback': 'ale#handlers#sml#Handle',
\})
diff --git a/ale_linters/sml/smlnj_cm.vim b/ale_linters/sml/smlnj_cm.vim
new file mode 100644
index 00000000..93cee63c
--- /dev/null
+++ b/ale_linters/sml/smlnj_cm.vim
@@ -0,0 +1,25 @@
+" Author: Jake Zimmerman <jake@zimmerman.io>
+" Description: SML checking with SML/NJ Compilation Manager
+
+" Let user manually set the CM file (in case our search for a CM file is
+" ambiguous and picks the wrong one)
+"
+" See :help ale-sml-smlnj for more information.
+call ale#Set('sml_smlnj_cm_file', '*.cm')
+
+function! ale_linters#sml#smlnj_cm#GetCommand(buffer) abort
+ let l:cmfile = ale#handlers#sml#GetCmFile(a:buffer)
+ return 'sml -m ' . l:cmfile . ' < /dev/null'
+endfunction
+
+" Using CM requires that we set "lint_file: 1", since it reads the files
+" from the disk itself.
+call ale#linter#Define('sml', {
+\ 'name': 'smlnj-cm',
+\ 'executable_callback': 'ale#handlers#sml#GetExecutableSmlnjCm',
+\ 'lint_file': 1,
+\ 'command_callback': 'ale_linters#sml#smlnj_cm#GetCommand',
+\ 'callback': 'ale#handlers#sml#Handle',
+\})
+
+" vim:ts=4:sts=4:sw=4