]> code.delx.au - gnu-emacs-elpa/commitdiff
Skip unary ops before both semicolon checks
authorDmitry Gutov <dgutov@yandex.ru>
Sun, 24 Apr 2011 00:47:31 +0000 (04:47 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Sun, 24 Apr 2011 00:55:15 +0000 (04:55 +0400)
js2-mode.el

index a11a60eaaa76fec49c9648efdd7259a9ea16c2ef..f4c1b1bc8d830a422378ae356a56d48347f3baaf 100644 (file)
@@ -9917,15 +9917,15 @@ var a = 10,
     (save-excursion
       (back-to-indentation)
       (when (looking-at (concat js2-mode-identifier-re "[ \t]*=[^=]"))
-        (while (not (or at-opening-bracket
-                        ;; explicit semicolon
-                        (save-excursion (skip-chars-backward "-+~! ")
-                                        (js2-backward-sws)
-                                        (looking-back ";"))
-                        ;; implicit semicolon
-                        (save-excursion
-                          (and (progn (skip-chars-backward " \t")
-                                      (bolp))
+        (while (not (save-excursion
+                      ;; unary ops
+                      (skip-chars-backward "-+~! \t")
+                      (or at-opening-bracket
+                          ;; explicit semicolon
+                          (save-excursion (js2-backward-sws)
+                                          (looking-back ";"))
+                          ;; implicit semicolon
+                          (and (bolp)
                                (progn (js2-backward-sws)
                                       (not (looking-back ",")))
                                (progn (skip-chars-backward "[[:punct:]]")