fix: Switch erlang to oscarh/vimerl (it doesnt use plugin dir)

1 files changed, 61 insertions, 92 deletions

diff --git a/compiler/erlang.vim b/compiler/erlang.vim
index da88b856..6ab7526f 100644
--- a/compiler/erlang.vim
+++ b/compiler/erlang.vim
@@ -1,111 +1,80 @@
-" Vim compiler file
-" Language:     Erlang
-" Author:       Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
-" Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-" License:      Vim license
-" Version:      2013/03/06
+" Erlang compiler file
+" Language:   Erlang
+" Maintainer: Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
+" URL:        http://ktototaki.info
 
-if exists("current_compiler") || v:version < 703
-	finish
-else
-	let current_compiler = "erlang"
+if exists("current_compiler")
+    finish
 endif
-
-let b:error_list     = {}
-let b:is_showing_msg = 0
-let b:next_sign_id   = 1
+let current_compiler = "erlang"
 
 if exists(":CompilerSet") != 2
-	command -nargs=* CompilerSet setlocal <args>
+    command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=make
-CompilerSet errorformat=%f:%l:\ %tarning:\ %m,%f:%l:\ %m
-
-" Only define functions and script scope variables once
-if exists("*s:ShowErrors")
-	finish
+if !exists('g:erlangCheckFile')
+    let g:erlangCheckFile = "~/.vim/compiler/erlang_check_file.erl"
 endif
 
-if !exists("g:erlang_show_errors")
-	let g:erlang_show_errors = 1
+if !exists('g:erlangHighlightErrors')
+    let g:erlangHighlightErrors = 0
 endif
 
-let s:erlang_check_file = expand("<sfile>:p:h") . "/erlang_check.erl"
-let s:autocmds_defined  = 0
-
-sign define ErlangError   text=>> texthl=Error
-sign define ErlangWarning text=>> texthl=Todo
-
-command ErlangDisableShowErrors silent call s:DisableShowErrors()
-command ErlangEnableShowErrors  silent call s:EnableShowErrors()
+let b:error_list = {}
+let b:is_showing_msg = 0
 
-function s:ShowErrors()
-	setlocal shellpipe=>
-	if match(getline(1), "#!.*escript") != -1
-		setlocal makeprg=escript\ -s\ %
-	else
-		execute "setlocal makeprg=" . s:erlang_check_file . "\\ \%"
-	endif
-	silent make!
-	for error in getqflist()
-		let item         = {}
-		let item["lnum"] = error.lnum
-		let item["text"] = error.text
-		let b:error_list[error.lnum] = item
-		let type = error.type == "W" ? "ErlangWarning" : "ErlangError"
-		execute "sign place" b:next_sign_id "line=" . item.lnum "name=" . type "file=" . expand("%:p")
-		let b:next_sign_id += 1
-	endfor
-	setlocal shellpipe&
-	setlocal makeprg=make
+function! HighlightErlangErrors()
+    if match(getline(1), "#!.*escript") != -1
+        setlocal makeprg=escript\ -s\ %
+    else
+        execute "setlocal makeprg=" . g:erlangCheckFile . "\\ \%"
+    endif
+    silent make!
+    call s:clear_matches()
+    for error in getqflist()
+        let item = {}
+        let item['lnum'] = error.lnum
+        let item['msg'] = error.text
+        let b:error_list[error.lnum] = item
+        call matchadd('SpellBad', "\\%" . error.lnum . "l")
+    endfor
+    if len(getqflist())
+        redraw!
+    endif
+    call s:show_msg()
+    setlocal makeprg=erlc\ %
 endfunction
 
-function s:ShowErrorMsg()
-	let pos = getpos(".")
-	if has_key(b:error_list, pos[1])
-		let item = get(b:error_list, pos[1])
-		echo item.text
-		let b:is_showing_msg = 1
-	else
-		if b:is_showing_msg
-			echo
-			let b:is_showing_msg = 0
-		endif
-	endif
+function! s:show_msg()
+    let pos = getpos(".")
+    if has_key(b:error_list, pos[1])
+        let item = get(b:error_list, pos[1])
+        echo item.msg
+        let b:is_showing_msg = 1
+    else
+        if exists("b:is_showing_msg") && b:is_showing_msg == 1
+            echo
+            let b:is_showing_msg = 0
+        endif
+    endif
 endf
 
-function s:ClearErrors()
-	sign unplace *
-	let b:error_list   = {}
-	let b:next_sign_id = 1
-	if b:is_showing_msg
-		echo
-		let b:is_showing_msg = 0
-	endif
-endfunction
-
-function s:EnableShowErrors()
-	if !s:autocmds_defined
-		augroup vimerl
-			autocmd!
-			autocmd BufWritePre  *.erl call s:ClearErrors()
-			autocmd BufWritePost *.erl call s:ShowErrors()
-			autocmd CursorHold   *.erl call s:ShowErrorMsg()
-			autocmd CursorMoved  *.erl call s:ShowErrorMsg()
-		augroup END
-		let s:autocmds_defined = 1
-	endif
+function! s:clear_matches()
+    call clearmatches()
+    let b:error_list = {}
+    if exists("b:is_showing_msg") && b:is_showing_msg == 1
+        echo
+        let b:is_showing_msg = 0
+    endif
 endfunction
 
-function s:DisableShowErrors()
-	sign unplace *
-	augroup vimerl
-		autocmd!
-	augroup END
-	let s:autocmds_defined = 0
-endfunction
+CompilerSet makeprg=erlc\ %
+CompilerSet errorformat=%f:%l:\ %tarning:\ %m,%E%f:%l:\ %m
 
-if g:erlang_show_errors
-	call s:EnableShowErrors()
+if g:erlangHighlightErrors
+    autocmd BufLeave *.erl call s:clear_matches()
+    autocmd BufEnter *.erl call s:clear_matches()
+    autocmd BufWritePost *.erl call HighlightErlangErrors()
+    autocmd CursorHold *.erl call s:show_msg()
+    autocmd CursorMoved *.erl call s:show_msg()
 endif