diff options
Diffstat (limited to 'indent/julia.vim')
| -rw-r--r-- | indent/julia.vim | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/indent/julia.vim b/indent/julia.vim index fe53789c..d118f3f4 100644 --- a/indent/julia.vim +++ b/indent/julia.vim @@ -23,11 +23,14 @@ if exists("*GetJuliaIndent") finish endif -let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeKeyword\|Comment\%([LM]\|Delim\)\|\%([bsv]\|ip\|big\|MIME\|Shell\|Printf\|Doc\)\=String\|RegEx\|SymbolS\?\)\>' +let s:skipPatternsBasic = '\<julia\%(Comment\%([LM]\|Delim\)\)\>' +let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeKeyword\|Comment\%([LM]\|Delim\)\|\%([bs]\|Shell\|Printf\|Doc\)\?String\|StringPrefixed\|DocStringM\(Raw\)\?\|RegEx\|SymbolS\?\|Macro\|Dotted\)\>' function JuliaMatch(lnum, str, regex, st, ...) let s = a:st let e = a:0 > 0 ? a:1 : -1 + let basic_skip = a:0 > 1 ? a:2 : 'all' + let skip = basic_skip ==# 'basic' ? s:skipPatternsBasic : s:skipPatterns while 1 let f = match(a:str, '\C' . a:regex, s) if e >= 0 && f >= e @@ -35,7 +38,8 @@ function JuliaMatch(lnum, str, regex, st, ...) endif if f >= 0 let attr = synIDattr(synID(a:lnum,f+1,1),"name") - if attr =~# s:skipPatterns + let attrT = synIDattr(synID(a:lnum,f+1,0),"name") + if attr =~# skip || attrT =~# skip let s = f+1 continue endif @@ -53,8 +57,8 @@ function GetJuliaNestingStruct(lnum, ...) let blocks_stack = [] let num_closed_blocks = 0 while 1 - let fb = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e) - let fe = JuliaMatch(a:lnum, line, '[@.]\@<!\<end\>', s, e) + let fb = JuliaMatch(a:lnum, line, '\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e) + let fe = JuliaMatch(a:lnum, line, '\<end\>', s, e) if fb < 0 && fe < 0 " No blocks found @@ -66,13 +70,13 @@ function GetJuliaNestingStruct(lnum, ...) " Note: some keywords (elseif,else,catch,finally) are both " closing blocks and opening new ones - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<if\>', s) + let i = JuliaMatch(a:lnum, line, '\<if\>', s) if i >= 0 && i == fb let s = i+1 call add(blocks_stack, 'if') continue endif - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<elseif\>', s) + let i = JuliaMatch(a:lnum, line, '\<elseif\>', s) if i >= 0 && i == fb let s = i+1 if len(blocks_stack) > 0 && blocks_stack[-1] == 'if' @@ -83,7 +87,7 @@ function GetJuliaNestingStruct(lnum, ...) endif continue endif - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<else\>', s) + let i = JuliaMatch(a:lnum, line, '\<else\>', s) if i >= 0 && i == fb let s = i+1 if len(blocks_stack) > 0 && blocks_stack[-1] =~# '\<\%(else\)\=if\>' @@ -95,13 +99,13 @@ function GetJuliaNestingStruct(lnum, ...) continue endif - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<try\>', s) + let i = JuliaMatch(a:lnum, line, '\<try\>', s) if i >= 0 && i == fb let s = i+1 call add(blocks_stack, 'try') continue endif - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<catch\>', s) + let i = JuliaMatch(a:lnum, line, '\<catch\>', s) if i >= 0 && i == fb let s = i+1 if len(blocks_stack) > 0 && blocks_stack[-1] == 'try' @@ -112,7 +116,7 @@ function GetJuliaNestingStruct(lnum, ...) endif continue endif - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<finally\>', s) + let i = JuliaMatch(a:lnum, line, '\<finally\>', s) if i >= 0 && i == fb let s = i+1 if len(blocks_stack) > 0 && (blocks_stack[-1] == 'try' || blocks_stack[-1] == 'catch') @@ -124,7 +128,7 @@ function GetJuliaNestingStruct(lnum, ...) continue endif - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(bare\)\?module\>', s) + let i = JuliaMatch(a:lnum, line, '\<\%(bare\)\?module\>', s) if i >= 0 && i == fb let s = i+1 if i == 0 @@ -135,7 +139,7 @@ function GetJuliaNestingStruct(lnum, ...) continue endif - let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(while\|for\|\%(staged\)\?function\|macro\|begin\|\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\|immutable\|let\|quote\|do\)\>', s) + let i = JuliaMatch(a:lnum, line, '\<\%(while\|for\|function\|macro\|begin\|\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\|let\|quote\|do\)\>', s) if i >= 0 && i == fb if match(line, '\C\<\%(mutable\|abstract\|primitive\)', i) != -1 let s = i+11 @@ -278,7 +282,7 @@ endfunction function IsInDocString(lnum) let stack = map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")') - call filter(stack, 'v:val =~# "\\<juliaDocString\\(Delim\\|M\\)\\?\\>"') + call filter(stack, 'v:val =~# "\\<juliaDocString\\(Delim\\|M\\\(Raw\\)\\?\\)\\?\\>"') return len(stack) > 0 endfunction @@ -449,7 +453,7 @@ function GetJuliaIndent() " reference point let cind = JuliaMatch(lnum, prevline, ':', indent(lnum), lim) if cind >= 0 - let nonwhiteind = JuliaMatch(lnum, prevline, '\S', cind+1) + let nonwhiteind = JuliaMatch(lnum, prevline, '\S', cind+1, -1, 'basic') if nonwhiteind >= 0 " return match(prevline, '\S', cind+1) " a bit overkill... return cind + 2 @@ -460,7 +464,7 @@ function GetJuliaIndent() let iind = JuliaMatch(lnum, prevline, '\<import\|using\|export\>', indent(lnum), lim) if iind >= 0 " assuming whitespace after using... so no `using(XYZ)` please! - let nonwhiteind = JuliaMatch(lnum, prevline, '\S', iind+6) + let nonwhiteind = JuliaMatch(lnum, prevline, '\S', iind+6, -1, 'basic') if nonwhiteind >= 0 return match(prevline, '\S', iind+6) endif |