possible reuse of logic (simple lexing) (#570)

reusing  of logic

Author: bounceme

indent/javascript.vim

@@ -44,7 +44,7 @@ let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
 let s:syng_comment = '\%(comment\|doc\)\c'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
+let s:skip_expr = "s:IsInStringOrComment(line('.'),col('.'))"
 
 func s:lookForParens(start,end,flags,time)
   try
@@ -69,13 +69,14 @@ if !exists('g:javascript_continuation')
 endif
 let g:javascript_continuation .= s:line_term
 
-function s:Onescope(lnum)
-  return getline(a:lnum) =~ '\%(\<else\|\<do\|=>\)\C' . s:line_term ||
-        \ (cursor(a:lnum, match(getline(a:lnum),')' . s:line_term)) > -1 &&
+function s:Onescope(lnum,text,add)
+  return a:text =~ '\%(\<else\|\<do\|=>' . (a:add ? '\|try\|finally' : '' ) . '\)\C' . s:line_term ||
+        \ (cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1 &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
         \ cursor(line('.'),match( ' ' . strpart(getline(line('.')),0,col('.') - 1),
-        \ '\<\%(else\|for\%(\s+each\)\=\|if\|let\|while\|with\)\C' . s:line_term)) > -1) &&
-        \ (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bw',100) : 1)
+        \ (a:add ? '\K\k*' :
+        \ '\<\%(else\|for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') . s:line_term)) > -1) &&
+        \ (a:add || (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -86,11 +87,6 @@ function s:IsInStringOrComment(lnum, col)
   return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_strcom
 endfunction
 
-" Check if the character at lnum:col is inside a multi-line comment.
-function s:IsInComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_comment
-endfunction
-
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevNonBlankNonString(lnum)
   let lnum = prevnonblank(a:lnum)
@@ -110,26 +106,29 @@ function s:LineHasOpeningBrackets(lnum)
   let open_4 = 0
   let line = getline(a:lnum)
   let pos = match(line, '[][(){}]', 0)
+  let last = 0
   while pos != -1
     if !s:IsInStringOrComment(a:lnum, pos + 1)
       let idx = stridx('(){}[]', 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)
   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))
+  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]
 endfunction
 " }}}
 
 " GetJavascriptIndent Function
 " =========================
 function GetJavascriptIndent()
   if !exists('b:js_cache')
-    let b:js_cache = [0,0]
+    let b:js_cache = [0,0,0]
   end
   " Get the current line.
   let line = getline(v:lnum)
@@ -143,10 +142,10 @@ function GetJavascriptIndent()
 
   " start with strings,comments,etc.{{{2
   if (line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template') ||
-        \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'comment')
+        \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? s:syng_comment)
     return -1
   endif
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
+  if line !~ '^\%(\/\*\|\s*\/\/\)' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? s:syng_comment)
     return cindent(v:lnum)
   endif
 
@@ -161,39 +160,39 @@ function GetJavascriptIndent()
 
   " 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] !~ '2')
-    let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
+  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
   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],'nbw',2000)
-    elseif syns != ''
-      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
+      let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
     else
-      let num = 0
+      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000)
     end
   end
-  let b:js_cache = [v:lnum, num]
+  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   " most significant part
   if line =~ s:line_pre . '[])}]'
     return indent(num)
   end
   let switch_offset = 0
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
-    let bnum = search('\<switch\s*(','nbw')
+    let bnum = search('\<switch\s*(','nbW')
     let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
           \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))
   endif
-  if (line =~ g:javascript_opfirst ||
-        \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||
-        \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
-        \ (num != lnum &&
-        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
+  if ((line =~ g:javascript_opfirst ||
+        \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case)) &&
+        \ (num == 0 || s:Onescope(num, strpart(getline(num),0,b:js_cache[2] - 1),1))) ||
+        \ (s:Onescope(lnum,getline(lnum),0) && 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