[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 2d0dc5e 43/49: Cosmetic, reformat to stay within the prefe
From: |
Dmitry Gutov |
Subject: |
[elpa] master 2d0dc5e 43/49: Cosmetic, reformat to stay within the preferred 80 columns limit |
Date: |
Mon, 16 Jan 2017 15:35:50 +0000 (UTC) |
branch: master
commit 2d0dc5ee456da6c1341ad7e6c12a75dc730b9710
Author: Lele Gaifax <address@hidden>
Commit: Lele Gaifax <address@hidden>
Cosmetic, reformat to stay within the preferred 80 columns limit
---
js2-mode.el | 44 ++++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/js2-mode.el b/js2-mode.el
index 629cfa4..50409ac 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -7152,7 +7152,8 @@ When STRICT, signal an error if NODE is not one of the
expected types."
((js2-unary-node-p elt) ;; rest (...)
(js2-unary-node-operand elt))
(t elt)))
- (setq targets (append (js2--collect-target-symbols elt strict)
targets)))))
+ (setq targets (append (js2--collect-target-symbols elt strict)
+ targets)))))
((js2-object-node-p node)
(dolist (elt (js2-object-node-elems node))
(let ((subexpr (cond
@@ -7196,8 +7197,9 @@ are ignored."
(lambda (node end-p)
(when (and (null end-p) (js2-name-node-p node))
(let* ((parent (js2-node-parent node))
- (function-param (and (js2-function-node-p parent)
- (memq node (js2-function-node-params
parent)))))
+ (function-param
+ (and (js2-function-node-p parent)
+ (memq node (js2-function-node-params parent)))))
(when parent
(if (js2-prop-get-node-p parent)
;; If we are within a prop-get, e.g. the "bar" in "foo.bar",
@@ -7229,7 +7231,8 @@ are ignored."
;; declared and initialized
(when var-init-node
(let ((target (js2-var-init-node-target var-init-node)))
- (setq declared (memq node (js2--collect-target-symbols
target nil)))
+ (setq declared
+ (memq node (js2--collect-target-symbols target
nil)))
;; Is there an initializer for the declared variable?
(when (js2-var-init-node-initializer var-init-node)
(setq assigned declared)
@@ -7239,22 +7242,26 @@ are ignored."
(js2-object-prop-node-p parent)
(eq node (js2-object-prop-node-left parent)))
(setq object-key t)))
- ;; Maybe this is a for loop and the variable is one of
its iterators?
+ ;; Maybe this is a for loop and the variable is one of
+ ;; its iterators?
(unless assigned
(let* ((gp (js2-node-parent parent))
(ggp (if gp (js2-node-parent gp))))
(when (and ggp (js2-for-in-node-p ggp))
(setq assigned
- (memq node
- (cl-loop for kid in
(js2-var-decl-node-kids
-
(js2-for-in-node-iterator ggp))
- with syms = '()
- do (setq syms
- (append syms
-
(js2--collect-target-symbols
-
(js2-var-init-node-target kid)
- nil)))
- finally return syms))))))))
+ (memq
+ node
+ (cl-loop
+ for kid in (js2-var-decl-node-kids
+ (js2-for-in-node-iterator ggp))
+ with syms = '()
+ do (setq
+ syms
+ (append syms
+ (js2--collect-target-symbols
+ (js2-var-init-node-target kid)
+ nil)))
+ finally return syms))))))))
;; Ignore literal object keys, which are not really variables
(unless object-key
@@ -7270,9 +7277,10 @@ are ignored."
(setq assigned t
used (js2-wrapper-function-p parent)))
(assign-node
- (setq assigned (memq node (js2--collect-target-symbols
- (js2-assign-node-left
assign-node)
- nil))
+ (setq assigned (memq node
+ (js2--collect-target-symbols
+ (js2-assign-node-left assign-node)
+ nil))
used (not assigned)))))
(when declared
- [elpa] master 9b63a13 16/49: Special methods should allow keywords as names, (continued)
- [elpa] master 9b63a13 16/49: Special methods should allow keywords as names, Dmitry Gutov, 2017/01/16
- [elpa] master 672e2da 07/49: js2-parse-mul-expr: Parse the right operand as exponentiation too, Dmitry Gutov, 2017/01/16
- [elpa] master a91e357 40/49: Create a separate scope for switch statements, Dmitry Gutov, 2017/01/16
- [elpa] master 4d35da5 30/49: Fix the fix (error detection), Dmitry Gutov, 2017/01/16
- [elpa] master 31a2399 44/49: Mostly cosmetic, split js2--classify-variables in three simpler functions, Dmitry Gutov, 2017/01/16
- [elpa] master 3725fcf 35/49: Handle other cases of destructuring assignments/initializations, Dmitry Gutov, 2017/01/16
- [elpa] master dad7d09 32/49: feat: add js2-comments-between func, Dmitry Gutov, 2017/01/16
- [elpa] master 523b3cb 38/49: Add a STRICT parameter to js2--collect-declared-symbols, Dmitry Gutov, 2017/01/16
- [elpa] master 1f12517 10/49: Merge pull request #353 from kaushalmodi/js2-jsx-mode-docstring-fix, Dmitry Gutov, 2017/01/16
- [elpa] master 454b242 20/49: Update NEWS.md, Dmitry Gutov, 2017/01/16
- [elpa] master 2d0dc5e 43/49: Cosmetic, reformat to stay within the preferred 80 columns limit,
Dmitry Gutov <=
- [elpa] master ff072bf 49/49: Merge commit '03c679eb9914d58d7d9b7afc2036c482a9a01236' from js2-mode, Dmitry Gutov, 2017/01/16
- [elpa] master fbe58dc 18/49: Compute externs on demand, Dmitry Gutov, 2017/01/16
- [elpa] master d3dd406 46/49: fix: copyright year of tests/comsume.el, Dmitry Gutov, 2017/01/16
- [elpa] master cdbdca4 39/49: Rewrite js2--classify-variables, focusing only on name nodes, Dmitry Gutov, 2017/01/16
- [elpa] master 82bbd97 25/49: Move it up, Dmitry Gutov, 2017/01/16
- [elpa] master c303773 21/49: Fix dead link in the documentation, Dmitry Gutov, 2017/01/16
- [elpa] master 5855a45 22/49: Merge pull request #380 from JulianKniephoff/fix-dead-doc-link-js2-include-jslint-globals, Dmitry Gutov, 2017/01/16
- [elpa] master 94b2721 31/49: Merge pull request #385 from mishoo/master, Dmitry Gutov, 2017/01/16
- [elpa] master 91e722a 27/49: Merge pull request #381 from mgiles/template-pos, Dmitry Gutov, 2017/01/16
- [elpa] master 3106e3c 37/49: Fix arrow expression function's length, Dmitry Gutov, 2017/01/16