diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2014-06-08 19:35:34 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2014-06-08 19:35:34 +0200 |
| commit | 33dd4b2741ce51f02dea47298c6abfc847215889 (patch) | |
| tree | c56bbb9039ac9beaa7a5c16859dcd7816af5b7c8 | |
| parent | d6866fccedc65c4506c50776e23ec202757382bb (diff) | |
| download | vim-polyglot-33dd4b2741ce51f02dea47298c6abfc847215889.tar.gz vim-polyglot-33dd4b2741ce51f02dea47298c6abfc847215889.zip | |
Update scala
| -rw-r--r-- | indent/scala.vim | 17 | ||||
| -rw-r--r-- | syntax/scala.vim | 17 |
2 files changed, 24 insertions, 10 deletions
diff --git a/indent/scala.vim b/indent/scala.vim index 9cdb0e8d..c9dc639e 100644 --- a/indent/scala.vim +++ b/indent/scala.vim @@ -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\+' diff --git a/syntax/scala.vim b/syntax/scala.vim index a61a60af..b9df50f3 100644 --- a/syntax/scala.vim +++ b/syntax/scala.vim @@ -4,8 +4,19 @@ elseif exists("b:current_syntax") finish endif +scriptencoding utf-8 + let b:current_syntax = "scala" +function! s:ContainedGroup() + try + silent syn list @scala + return '@scala' + catch /E392/ + return 'TOP' + endtry +endfunction + syn case match syn sync minlines=200 maxlines=1000 @@ -17,7 +28,7 @@ syn keyword scalaKeyword val nextgroup=scalaNameDefinition,scalaQuasiQuotes skip syn keyword scalaKeyword def var nextgroup=scalaNameDefinition skipwhite hi link scalaKeyword Keyword -syn region scalaBlock start=/{/ end=/}/ contains=TOP fold +exe 'syn region scalaBlock start=/{/ end=/}/ contains=' . s:ContainedGroup() . ' fold' syn keyword scalaAkkaSpecialWord when goto using startWith initialize onTransition stay become unbecome hi link scalaAkkaSpecialWord PreProc @@ -103,13 +114,13 @@ hi link scalaIString String hi link scalaTripleIString String syn match scalaInterpolation /\$[a-zA-Z0-9_$]\+/ contained -syn region scalaInterpolationB matchgroup=scalaInterpolation start=/\${/ end=/}/ contained contains=TOP +exe 'syn region scalaInterpolationB matchgroup=scalaInterpolation start=/\${/ end=/}/ contained contains=' . s:ContainedGroup() hi link scalaInterpolation Function hi link scalaInterpolationB Normal syn region scalaFString matchgroup=Special start=/f"/ skip=/\\"/ end=/"/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar syn match scalaFInterpolation /\$[a-zA-Z0-9_$]\+\(%[-A-Za-z0-9\.]\+\)\?/ contained -syn region scalaFInterpolationB matchgroup=scalaFInterpolation start=/${/ end=/}\(%[-A-Za-z0-9\.]\+\)\?/ contained contains=TOP +exe 'syn region scalaFInterpolationB matchgroup=scalaFInterpolation start=/${/ end=/}\(%[-A-Za-z0-9\.]\+\)\?/ contained contains=' . s:ContainedGroup() hi link scalaFString String hi link scalaFInterpolation Function hi link scalaFInterpolationB Normal |