summaryrefslogtreecommitdiffstats
path: root/indent/scala.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2016-09-11 13:24:17 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2016-09-11 13:24:17 +0200
commit0244e228faf6ee71750cbca3bdcd18411a927d22 (patch)
treea72e5c9839ea593f6edc23f7f0e637e0a4a89413 /indent/scala.vim
parentab61d2ac8eafc9c10097577736602da48ec568ca (diff)
downloadvim-polyglot-0244e228faf6ee71750cbca3bdcd18411a927d22.tar.gz
vim-polyglot-0244e228faf6ee71750cbca3bdcd18411a927d22.zip
Update
Diffstat (limited to 'indent/scala.vim')
-rw-r--r--indent/scala.vim9
1 files changed, 7 insertions, 2 deletions
diff --git a/indent/scala.vim b/indent/scala.vim
index 6f5d1da9..da6c2f5c 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -378,12 +378,17 @@ function! GetScalaIndent()
let prevline = scala#GetLine(prevlnum)
let curlnum = v:lnum
let curline = scala#GetLine(curlnum)
+ if get(g:, 'scala_scaladoc_indent', 0)
+ let star_indent = 2
+ else
+ let star_indent = 1
+ end
if prevline =~ '^\s*/\*\*'
if prevline =~ '\*/\s*$'
return ind
else
- return ind + 1
+ return ind + star_indent
endif
endif
@@ -538,7 +543,7 @@ function! GetScalaIndent()
if prevline =~ '^\s*\*/'
\ || prevline =~ '*/\s*$'
call scala#ConditionalConfirm("18")
- let ind = ind - 1
+ let ind = ind - star_indent
endif
if scala#LineEndsInIncomplete(prevline)