From af37b2253c975c6608992d3ece93b02314b604c5 Mon Sep 17 00:00:00 2001 From: bounceme Date: Sun, 24 Apr 2016 09:44:06 -0700 Subject: [PATCH] [-+] not by another --- indent/javascript.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 2d7f3524..cadd33cf 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -63,7 +63,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st let s:line_term = '\s*\%(\%(\/\/\).*\)\=$' " Regex that defines continuation lines, not including (, {, or [. -let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@].*,\)' . s:line_term +let s:continuation_regex = '\%([\\*/.:]\|+\@].*,\)' . s:line_term " Regex that defines continuation lines. " TODO: this needs to deal with if ...: and so on @@ -74,7 +74,7 @@ let s:one_line_scope_regex = '\%(\%(\\|\<\%(if\|for\|while\)\>\s*(\%([^() " Regex that defines blocks. let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term -let s:operator_first = '^\s*\%([-*/+.:?]\|||\|&&\)' +let s:operator_first = '^\s*\%([*/.:?]\|\([-+]\)\1\@!\|||\|&&\)' let s:var_stmt = '^\s*\%(const\|let\|var\)'