diff options
Diffstat (limited to 'indent/javascript.vim')
| -rw-r--r-- | indent/javascript.vim | 200 |
1 files changed, 98 insertions, 102 deletions
diff --git a/indent/javascript.vim b/indent/javascript.vim index add0dfb1..e8573790 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -2,26 +2,26 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == " Vim indent file " Language: Javascript -" Maintainer: vim-javascript community -" URL: https://github.com/pangloss/vim-javascript -" Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org +" Maintainer: vim-javascript community +" URL: https://github.com/pangloss/vim-javascript +" Last Change: August 20, 2016 " Only load this indent file when no other was loaded. -if exists("b:did_indent") +if exists('b:did_indent') finish endif let b:did_indent = 1 " Now, set up our indentation expression and keys that trigger it. setlocal indentexpr=GetJavascriptIndent() -setlocal nolisp +setlocal nolisp noautoindent nosmartindent setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e setlocal cinoptions+=j1,J1 -let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<' +let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< cinoptions<' " Only define the function once. -if exists("*GetJavascriptIndent") +if exists('*GetJavascriptIndent') finish endif @@ -30,125 +30,120 @@ set cpo&vim " Get shiftwidth value if exists('*shiftwidth') - func s:sw() + function s:sw() return shiftwidth() - endfunc + endfunction else - func s:sw() + function s:sw() return &sw - endfunc + endfunction endif -let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*' -let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:\C' +let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>' +let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:' " Regex of syntax group names that are or delimit string or are comments. -let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c' +let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)' " Regex of syntax group names that are strings or documentation. -let s:syng_comment = '\%(comment\|doc\)\c' +let s:syng_comment = '\%(comment\|doc\)' " Expression used to check whether we should skip a match with searchpair(). -let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),'')" +let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'" -func s:lookForParens(start,end,flags,time) - try - return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time) - catch /E118/ - return searchpair(a:start,'',a:end,a:flags,0,0) - endtry -endfunc +if has('reltime') + function s:GetPair(start,end,flags,time) + return searchpair(a:start,'',a:end,a:flags,s:skip_expr,max([prevnonblank(v:lnum) - 2000,0]),a:time) + endfunction +else + function s:GetPair(start,end,flags,n) + return searchpair(a:start,'',a:end,a:flags,0,max([prevnonblank(v:lnum) - 2000,0])) + endfunction +endif -let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$' +let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$' " configurable regexes that define continuation lines, not including (, {, or [. if !exists('g:javascript_opfirst') - let g:javascript_opfirst = '\%([,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)\C' + let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\([-/.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)' endif -let g:javascript_opfirst = s:line_pre . g:javascript_opfirst - if !exists('g:javascript_continuation') - let g:javascript_continuation = '\%([*,.?:^%]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)\C' + let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)' endif + +let g:javascript_opfirst = s:line_pre . g:javascript_opfirst let g:javascript_continuation .= s:line_term -function s:Onescope(lnum,text,add) - return a:text =~ '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)\C' . s:line_term || - \ (a:add && a:text =~ s:line_pre . s:line_term && getline(s:PrevCodeLine(a:lnum - 1)) =~ ')' . s:line_term) || - \ (cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1 && - \ s:lookForParens('(', ')', 'cbW', 100) > 0 && - \ search((a:add ? '\%(function\*\|[A-Za-z_$][0-9A-Za-z_$]*\)\C' : - \ '\<\%(for\%(\s+each\)\=\|if\|let\|switch\|while\|with\)\C') . '\_s*\%#','bW')) && - \ (a:add || (expand("<cword>") == 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1)) +function s:OneScope(lnum,text,add) + return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' : + \ ((a:add && a:text =~ s:line_pre . '$' && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) || + \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) && + \ s:GetPair('(', ')', 'cbW', 100) > 0 && search('\C\l\+\_s*\%#','bW') && + \ (a:add || ((expand('<cword>') !=# 'while' || !s:GetPair('\C\<do\>', '\C\<while\>','nbW',100)) && + \ expand('cword') !=# 'each' || search('\C\<for\_s\+\%#','nbW'))) ? expand('<cword>') : '' endfunction -" Auxiliary Functions {{{2 - -" Check if the character at lnum:col is inside a string, comment, or is ascii. -function s:IsSyn(lnum, col, reg) - return synIDattr(synID(a:lnum, a:col, 1), 'name') =~? (a:reg != '' ? a:reg : s:syng_strcom) +" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader +function s:IsBlock() + return getline(line('.'))[col('.')-1] == '{' && !search( + \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') && + \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock())) endfunction +" Auxiliary Functions {{{2 + " Find line above 'lnum' that isn't empty, in a comment, or in a string. function s:PrevCodeLine(lnum) - let lnum = prevnonblank(a:lnum) - while lnum > 0 - if !s:IsSyn(lnum, matchend(getline(lnum), '^\s*[^''"]'),'') - break + let l:lnum = prevnonblank(a:lnum) + while l:lnum + if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom + return l:lnum endif - let lnum = prevnonblank(lnum - 1) + let l:lnum = prevnonblank(l:lnum - 1) endwhile - return lnum endfunction -" Check if line 'lnum' has more opening brackets than closing ones. -function s:LineHasOpeningBrackets(lnum) - let open_0 = 0 - let open_2 = 0 - let open_4 = 0 - let line = getline(a:lnum) - let pos = match(line, '[][(){}]', 0) - let last = 0 +" Check if line 'lnum' has a balanced amount of parentheses. +function s:Balanced(lnum) + let [open_0,open_2,open_4] = [0,0,0] + let l:line = getline(a:lnum) + let pos = match(l:line, '[][(){}]', 0) while pos != -1 - if !s:IsSyn(a:lnum, pos + 1, '') - let idx = stridx('(){}[]', line[pos]) + if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom + let idx = stridx('(){}[]', l:line[pos]) if idx % 2 == 0 let open_{idx} = open_{idx} + 1 - let last = pos else let open_{idx - 1} = open_{idx - 1} - 1 endif endif - let pos = match(line, '[][(){}]', pos + 1) + let pos = match(l:line, '[][(){}]', pos + 1) endwhile - return [(open_0 > 0 ? 1 : (open_0 == 0 ? 0 : 2)) . (open_2 > 0 ? 1 : (open_2 == 0 ? 0 : 2)) . - \ (open_4 > 0 ? 1 : (open_4 == 0 ? 0 : 2)), last] + return (!open_4 + !open_2 + !open_0) - 2 endfunction " }}} function GetJavascriptIndent() if !exists('b:js_cache') let b:js_cache = [0,0,0] - end - " Get the current line. - let line = getline(v:lnum) - " previous nonblank line number - let prevline = prevnonblank(v:lnum - 1) - " previous line of code - let lnum = s:PrevCodeLine(v:lnum - 1) - if lnum == 0 - return 0 endif + " Get the current line. + let l:line = getline(v:lnum) + let syns = synIDattr(synID(v:lnum, 1, 0), 'name') " start with strings,comments,etc.{{{2 - if (line !~ '^[''"`]' && s:IsSyn(v:lnum,1,'string\|template')) || - \ (line !~ '^\s*[/*]' && s:IsSyn(v:lnum,1,s:syng_comment)) + if (l:line !~ '^[''"`]' && syns =~? '\%(string\|template\)') || + \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment) return -1 endif - if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsSyn(v:lnum,1,s:syng_comment) + if l:line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment return cindent(v:lnum) endif + let l:lnum = s:PrevCodeLine(v:lnum - 1) + if l:lnum == 0 + return 0 + endif - if (line =~ s:expr_case) + if (l:line =~# s:expr_case) let cpo_switch = &cpo set cpo+=% let ind = cindent(v:lnum) @@ -157,41 +152,42 @@ function GetJavascriptIndent() endif "}}} - " the containing paren, bracket, curly - let pcounts = [0] - if b:js_cache[0] >= lnum && b:js_cache[0] <= v:lnum && b:js_cache[0] && - \ (b:js_cache[0] > lnum || map(pcounts,'s:LineHasOpeningBrackets(lnum)')[0][0] !~ '2') - let num = pcounts[0][0] =~ '1' ? lnum : b:js_cache[1] - if pcounts[0][0] =~'1' - call cursor(lnum,pcounts[0][1]) - end + " the containing paren, bracket, curly. Memoize, last lineNr either has the + " same scope or starts a new one, unless if it closed a scope. + call cursor(v:lnum,1) + if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum && b:js_cache[0] && + \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0) + let num = b:js_cache[1] + elseif syns != '' && l:line[0] =~ '\s' + let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : + \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]'] + let num = s:GetPair(pattern[0],pattern[1],'bW',2000) else - call cursor(v:lnum,1) - let syns = synIDattr(synID(v:lnum, 1, 1), 'name') - if line[0] =~ '\s' && syns != '' - let pattern = syns =~? 'funcblock' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : syns =~? 'jsbracket'? ['\[','\]'] : - \ ['(\|{\|\[',')\|}\|\]'] - let num = s:lookForParens(pattern[0],pattern[1],'bW',2000) - else - let num = s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000) - end - end + let num = s:GetPair('[({[]','[])}]','bW',2000) + endif let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')] - " most significant part - if line =~ s:line_pre . '[])}]' + if l:line =~ s:line_pre . '[])}]' return indent(num) - end - let inb = num == 0 ? 1 : s:Onescope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) - let switch_offset = (!inb || num == 0) || expand("<cword>") != 'switch' ? 0 : &cino !~ ':' || !has('float') ? s:sw() : - \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1)) - if ((line =~ g:javascript_opfirst || - \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case)) && - \ inb) || (s:Onescope(lnum,getline(lnum),0) && line !~ s:line_pre . '{') + endif + + call cursor(b:js_cache[1],b:js_cache[2]) + + let swcase = getline(l:lnum) =~# s:expr_case + let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','') + let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock()) + let switch_offset = num == 0 || s:OneScope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) !=# 'switch' ? 0 : + \ &cino !~ ':' || !has('float') ? s:sw() : + \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1)) + + " most significant, find the indent amount + if inb && !swcase && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) || + \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' && + \ l:line !~ s:line_pre . '{') return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset elseif num > 0 return indent(num) + s:sw() + switch_offset - end + endif endfunction |