This commit is contained in:
Adam Stankiewicz
2020-04-25 21:03:34 +02:00
parent 14dc82fc4e
commit 68b2748af1
15 changed files with 292 additions and 300 deletions

View File

@@ -42,7 +42,7 @@ function GetCrystalIndent(...)
let clnum = a:0 ? a:1 : v:lnum
" Set up variables for restoring position in file
let vcol = col(clnum)
let vcol = col('.')
" Work on the current line {{{2
" ------------------------
@@ -170,7 +170,7 @@ function GetCrystalIndent(...)
"
" If it contained hanging closing brackets, find the rightmost one, find its
" match and indent according to that.
if line =~# '[[({]' || line =~# '[])}]\s*\%(#.*\)\=$'
if line =~# '[[({]' || line =~# '[])]\s*\%(#.*\)\=$'
let [opening, closing] = crystal#indent#ExtraBrackets(lnum)
if opening.pos != -1
@@ -186,7 +186,7 @@ function GetCrystalIndent(...)
endif
elseif closing.pos != -1
call cursor(lnum, closing.pos + 1)
normal! %
keepjumps normal! %
if crystal#indent#Match(line('.'), g:crystal#indent#crystal_indent_keywords)
return indent('.') + s:sw()

View File

@@ -370,23 +370,13 @@ function GetJuliaIndent()
" Analyse the reference line
let [num_open_blocks, num_closed_blocks] = GetJuliaNestingStruct(lnum, st, lim)
" Increase indentation for each newly opened block
" in the reference line
while num_open_blocks > 0
let ind += &sw
let num_open_blocks -= 1
endwhile
" Increase indentation for each newly opened block in the reference line
let ind += shiftwidth() * num_open_blocks
" Analyse the current line
let [num_open_blocks, num_closed_blocks] = GetJuliaNestingStruct(v:lnum)
" Decrease indentation for each closed block
" in the current line
while num_closed_blocks > 0
let ind -= &sw
let num_closed_blocks -= 1
endwhile
" Decrease indentation for each closed block in the current line
let ind -= shiftwidth() * num_closed_blocks
return ind
endfunction