emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 2a79649 33/49: Fix indentation after regexp in js2-old-ind


From: Dmitry Gutov
Subject: [elpa] master 2a79649 33/49: Fix indentation after regexp in js2-old-indent.el
Date: Mon, 16 Jan 2017 15:35:49 +0000 (UTC)

branch: master
commit 2a796499afd95a5b9f0eb2fb338102e917f30c93
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Fix indentation after regexp in js2-old-indent.el
    
    Closes #382.
---
 js2-old-indent.el |    4 ++++
 tests/indent.el   |    4 ++++
 2 files changed, 8 insertions(+)

diff --git a/js2-old-indent.el b/js2-old-indent.el
index f336005..1ecdba5 100644
--- a/js2-old-indent.el
+++ b/js2-old-indent.el
@@ -224,6 +224,10 @@ and comments have been removed."
              (and (js2-re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
                   (eq (char-after) ??))))
        (not (and
+             (eq (char-after) ?/)
+             (save-excursion
+               (eq (nth 3 (syntax-ppss)) ?/))))
+       (not (and
              (eq (char-after) ?*)
              ;; Generator method (possibly using computed property).
              (looking-at (concat "\\* *\\(?:\\[\\|"
diff --git a/tests/indent.el b/tests/indent.el
index 0fabe95..0924691 100644
--- a/tests/indent.el
+++ b/tests/indent.el
@@ -194,6 +194,10 @@
   |  5
   |]")
 
+(js2-deftest-indent no-continued-expression-after-regexp
+  "var re = /some value/
+  |str.match(re)")
+
 (js2-deftest-indent jsx-one-line
   "var foo = <div></div>;")
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]