diff options
| author | Christian Clason <christian.clason@uni-due.de> | 2021-09-13 15:05:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 06:05:27 -0700 |
| commit | 1a9d2a4040f3ba3fe272488a7e85db6cdb453d39 (patch) | |
| tree | 651f4cc1673c1e75f23d06e52da635bc3c7d0c5d /runtime/indent/scala.vim | |
| parent | d5b66e88601b4d2fde5d905f9d12847126ba4449 (diff) | |
| download | rneovim-1a9d2a4040f3ba3fe272488a7e85db6cdb453d39.tar.gz rneovim-1a9d2a4040f3ba3fe272488a7e85db6cdb453d39.tar.bz2 rneovim-1a9d2a4040f3ba3fe272488a7e85db6cdb453d39.zip | |
vim-patch:89a9c159f23f #15641
Update runtime files
https://github.com/vim/vim/commit/89a9c159f23fb7b3e24e6d09068adfc24a73afcb
Omit:
nsis/lang/turkish.nsi
pixmaps/gen-inline-pixbufs.sh
doc/popup.txt
doc/terminal.txt
tutor/tutor*
src/[g]vimtutor
CONTRIBUTING.md
Skip:
doc/eval.txt (needs 8.1.2342)
doc/testing.txt (needs 8.2.0299)
Diffstat (limited to 'runtime/indent/scala.vim')
| -rw-r--r-- | runtime/indent/scala.vim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/indent/scala.vim b/runtime/indent/scala.vim index 6fd8ca9d81..b5eba29543 100644 --- a/runtime/indent/scala.vim +++ b/runtime/indent/scala.vim @@ -20,7 +20,10 @@ endif let s:keepcpo= &cpo set cpo&vim -let s:defMatcher = '\%(\%(private\|protected\)\%(\[[^\]]*\]\)\?\s\+\|abstract\s\+\|override\s\+\)*\<def\>' +let s:annotationMatcher = '@[A-Za-z._]\+\s\+' +let s:modifierMatcher = s:annotationMatcher . '\|\%(private\|protected\)\%(\[[^\]]*\]\)\?\s\+\|abstract\s\+\|override\s\+\|final\s\+' +let s:defMatcher = '\%(' . s:modifierMatcher . '\)*\<def\>' +let s:valMatcher = '\%(' . s:modifierMatcher . '\|lazy\s\+\)*\<va[lr]\>' let s:funcNameMatcher = '\w\+' let s:typeSpecMatcher = '\%(\s*\[\_[^\]]*\]\)' let s:defArgMatcher = '\%((\_.\{-})\)' @@ -184,7 +187,7 @@ function! scala#NumberOfBraceGroups(line) endfunction function! scala#MatchesIncompleteDefValr(line) - if a:line =~ '^\s*\%(' . s:defMatcher . '\|\<va[lr]\>\).*[=({]\s*$' + if a:line =~ '^\s*\%(' . s:defMatcher . '\|' . s:valMatcher . '\).*[=({]\s*$' return 1 else return 0 @@ -434,7 +437,7 @@ function! GetScalaIndent() " If 'val', 'var', 'def' end with =, this is a one-line block if (prevline =~ '^\s*\<\%(\%(}\?\s*else\s\+\)\?if\|for\|while\)\>.*[)=]\s*$' && scala#NumberOfBraceGroups(prevline) <= 1) \ || prevline =~ '^\s*' . s:defMatcher . '.*=\s*$' - \ || prevline =~ '^\s*\<va[lr]\>.*[=]\s*$' + \ || prevline =~ '^\s*' . s:valMatcher . '.*[=]\s*$' \ || prevline =~ '^\s*\%(}\s*\)\?\<else\>\s*$' \ || prevline =~ '=\s*$' call scala#ConditionalConfirm("4") |