better &cino parsing (pangloss#759)

bounceme · web-flow · commit 63daab731daf · 2016-12-11T18:36:15.000-08:00
diff --git a/indent/javascript.vim b/indent/javascript.vim
@@ -269,8 +269,12 @@ function GetJavascriptIndent()
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')
       if s:previous_token() ==# 'switch'
-        let switch_offset = &cino !~ ':' || !has('float') ? s:W :
-              \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '\%(.*:\)\@>[^,]*s' ? s:W : 1))
+        if &cino !~ ':' || !has('float')
+          let switch_offset = s:W
+        else
+          let cinc = matchlist(&cino,'.*:\(-\)\=\([0-9.]*\)\(s\)\=\C')
+          let switch_offset = float2nr(str2float(cinc[1].(strlen(cinc[2]) ? cinc[2] : 1)) * (strlen(cinc[3]) ? s:W : 1))
+        endif
         if pline[-1:] != '.' && l:line =~# '^' . s:case_stmt
           return indent(num) + switch_offset
         elseif pline =~# s:case_stmt . '$'
