Fixes case where there are nested conditionals

goatslacker · goatslacker · commit 9dda622a7da8 · 2013-08-03T01:00:55.000-07:00
diff --git a/indent/javascript.vim b/indent/javascript.vim
@@ -65,6 +65,7 @@ let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
 let s:ternary = '^\s\+[?|:]'
+let s:ternary_q = '^\s\+?'
 
 " 2. Auxiliary Functions {{{1
 " ======================
@@ -342,7 +343,7 @@ function GetJavascriptIndent()
   endif
 
   if (line =~ s:ternary)
-    if (getline(prevline) =~ s:ternary)
+    if (getline(prevline) =~ s:ternary_q)
       return indent(prevline)
     else
       return indent(prevline) + &sw
