Change julia provider to JuliaEditorSupport/julia-vim, closes #253

indent/fish.vim

@@ -1,6 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
-  
-setlocal indentexpr=fish#Indent()
-setlocal indentkeys+==end,=else,=case
-
-endif

indent/fsharp.vim

@@ -1,253 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
-  
-" Vim indent file
-" Language:     FSharp
-" Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
-"               Mike Leary           <leary@nwlink.com>
-"               Markus Mottl         <markus.mottl@gmail.com>
-"               Rudi Grinberg        <rudi.grinberg@gmail.com>
-"               Gregor Uhlenheuer    <kongo2002@gmail.com>
-" Last Change:  2013 Jun 29
-"               2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
-"               2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
-"               2013 June   - commented textwidth (Marc Weber)
-"               2014 August - Ported to F#
-"               2014 August - F# specific cleanup
-"
-" Marc Weber's comment: This file may contain a lot of (very custom) stuff
-" which eventually should be moved somewhere else ..
-
-" Only load this indent file when no other was loaded.
-
-if exists("b:did_indent")
-    finish
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=GetFsharpIndent()
-setlocal indentkeys+=0=and,0=class,0=constraint,0=done,0=else,0=end,0=exception,0=external,0=if,0=in,0=include,0=inherit,0=let,0=method,0=open,0=then,0=type,0=val,0=with,0;;,0>\],0\|\],0>},0\|,0},0\],0)
-
-" Only define the function once.
-if exists("*GetFsharpIndent")
-    finish
-endif
-
-" Skipping pattern, for comments
-function! s:GetLineWithoutFullComment(lnum)
-    let lnum = prevnonblank(a:lnum - 1)
-    let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
-    while lline =~ '^\s*$' && lnum > 0
-        let lnum = prevnonblank(lnum - 1)
-        let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
-    endwhile
-    return lnum
-endfunction
-
-" Indent for ';;' to match multiple 'let'
-function! s:GetInd(lnum, pat, lim)
-    let llet = search(a:pat, 'bW')
-    let old = indent(a:lnum)
-    while llet > 0
-        let old = indent(llet)
-        let nb = s:GetLineWithoutFullComment(llet)
-        if getline(nb) =~ a:lim
-            return old
-        endif
-        let llet = search(a:pat, 'bW')
-    endwhile
-    return old
-endfunction
-
-" Indent pairs
-function! s:FindPair(pstart, pmid, pend)
-    call search(a:pend, 'bW')
-    return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
-endfunction
-
-" Indent 'let'
-function! s:FindLet(pstart, pmid, pend)
-    call search(a:pend, 'bW')
-    return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ s:beflet'))
-endfunction
-
-function! GetFsharpIndent()
-    " Find a non-commented line above the current line.
-    let lnum = s:GetLineWithoutFullComment(v:lnum)
-
-    " At the start of the file use zero indent.
-    if lnum == 0
-        return 0
-    endif
-
-    let ind = indent(lnum)
-    let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
-
-    " " Return single 'shiftwidth' after lines matching:
-    " if lline =~ '^\s*|.*->\s*$'
-    "     return ind + &sw
-    " endif
-
-    let line = getline(v:lnum)
-
-    " Indent if current line begins with 'end':
-    if line =~ '^\s*end\>'
-        return s:FindPair(s:module, '','\<end\>')
-
-        " Indent if current line begins with 'done' for 'do':
-    elseif line =~ '^\s*done\>'
-        return s:FindPair('\<do\>', '','\<done\>')
-
-        " Indent if current line begins with '}' or '>}':
-    elseif line =~ '^\s*\(\|>\)}'
-        return s:FindPair('{', '','}')
-
-        " Indent if current line begins with ']', '|]' or '>]':
-    elseif line =~ '^\s*\(\||\|>\)\]'
-        return s:FindPair('\[', '','\]')
-
-        " Indent if current line begins with ')':
-    elseif line =~ '^\s*)'
-        return s:FindPair('(', '',')')
-
-        " Indent if current line begins with 'let':
-    elseif line =~ '^\s*let\>'
-        if lline !~ s:lim . '\|' . s:letlim . '\|' . s:beflet
-            return s:FindLet(s:type, '','\<let\s*$')
-        endif
-
-        " Indent if current line begins with 'class' or 'type':
-    elseif line =~ '^\s*\(class\|type\)\>'
-        if lline !~ s:lim . '\|\<and\s*$\|' . s:letlim
-            return s:FindLet(s:type, '','\<\(class\|type\)\s*$')
-        endif
-
-        " Indent for pattern matching:
-    elseif line =~ '^\s*|'
-        if lline !~ '^\s*\(|[^\]]\|\(match\|type\|with\)\>\)\|\<\(function\|private\|with\)\s*$'
-            call search('|', 'bW')
-            return indent(searchpair('^\s*\(match\|type\)\>\|\<\(function\|private\|with\)\s*$', '', '^\s*|', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") !~ "^\\s*|.*->"'))
-        endif
-
-        " Indent if current line begins with ';;':
-    elseif line =~ '^\s*;;'
-        if lline !~ ';;\s*$'
-            return s:GetInd(v:lnum, s:letpat, s:letlim)
-        endif
-
-        " Indent if current line begins with 'in':
-    elseif line =~ '^\s*in\>'
-        if lline !~ '^\s*\(let\|and\)\>'
-            return s:FindPair('\<let\>', '', '\<in\>')
-        endif
-
-        " Indent if current line begins with 'else':
-    elseif line =~ '^\s*else\>'
-        if lline !~ '^\s*\(if\|then\)\>'
-            return s:FindPair('\<if\>', '', '\<else\>')
-        endif
-
-        " Indent if current line begins with 'then':
-    elseif line =~ '^\s*then\>'
-        if lline !~ '^\s*\(if\|else\)\>'
-            return s:FindPair('\<if\>', '', '\<then\>')
-        endif
-
-        " Indent if current line begins with 'and':
-    elseif line =~ '^\s*and\>'
-        if lline !~ '^\s*\(and\|let\|type\)\>\|\<end\s*$'
-            return ind - &sw
-        endif
-
-        " Indent if current line begins with 'with':
-    elseif line =~ '^\s*with\>'
-        if lline !~ '^\s*\(match\|try\)\>'
-            return s:FindPair('\<\%(match\|try\)\>', '','\<with\>')
-        endif
-
-        " Indent if current line begins with 'exception', 'external', 'include' or
-        " 'open':
-    elseif line =~ '^\s*\(exception\|external\|include\|open\)\>'
-        if lline !~ s:lim . '\|' . s:letlim
-            call search(line)
-            return indent(search('^\s*\(\(exception\|external\|include\|open\|type\)\>\|val\>.*:\)', 'bW'))
-        endif
-
-        " Indent if current line begins with 'val':
-    elseif line =~ '^\s*val\>'
-        if lline !~ '^\s*\(exception\|external\|include\|open\)\>\|' . s:obj . '\|' . s:letlim
-            return indent(search('^\s*\(\(exception\|include\|initializer\|method\|open\|type\|val\)\>\|external\>.*:\)', 'bW'))
-        endif
-
-        " Indent if current line begins with 'constraint', 'inherit', 'initializer'
-        " or 'method':
-    elseif line =~ '^\s*\(constraint\|inherit\|initializer\|method\)\>'
-        if lline !~ s:obj
-            return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + &sw
-        endif
-
-    endif
-
-    " Add a 'shiftwidth' after lines ending with:
-    if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|private\|sig\|struct\|then\|try\)\|\<object\s*(.*)\)\s*$'
-        let ind = ind + &sw
-
-        " Back to normal indent after lines ending with ';;':
-    elseif lline =~ ';;\s*$' && lline !~ '^\s*;;'
-        let ind = s:GetInd(v:lnum, s:letpat, s:letlim)
-
-        " Back to normal indent after lines ending with 'end':
-    elseif lline =~ '\<end\s*$'
-        let ind = s:FindPair(s:module, '','\<end\>')
-
-        " Back to normal indent after lines ending with 'in':
-    elseif lline =~ '\<in\s*$' && lline !~ '^\s*in\>'
-        let ind = s:FindPair('\<let\>', '', '\<in\>')
-
-        " Back to normal indent after lines ending with 'done':
-    elseif lline =~ '\<done\s*$'
-        let ind = s:FindPair('\<do\>', '','\<done\>')
-
-        " Back to normal indent after lines ending with '}' or '>}':
-    elseif lline =~ '\(\|>\)}\s*$'
-        let ind = s:FindPair('{', '','}')
-
-        " Back to normal indent after lines ending with ']', '|]' or '>]':
-    elseif lline =~ '\(\||\|>\)\]\s*$'
-        let ind = s:FindPair('\[', '','\]')
-
-        " Back to normal indent after comments:
-    elseif lline =~ '\*)\s*$'
-        call search('\*)', 'bW')
-        let ind = indent(searchpair('(\*', '', '\*)', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"'))
-
-        " Back to normal indent after lines ending with ')':
-    elseif lline =~ ')\s*$'
-        let ind = s:FindPair('(', '',')')
-
-        " If this is a multiline comment then align '*':
-    elseif lline =~ '^\s*(\*' && line =~ '^\s*\*'
-        let ind = ind + 1
-
-    else
-        " Don't change indentation of this line
-        " for new lines (indent==0) use indentation of previous line
-
-        " This is for preventing removing indentation of these args:
-        "   let f x =
-        "     let y = x + 1 in
-        "     Printf.printf
-        "       "o"           << here
-        "       "oeuth"       << don't touch indentation
-
-        let i = indent(v:lnum)
-        return i == 0 ? ind : i
-
-    endif
-
-    return ind
-
-endfunction
-
-" vim: sw=4 et sts=4
-
-endif

indent/gitconfig.vim

@@ -1,42 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
-" Vim indent file
-" Language:	git config file
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
-
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-setlocal autoindent
-setlocal indentexpr=GetGitconfigIndent()
-setlocal indentkeys=o,O,*<Return>,0[,],0;,0#,=,!^F
-
-let b:undo_indent = 'setl ai< inde< indk<'
-
-" Only define the function once.
-if exists("*GetGitconfigIndent")
-  finish
-endif
-
-function! GetGitconfigIndent()
-  let sw    = exists('*shiftwidth') ? shiftwidth() : &sw
-  let line  = getline(prevnonblank(v:lnum-1))
-  let cline = getline(v:lnum)
-  if line =~  '\\\@<!\%(\\\\\)*\\$'
-    " odd number of slashes, in a line continuation
-    return 2 * sw
-  elseif cline =~ '^\s*\['
-    return 0
-  elseif cline =~ '^\s*\a'
-    return sw
-  elseif cline == ''       && line =~ '^\['
-    return sw
-  else
-    return -1
-  endif
-endfunction
-
-endif

indent/glsl.vim

@@ -1,15 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
-  
-" Language: OpenGL Shading Language
-" Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
-
-if exists("b:did_indent")
-  finish
-endif
-
-setlocal autoindent cindent
-setlocal formatoptions+=roq
-
-" vim:set sts=2 sw=2 :
-
-endif

indent/julia.vim

@@ -3,13 +3,13 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Vim indent file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
-" Last Change:	2011 dec 11
-" Notes:        based on Bram Moneaar's indent file for vim
+" Last Change:	2016 jun 16
+" Notes:        originally based on Bram Molenaar's indent file for vim
 
 setlocal autoindent
 
 setlocal indentexpr=GetJuliaIndent()
-setlocal indentkeys+==end,=else,=catch,=finally
+setlocal indentkeys+==end,=else,=catch,=finally,),],}
 setlocal indentkeys-=0#
 setlocal indentkeys-=:
 setlocal indentkeys-=0{
@@ -21,12 +21,16 @@ if exists("*GetJuliaIndent")
   finish
 endif
 
-let s:skipPatterns = '\<julia\%(Comment\)\>'
+let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeEnd\|CommentL\|\%([bsv]\|ip\|big\|MIME\|Shell\|Printf\|Doc\)\=String\|RegEx\|SymbolS\?\)\>'
 
