Merge commit '9a807fb54' into comma_start

Conflicts:
	test.js

indent/javascript.vim

@@ -30,7 +30,7 @@ let b:indented = 0
 let b:in_comment = 0
 
 setlocal indentexpr=GetJsIndent()
-setlocal indentkeys+==},=),=],0=*/,0=/*,*<Return>
+setlocal indentkeys+==},=),=],0=*/,0=/*,0=\,,*<Return>
 if exists("*GetJsIndent")
   finish 
 endif
@@ -43,6 +43,11 @@ let s:expr_case          = '\s\+\(case\s\+[^\:]*\|default\)\s*:\s*'
 let s:expr_comment_start = '/\*c'
 let s:expr_comment_end   = 'c\*/'
 
+let s:expr_comma_start = '^\s*,'
+let s:expr_var = '^\s*var\s'
+let s:expr_var_stop = ';'
+let s:expr_semic_start = '^\s*;'
+
 " Check prev line
 function! DoIndentPrev(ind,str) 
   let ind = a:ind
@@ -97,15 +102,27 @@ function! DoIndentPrev(ind,str)
     let ind = ind - 1
   endif
 
+  if match(pline, s:expr_comma_start) != -1
+    let ind = ind + 2
+    if match(pline, s:expr_var_stop) != -1
+      let ind = ind - 4
+    endif
+  endif
+
+  " buggy
+  if match(pline, s:expr_semic_start) != -1
+    let ind = ind - 2
+  endif
 
   return ind
 endfunction
 
 
 " Check current line
-function! DoIndent(ind, str) 
+function! DoIndent(ind, str, pline) 
   let ind = a:ind
   let line = a:str
+  let pline = a:pline
   let last = 0
   let first = 1
   let mstr = matchstr(line, '^'.s:expr_right.'*')
@@ -133,6 +150,17 @@ function! DoIndent(ind, str)
     let ind = float2nr(ind + &sw * g:SimpleJsIndenter_CaseIndentLevel)
   endif
 
+  if (match(line, s:expr_comma_start) != -1)
+    let ind = ind - 2
+    if (match(pline, s:expr_var) != -1)
+      let ind = ind + 4
+    endif
+  endif
+
+  if (match(line, s:expr_semic_start) != -1 && match(pline, s:expr_comma_start) != -1)
+    let ind = ind - 2
+  endif
+
   if ind<0
     let ind=0
   endif
@@ -371,7 +399,7 @@ function! GetJsIndent()
   endif
 
   let line = s:GetLine(v:lnum)
-  let ind = DoIndent(ind, line)
+  let ind = DoIndent(ind, line, pline)
 
   return ind
 endfunction

test.js

@@ -213,3 +213,24 @@
   }
 }
 
+var a = a
+  , b = b
+  , c = c;
+
+var a = a
+  , b = b
+  ;
+
+foo({
+    a : a
+  , b : b
+  , c : c
+  , d : {
+      e : e
+      f : f
+    }
+  , g : {[
+        h : h
+      , i : i
+    ]}
+});