disambiguate vars

Author: bounceme

indent/javascript.vim

@@ -5,7 +5,7 @@
 " Last Change: August 7, 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
@@ -19,7 +19,7 @@ setlocal cinoptions+=j1,J1
 let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<'
 
 " Only define the function once.
-if exists("*GetJavascriptIndent")
+if exists('*GetJavascriptIndent')
   finish
 endif
 
@@ -76,7 +76,7 @@ function s:Onescope(lnum,text,add)
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
         \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :
         \ '\<\%(for\%(\s\+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
-        \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
+        \ (a:add || (expand('<cword>') ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -88,33 +88,33 @@ endfunction
 
 " 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 synIDattr(synID(lnum,matchend(getline(lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
+  let l:lnum = prevnonblank(a:lnum)
+  while l:lnum > 0
+    if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
       break
     endif
-    let lnum = prevnonblank(lnum - 1)
+    let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
-  return lnum
+  return l:lnum
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
   let open_0 = 0
   let open_2 = 0
   let open_4 = 0
-  let line = getline(a:lnum)
-  let pos = match(line, '[][(){}]', 0)
+  let l:line = getline(a:lnum)
+  let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
     if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
-      let idx = stridx('(){}[]', line[pos])
+      let idx = stridx('(){}[]', l:line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1
       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_4 + !open_2 + !open_0) - 2
 endfunction
@@ -125,23 +125,23 @@ function GetJavascriptIndent()
     let b:js_cache = [0,0,0]
   endif
   " Get the current line.
-  let line = getline(v:lnum)
+  let l:line = getline(v:lnum)
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.{{{2
-  if (line !~ '^[''"`]' && syns =~? 'string\|template') ||
-        \ (line !~ '^\s*[/*]' && syns =~? s:syng_comment)
+  if (l:line !~ '^[''"`]' && syns =~? 'string\|template') ||
+        \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
     return -1
   endif
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
+  if l:line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
     return cindent(v:lnum)
   endif
-  let lnum = s:PrevCodeLine(v:lnum - 1)
-  if lnum == 0
+  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)
@@ -153,10 +153,10 @@ function GetJavascriptIndent()
   " 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] >= lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
-        \ (b:js_cache[0] > lnum || s:Balanced(lnum) > 0)
+  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 != '' && line[0] =~ '\s'
+  elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
           \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
     let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
@@ -165,21 +165,21 @@ function GetJavascriptIndent()
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
-  if line =~ s:line_pre . '[])}]'
+  if l:line =~ s:line_pre . '[])}]'
     return indent(num)
   endif
 
-  let pline = s:StripLine(getline(lnum))
+  let pline = s:StripLine(getline(l:lnum))
   let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
-        \ (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < lnum
+        \ (l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < l:lnum
   let switch_offset = (!inb || num == 0) || expand("<cword>") !=# '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 && (line =~# g:javascript_opfirst ||
-        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || line !~#
+  if (inb && (l:line =~# g:javascript_opfirst ||
+        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || l:line !~#
         \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>')))) ||
-        \ (num < lnum && s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
+        \ (num < l:lnum && s:Onescope(l:lnum,pline,0) && 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