-function JuliaMatch(lnum, str, regex, st)
+function JuliaMatch(lnum, str, regex, st, ...)
   let s = a:st
+  let e = a:0 > 0 ? a:1 : -1
   while 1
     let f = match(a:str, a:regex, s)
+    if e >= 0 && f >= e
+      return -1
+    endif
     if f >= 0
       let attr = synIDattr(synID(a:lnum,f+1,1),"name")
       if attr =~ s:skipPatterns
@@ -39,15 +43,16 @@ function JuliaMatch(lnum, str, regex, st)
   return f
 endfunction
 
-function GetJuliaNestingStruct(lnum)
+function GetJuliaNestingStruct(lnum, ...)
   " Auxiliary function to inspect the block structure of a line
   let line = getline(a:lnum)
-  let s = 0
+  let s = a:0 > 0 ? a:1 : 0
+  let e = a:0 > 1 ? a:2 : -1
   let blocks_stack = []
   let num_closed_blocks = 0
   while 1
-    let fb = JuliaMatch(a:lnum, line, '@\@<!\<\%(if\|else\%(if\)\=\|while\|for\|try\|catch\|finally\|function\|macro\|begin\|type\|immutable\|let\|\%(bare\)\?module\|quote\|do\)\>', s)
-    let fe = JuliaMatch(a:lnum, line, '@\@<!\<end\>', s)
+    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\|\%(\%(abstract\|primitive\)\s\+\)\@<!type\|immutable\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e)
+    let fe = JuliaMatch(a:lnum, line, '@\@<!\<end\>', s, e)
 
     if fb < 0 && fe < 0
       " No blocks found
