procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't mistake `for' inside a function for a part of array comprehension

Browse source 
* lisp/progmodes/js.el (js--indent-in-array-comp): Also check the
depth in parens between the bracket and `for' (bug#23391).

* test/indent/js.js: Add a corresponding example.
This commit is contained in:
Dmitry Gutov 2016-04-28 02:00:23 +03:00
parent ff7e201ed8
commit 0255a70c8a
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/progmodes/js.el
View file

@ -1892,9 +1892,11 @@ In particular, return the buffer position of the first `for' kwd."
;; To skip arbitrary expressions we need the parser, ;; To skip arbitrary expressions we need the parser,
;; so we'll just guess at it. ;; so we'll just guess at it.
(if (and (> end (point)) ; Not empty literal. (if (and (> end (point)) ; Not empty literal.
(re-search-forward "[^,]]* \\(for\\) " end t) (re-search-forward "[^,]]* \\(for\\_>\\)" end t)
;; Not inside comment or string literal. ;; Not inside comment or string literal.
(not (nth 8 (parse-partial-sexp bracket (point))))) (let ((status (parse-partial-sexp bracket (point))))
(and (= 1 (car status))
(not (nth 8 status)))))
(match-beginning 1))))))) (match-beginning 1)))))))
(defun js--array-comp-indentation (bracket for-kwd) (defun js--array-comp-indentation (bracket for-kwd)

8
test/indent/js.js
View file

@ -53,6 +53,14 @@ var p = {
var evens = [e for each (e in range(0, 21)) var evens = [e for each (e in range(0, 21))
if (ed % 2 == 0)]; if (ed % 2 == 0)];
var funs = [
function() {
for (;;) {
}
},
function(){},
];
!b !b
!=b !=b
!==b !==b