Update scala

This commit is contained in:
Adam Stankiewicz
2014-06-08 19:35:34 +02:00
parent d6866fcced
commit 33dd4b2741
2 changed files with 24 additions and 10 deletions

View File

@@ -4,18 +4,21 @@
" Modifications by : Derek Wyatt
" Last Change: 2011 Mar 19 (Derek Wyatt)
"if exists("b:did_indent")
" finish
"endif
"let b:did_indent = 1
if exists("b:did_indent")
finish
endif
let b:did_indent = 1
setlocal indentexpr=GetScalaIndent()
setlocal indentkeys=0{,0},0),!^F,<>>,o,O,e,=case,<CR>
setlocal autoindent
setlocal softtabstop=2
setlocal tabstop=2
setlocal shiftwidth=2
"if exists("*GetScalaIndent")
" finish
"endif
if exists("*GetScalaIndent")
finish
endif
let s:defMatcher = '\%(\%(private\|protected\)\%(\[[^\]]*\]\)\?\s\+\|abstract\s\+\|override\s\+\)*\<def\>'
let s:funcNameMatcher = '\w\+'