@@ -128,9 +133,13 @@ function GetJuliaNestingStruct(lnum)
         continue
       endif
 
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<\%(while\|for\|function\|macro\|begin\|type\|immutable\|let\|quote\|do\)\>', s)
+      let i = JuliaMatch(a:lnum, line, '@\@<!\<\%(while\|for\|\%(staged\)\?function\|macro\|begin\|\%(mutable\s\+\)\?struct\|\%(\%(abstract\|primitive\)\s\+\)\?type\|immutable\|let\|quote\|do\)\>', s)
       if i >= 0 && i == fb
-        let s = i+1
+        if match(line, '\<\%(mutable\|abstract\|primitive\)', i) != -1
+          let s = i+11
+        else
+          let s = i+1
+        endif
         call add(blocks_stack, 'other')
         continue
       endif
@@ -158,6 +167,128 @@ function GetJuliaNestingStruct(lnum)
   return [num_open_blocks, num_closed_blocks]
 endfunction
 
+function GetJuliaNestingBrackets(lnum, c)
+  " Auxiliary function to inspect the brackets structure of a line
+  let line = getline(a:lnum)[0 : (a:c - 1)]
+  let s = 0
+  let brackets_stack = []
+  let last_closed_bracket = -1
+  while 1
+    let fb = JuliaMatch(a:lnum, line, '[([{]', s)
+    let fe = JuliaMatch(a:lnum, line, '[])}]', s)
+
+    if fb < 0 && fe < 0
+      " No brackets found
+      break
+    end
+
+    if fb >= 0 && (fb < fe || fe < 0)
+      " The first occurrence is an opening bracket
+
+      let i = JuliaMatch(a:lnum, line, '(', s)
+      if i >= 0 && i == fb
+        let s = i+1
+        call add(brackets_stack, ['par',i])
+        continue
+      endif
+
+      let i = JuliaMatch(a:lnum, line, '\[', s)
+      if i >= 0 && i == fb
+        let s = i+1
+        call add(brackets_stack, ['sqbra',i])
+        continue
+      endif
+
+      let i = JuliaMatch(a:lnum, line, '{', s)
+      if i >= 0 && i == fb
+        let s = i+1
+        call add(brackets_stack, ['curbra',i])
+        continue
+      endif
+
+      " Note: it should be impossible to get here
+      break
+
+    else
+      " The first occurrence is a closing bracket
+
+      let i = JuliaMatch(a:lnum, line, ')', s)
+      if i >= 0 && i == fe
+        let s = i+1
+        if len(brackets_stack) > 0 && brackets_stack[-1][0] == 'par'
+          call remove(brackets_stack, -1)
+        else
+          let last_closed_bracket = i + 1
+        endif
+        continue
+      endif
+
+      let i = JuliaMatch(a:lnum, line, ']', s)
+      if i >= 0 && i == fe
+        let s = i+1
+        if len(brackets_stack) > 0 && brackets_stack[-1][0] == 'sqbra'
+          call remove(brackets_stack, -1)
+        else
+          let last_closed_bracket = i + 1
+        endif
+        continue
+      endif
+
+      let i = JuliaMatch(a:lnum, line, '}', s)
+      if i >= 0 && i == fe
+        let s = i+1
+        if len(brackets_stack) > 0 && brackets_stack[-1][0] == 'curbra'
+          call remove(brackets_stack, -1)
+        else
+          let last_closed_bracket = i + 1
+        endif
+        continue
+      endif
+
+      " Note: it should be impossible to get here
+      break
+
+    endif
+
+    " Note: it should be impossible to get here
+    break
+  endwhile
+  let first_open_bracket = -1
+  let last_open_bracket = -1
+  if len(brackets_stack) > 0
+    let first_open_bracket = brackets_stack[0][1]
+    let last_open_bracket = brackets_stack[-1][1]
+  endif
+  return [first_open_bracket, last_open_bracket, last_closed_bracket]
+endfunction
+
+let s:bracketBlocks = '\<julia\%(\%(\%(Printf\)\?Par\|SqBra\|CurBra\)Block\|ParBlockInRange\|StringVars\%(Par\|SqBra\|CurBra\)\|Dollar\%(Par\|SqBra\)\|QuotedParBlockS\?\)\>'
+
+function IsInBrackets(lnum, c)
+  let stack = map(synstack(a:lnum, a:c), 'synIDattr(v:val, "name")')
+  call filter(stack, 'v:val =~# s:bracketBlocks')
+  return len(stack) > 0
+endfunction
+
+" Auxiliary function to find a line which does not start in the middle of a
+" multiline bracketed expression, to be used as reference for block
+" indentation.
+function LastBlockIndent(lnum)
+  let lnum = a:lnum
+  let ind = 0
+  while lnum > 0
+    let ind = indent(lnum)
+    if ind == 0
+      return [lnum, 0]
+    endif
+    if !IsInBrackets(lnum, 1)
+      break
+    endif
+    let lnum = prevnonblank(lnum - 1)
+  endwhile
+  return [max([lnum,1]), ind]
+endfunction
+
 function GetJuliaIndent()
   let s:save_ignorecase = &ignorecase
   set noignorecase
