From: Dmitry Gutov Date: Sat, 5 Mar 2016 12:35:10 +0000 (+0200) Subject: Don't misindent computed property generator methods X-Git-Tag: emacs-25.0.93~131 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc9d837d02edd665f2c9468de51bb4a1dda7ef6d;p=emacs.git Don't misindent computed property generator methods * lisp/progmodes/js.el (js--looking-at-operator-p): Don't misindent computed property generator methods (https://github.com/mooz/js2-mode/issues/317). --- diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index d59e7679b47..15a52ba8cdc 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1758,12 +1758,13 @@ This performs fontification according to `js--class-styles'." (eq (char-after) ??)))) (not (and (eq (char-after) ?*) - (looking-at (concat "\\* *" js--name-re " *(")) + ;; Generator method (possibly using computed property). + (looking-at (concat "\\* *\\(?:\\[\\|" js--name-re " *(\\)")) (save-excursion - (goto-char (1- (match-end 0))) - (let (forward-sexp-function) (forward-sexp)) - (js--forward-syntactic-ws) - (eq (char-after) ?{))))))) + (js--backward-syntactic-ws) + ;; We might misindent some expressions that would + ;; return NaN anyway. Shouldn't be a problem. + (memq (char-before) '(?, ?} ?{)))))))) (defun js--continued-expression-p () "Return non-nil if the current line continues an expression." diff --git a/test/indent/js.js b/test/indent/js.js index 9a1e0dc7ad5..d843f615fd8 100644 --- a/test/indent/js.js +++ b/test/indent/js.js @@ -72,7 +72,12 @@ baz(`http://foo.bar/${tee}`) class A { * x() { return 1 - * 2; + * a(2); + } + + *[Symbol.iterator]() { + yield "Foo"; + yield "Bar"; } }