diff options
Diffstat (limited to 'indent/javascript.vim')
| -rw-r--r-- | indent/javascript.vim | 262 |
1 files changed, 171 insertions, 91 deletions
diff --git a/indent/javascript.vim b/indent/javascript.vim index 7029ed22..8f922eca 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == " Language: Javascript " Maintainer: Chris Paul ( https://github.com/bounceme ) " URL: https://github.com/pangloss/vim-javascript -" Last Change: March 9, 2017 +" Last Change: May 16, 2017 " Only load this indent file when no other was loaded. if exists('b:did_indent') @@ -12,6 +12,10 @@ if exists('b:did_indent') endif let b:did_indent = 1 +" indent correctly if inside <script> +" vim/vim@690afe1 for the switch from cindent +let b:html_indent_script1 = 'inc' + " Now, set up our indentation expression and keys that trigger it. setlocal indentexpr=GetJavascriptIndent() setlocal autoindent nolisp nosmartindent @@ -23,6 +27,13 @@ setlocal indentkeys+=0],0) let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<' +" Regex of syntax group names that are or delimit string or are comments. +let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!') +let b:syng_str = get(b:,'syng_str','string\|template\|special') +" template strings may want to be excluded when editing graphql: +" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special' +" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc' + " Only define the function once. if exists('*GetJavascriptIndent') finish @@ -38,7 +49,7 @@ if exists('*shiftwidth') endfunction else function s:sw() - return &l:shiftwidth == 0 ? &l:tabstop : &l:shiftwidth + return &l:shiftwidth ? &l:shiftwidth : &l:tabstop endfunction endif @@ -46,6 +57,10 @@ endif " matches before pos. let s:z = has('patch-7.4.984') ? 'z' : '' +let s:syng_com = 'comment\|doc' +" Expression used to check whether we should skip a match with searchpair(). +let s:skip_expr = "s:syn_at(line('.'),col('.')) =~? b:syng_strcom" + " searchpair() wrapper if has('reltime') function s:GetPair(start,end,flags,skip,time,...) @@ -57,56 +72,80 @@ else endfunction endif -" Regex of syntax group names that are or delimit string or are comments. -let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!' -let s:syng_str = 'string\|template\|special' -let s:syng_com = 'comment\|doc' -" Expression used to check whether we should skip a match with searchpair(). -let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'" +function s:syn_at(l,c) + let pos = join([a:l,a:c],',') + if has_key(s:synId_cache,pos) + return s:synId_cache[pos] + endif + let s:synId_cache[pos] = synIDattr(synID(a:l,a:c,0),'name') + return s:synId_cache[pos] +endfunction -function s:parse_cino(f) abort - return float2nr(eval(substitute(substitute(join(split( - \ matchstr(&cino,'\C.*'.a:f.'\zs[^,]*'), 's',1), '*'.s:W) - \ , '^-\=\zs\*','',''), '^-\=\zs\.','0.',''))) +function s:parse_cino(f) + let [cin, divider, n] = [strridx(&cino,a:f), 0, ''] + if cin == -1 + return + endif + let [sign, cstr] = &cino[cin+1] ==# '-' ? [-1, &cino[cin+2:]] : [1, &cino[cin+1:]] + for c in split(cstr,'\zs') + if c ==# '.' && !divider + let divider = 1 + elseif c ==# 's' + if n is '' + let n = s:W + else + let n = str2nr(n) * s:W + endif + break + elseif c =~ '\d' + let [n, divider] .= [c, 0] + else + break + endif + endfor + return sign * str2nr(n) / max([str2nr(divider),1]) endfunction +" Optimized {skip} expr, used only once per GetJavascriptIndent() call function s:skip_func() - if getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$' - return eval(s:skip_expr) + if s:topCol == 1 || line('.') < s:scriptTag + return {} " E728, used as limit condition for loops and searchpair() + endif + let s:topCol = col('.') + if getline('.') =~ '\%<'.s:topCol.'c\/.\{-}\/\|\%>'.s:topCol.'c[''"]\|\\$' + if eval(s:skip_expr) + let s:topCol = 0 + endif + return !s:topCol elseif s:checkIn || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn) let s:checkIn = eval(s:skip_expr) + if s:checkIn + let s:topCol = 0 + endif endif let s:looksyn = line('.') return s:checkIn endfunction -function s:alternatePair(stop) - let pos = getpos('.')[1:2] - let pat = '[][(){};]' - while search('\m'.pat,'bW',a:stop) +function s:alternatePair() + let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 3] + while search('\m'.pat,'bW') if s:skip_func() | continue | endif let idx = stridx('])};',s:looking_at()) - if idx is 3 | let pat = '[{}()]' | continue | endif - if idx + 1 - if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0 + if idx is 3 + if l:for is 1 + return s:GetPair('{','}','bW','s:skip_func()',2000) > 0 || setpos('.',l:pos) + endif + let [pat, l:for] = ['[{}();]', l:for - 1] + elseif idx + 1 + if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000) < 1 break endif else return endif endwhile - call call('cursor',pos) -endfunction - -function s:save_pos(f,...) - let l:pos = getpos('.')[1:2] - let ret = call(a:f,a:000) - call call('cursor',l:pos) - return ret -endfunction - -function s:syn_at(l,c) - return synIDattr(synID(a:l,a:c,0),'name') + call setpos('.',l:pos) endfunction function s:looking_at() @@ -118,10 +157,10 @@ function s:token() endfunction function s:previous_token() - let l:pos = getpos('.')[1:2] + let l:pos = getpos('.') if search('\m\k\{1,}\|\S','ebW') - if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:pos[0] && - \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com + if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] && + \ getline('.')[:col('.')-1] =~ '\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com while search('\m\S\ze\_s*\/[/*]','bW') if s:syn_at(line('.'),col('.')) !~? s:syng_com return s:token() @@ -130,51 +169,66 @@ function s:previous_token() else return s:token() endif + call setpos('.',l:pos) endif - call call('cursor',l:pos) return '' endfunction +for s:__ in ['__previous_token','__IsBlock'] + function s:{s:__}(...) + let l:pos = getpos('.') + try + return call('s:'.matchstr(expand('<sfile>'),'.*__\zs\w\+'),a:000) + catch + finally + call setpos('.',l:pos) + endtry + endfunction +endfor + function s:expr_col() if getline('.')[col('.')-2] == ':' return 1 endif - let bal = 0 - while search('\m[{}?:;]','bW') - if eval(s:skip_expr) | continue | endif - " switch (looking_at()) - exe { '}': "if s:GetPair('{','}','bW',s:skip_expr,200) <= 0 | return | endif", - \ ';': "return", - \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()", - \ ':': "let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'", - \ '?': "let bal += 1 | if bal > 0 | return 1 | endif" }[s:looking_at()] + let [bal, l:pos] = [0, getpos('.')] + while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag) + if eval(s:skip_expr) + continue + elseif s:looking_at() == ':' + let bal -= strpart(getline('.'),col('.')-2,3) !~ '::' + elseif s:looking_at() == '?' + let bal += 1 + elseif s:looking_at() == '{' && getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock() + let bal = 1 + elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1 + break + endif endwhile + call setpos('.',l:pos) + return max([bal,0]) endfunction " configurable regexes that define continuation lines, not including (, {, or [. let s:opfirst = '^' . get(g:,'javascript_opfirst', \ '\C\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)') let s:continuation = get(g:,'javascript_continuation', - \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$' + \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$' function s:continues(ln,con) - if !cursor(a:ln, match(' '.a:con,s:continuation)) - let teol = s:looking_at() - if teol == '/' - return s:syn_at(line('.'),col('.')) !~? 'regex' - elseif teol =~ '[-+>]' - return getline('.')[col('.')-2] != tr(teol,'>','=') - elseif teol =~ '\l' + let token = matchstr(a:con[-15:],s:continuation) + if strlen(token) + call cursor(a:ln,strlen(a:con)) + if token =~ '[/>]' + return s:syn_at(a:ln,col('.')) !~? (token == '>' ? 'jsflow\|^html' : 'regex') + elseif token =~ '\l' return s:previous_token() != '.' - elseif teol == ':' + elseif token == ':' return s:expr_col() endif return 1 endif endfunction -" get the line of code stripped of comments and move cursor to the last -" non-comment char. function s:Trim(ln) let pline = substitute(getline(a:ln),'\s*$','','') let l:max = max([strridx(pline,'//'), strridx(pline,'/*')]) @@ -183,24 +237,28 @@ function s:Trim(ln) let l:max = max([strridx(pline,'//'), strridx(pline,'/*')]) let pline = substitute(pline[:-2],'\s*$','','') endwhile - return pline is '' || cursor(a:ln,strlen(pline)) ? pline : pline + return pline endfunction " Find line above 'lnum' that isn't empty or in a comment function s:PrevCodeLine(lnum) - let [l:pos, l:n] = [getpos('.')[1:2], prevnonblank(a:lnum)] + let l:n = prevnonblank(a:lnum) while l:n if getline(l:n) =~ '^\s*\/[/*]' + if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') && + \ s:syn_at(l:n,1) =~? b:syng_str + break + endif let l:n = prevnonblank(l:n-1) elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com + let l:pos = getpos('.') call cursor(l:n,1) - keepjumps norm! [* - let l:n = search('\m\S','nbW') + let l:n = search('\m\S\_s*\/\*','nbW') + call setpos('.',l:pos) else break endif endwhile - call call('cursor',l:pos) return l:n endfunction @@ -210,7 +268,7 @@ function s:Balanced(lnum) let l:line = getline(a:lnum) let pos = match(l:line, '[][(){}]', 0) while pos != -1 - if s:syn_at(a:lnum,pos + 1) !~? s:syng_strcom + if s:syn_at(a:lnum,pos + 1) !~? b:syng_strcom let l:open += match(' ' . l:line[pos],'[[({]') if l:open < 0 return @@ -225,6 +283,7 @@ endfunction function s:OneScope(lnum) let pline = s:Trim(a:lnum) + call cursor(a:lnum,strlen(pline)) let kw = 'else do' if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 if s:previous_token() =~# '^\%(await\|each\)$' @@ -235,7 +294,27 @@ function s:OneScope(lnum) endif endif return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 && - \ s:save_pos('s:previous_token') != '.' + \ s:__previous_token() != '.' && !s:doWhile() +endfunction + +function s:doWhile() + if expand('<cword>') ==# 'while' + let [bal, l:pos] = [0, getpos('.')] + call search('\m\<','cbW') + while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW') + if eval(s:skip_expr) + continue + elseif s:looking_at() ==# 'd' + let bal += s:__IsBlock(1) + elseif s:looking_at() ==# 'w' + let bal -= s:__previous_token() != '.' + elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1 + break + endif + endwhile + call setpos('.',l:pos) + return max([bal,0]) + endif endfunction " returns braceless levels started by 'i' and above lines * &sw. 'num' is the @@ -259,32 +338,36 @@ function s:iscontOne(i,num,cont) endfunction " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader -function s:IsBlock() - if s:looking_at() == '{' +function s:IsBlock(...) + if a:0 || s:looking_at() == '{' let l:n = line('.') let char = s:previous_token() if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx' return char != '{' elseif char =~ '\k' if char ==# 'type' - return s:previous_token() !~# '^\%(im\|ex\)port$' + return s:__previous_token() !~# '^\%(im\|ex\)port$' endif return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof') - \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.' + \ ,char) < (line('.') != l:n) || s:__previous_token() == '.' elseif char == '>' - return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow' + return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html' + elseif char == '*' + return s:__previous_token() == ':' elseif char == ':' - return !s:save_pos('s:expr_col') + return !s:expr_col() elseif char == '/' return s:syn_at(line('.'),col('.')) =~? 'regex' endif - return char !~ '[=~!<*,?^%|&([]' && + return char !~ '[=~!<,.?^%|&([]' && \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char) endif endfunction + function GetJavascriptIndent() let b:js_cache = get(b:,'js_cache',[0,0,0]) + let s:synId_cache = {} " Get the current line. call cursor(v:lnum,1) let l:line = getline('.') @@ -299,7 +382,7 @@ function GetJavascriptIndent() elseif l:line !~ '^\s*\/[/*]' return -1 endif - elseif syns =~? s:syng_str + elseif syns =~? b:syng_str if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1) let b:js_cache[0] = v:lnum endif @@ -319,37 +402,33 @@ function GetJavascriptIndent() endif " the containing paren, bracket, or curly. Many hacks for performance - let idx = index([']',')','}'],l:line[0]) + let [ s:scriptTag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'), + \ index([']',')','}'],l:line[0]) ] if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum && \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum)) - call call('cursor',b:js_cache[1:]) + call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [0,0]) else - let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, (!indent(l:lnum) && - \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum] + let [s:looksyn, s:checkIn, s:topCol] = [v:lnum - 1, 0, 0] if idx + 1 - call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top) + call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000) elseif getline(v:lnum) !~ '^\S' && syns =~? 'block' - call s:GetPair('{','}','bW','s:skip_func()',2000,top) + call s:GetPair('{','}','bW','s:skip_func()',2000) else - call s:alternatePair(top) + call s:alternatePair() endif endif - let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2]) + let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:scriptTag,0] : getpos('.')[1:2]) let num = b:js_cache[1] let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0] - if !num || s:IsBlock() + if !b:js_cache[2] || s:IsBlock() let ilnum = line('.') - let pline = s:save_pos('s:Trim',l:lnum) - if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 + let pline = s:Trim(l:lnum) + if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0 let num = ilnum == num ? line('.') : num if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.' - if &cino !~ ':' - let switch_offset = s:W - else - let switch_offset = max([-indent(num),s:parse_cino(':')]) - endif + let switch_offset = &cino !~ ':' ? s:W : max([-indent(num),s:parse_cino(':')]) if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>' return indent(num) + switch_offset endif @@ -362,12 +441,13 @@ function GetJavascriptIndent() endif elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '(' let pval = s:parse_cino('(') - return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\m\S','W'.s:z,num))) + virtcol('.') : - \ max([indent('.') + pval + (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0]) + return !pval || !search('\m\S','nbW',num) && !s:parse_cino('U') ? + \ (s:parse_cino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') : + \ max([indent('.') + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W,0]) endif " main return - if l:line =~ '^\%([])}]\||}\)' + if l:line =~ '^[])}]\|^|}' return max([indent(num),0]) elseif num return indent(num) + s:W + switch_offset + bL + isOp |