@@ -172,19 +303,81 @@ function GetJuliaIndent()
     return 0
   endif
 
-  let ind = indent(lnum)
+  let ind = -1
+  let st = -1
+  let lim = -1
 
-  " Analyse previous line
-  let [num_open_blocks, num_closed_blocks] = GetJuliaNestingStruct(lnum)
+  " Multiline bracketed expressions take precedence
+  let c = len(getline(lnum)) + 1
+  while IsInBrackets(lnum, c)
+    let [first_open_bracket, last_open_bracket, last_closed_bracket] = GetJuliaNestingBrackets(lnum, c)
+
+    " First scenario: the previous line has a hanging open bracket:
+    " set the indentation to match the opening bracket (plus an extra space)
+    if last_open_bracket != -1
+      let st = last_open_bracket
+      let ind = virtcol([lnum, st + 1])
+
+    " Second scenario: some multiline bracketed expression was closed in the
+    " previous line. But since we know we are still in a bracketed expression,
+    " we need to find the line where the bracket was open
+    elseif last_closed_bracket != -1 " && exists("loaded_matchit")
+      " we use the % command to skip back (this is buggy without matchit, and
+      " is potentially a disaster if % got remapped)
+      call cursor(lnum, last_closed_bracket)
+      normal %
+      if line(".") == lnum
+        " something wrong here, give up
+        let ind = indent(lnum)
+      else
+        let lnum = line(".")
+        let c = col(".") - 1
+        if c == 0
+          " uhm, give up
+          let ind = 0
+        else
+          " we skipped a bracket set, keep searching for an opening bracket
+          let lim = c
+          continue
+        endif
+      endif
+
+    " Third scenario: nothing special, or matchit not available: keep the indentation
+    else
+      let ind = indent(lnum)
+    endif
+
+    " In case the current line starts with a closing bracket, we align it with
+    " the opening one.
+    if JuliaMatch(v:lnum, getline(v:lnum), '[])}]', indent(v:lnum)) == indent(v:lnum) && ind > 0
+      return ind - 1
+    endif
+
+    break
+  endwhile
+
+  if ind == -1
+    " We are not in a multiline bracketed expression. Thus we look for a
+    " previous line to use as a reference
+    let [lnum,ind] = LastBlockIndent(lnum)
+    let c = len(getline(lnum)) + 1
+    if IsInBrackets(lnum, c)
+      let [first_open_bracket, last_open_bracket, last_closed_bracket] = GetJuliaNestingBrackets(lnum, c)
+      let lim = first_open_bracket
+    endif
+  end
+
+  " Analyse the reference line
+  let [num_open_blocks, num_closed_blocks] = GetJuliaNestingStruct(lnum, st, lim)
 
   " Increase indentation for each newly opened block
-  " in the previous line
+  " in the reference line
   while num_open_blocks > 0
     let ind += &sw
     let num_open_blocks -= 1
   endwhile
 
-  " Analyse current line
+  " Analyse the current line
   let [num_open_blocks, num_closed_blocks] = GetJuliaNestingStruct(v:lnum)
 
   " Decrease indentation for each closed block