X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/dd2106bfb2675eeb0005b7cc73a3efdb75827965..458d3feef14b0ab1040c70b59771e4b443ec36e2:/js2-mode.el diff --git a/js2-mode.el b/js2-mode.el index 2fd063019..627a61537 100644 --- a/js2-mode.el +++ b/js2-mode.el @@ -650,11 +650,10 @@ which doesn't seem particularly useful, but Rhino permits it." (defvar js2-ARROW 162) ; function arrow (=>) (defvar js2-CLASS 163) (defvar js2-EXTENDS 164) -(defvar js2-STATIC 165) -(defvar js2-SUPER 166) -(defvar js2-TEMPLATE_HEAD 167) ; part of template literal before substitution -(defvar js2-NO_SUBS_TEMPLATE 168) ; template literal without substitutions -(defvar js2-TAGGED_TEMPLATE 169) ; tagged template literal +(defvar js2-SUPER 165) +(defvar js2-TEMPLATE_HEAD 166) ; part of template literal before substitution +(defvar js2-NO_SUBS_TEMPLATE 167) ; template literal without substitutions +(defvar js2-TAGGED_TEMPLATE 168) ; tagged template literal (defconst js2-num-tokens (1+ js2-TAGGED_TEMPLATE)) @@ -1384,7 +1383,7 @@ the correct number of ARGS must be provided." "Invalid assignment left-hand side.") (js2-msg "msg.bad.decr" - "Invalid decerement operand.") + "Invalid decrement operand.") (js2-msg "msg.bad.incr" "Invalid increment operand.") @@ -2308,10 +2307,9 @@ If any given node in NODES is nil, doesn't record that link." (defun js2-node-get-enclosing-scope (node) "Return the innermost `js2-scope' node surrounding NODE. Returns nil if there is no enclosing scope node." - (let ((parent (js2-node-parent node))) - (while (not (js2-scope-p parent)) - (setq parent (js2-node-parent parent))) - parent)) + (while (and (setq node (js2-node-parent node)) + (not (js2-scope-p node)))) + node) (defun js2-get-defining-scope (scope name &optional point) "Search up scope chain from SCOPE looking for NAME, a string or symbol. @@ -5366,7 +5364,7 @@ Returns logical OR of END_* flags." (let* ((rv js2-END_DROPS_OFF) (kids (js2-block-node-kids node)) (n (car kids))) - ;; Check each statment. If the statement can continue onto the next + ;; Check each statement. If the statement can continue onto the next ;; one (i.e. END_DROPS_OFF is set), then check the next statement. (while (and n (js2-flag-set-p rv js2-END_DROPS_OFF)) (js2-clear-flag rv js2-END_DROPS_OFF) @@ -5690,7 +5688,7 @@ into temp buffers." let new null return - static super switch + super switch this throw true try typeof var void while with @@ -5711,7 +5709,7 @@ into temp buffers." js2-LET js2-NEW js2-NULL js2-RETURN - js2-STATIC js2-SUPER js2-SWITCH + js2-SUPER js2-SWITCH js2-THIS js2-THROW js2-TRUE js2-TRY js2-TYPEOF js2-VAR js2-WHILE js2-WITH @@ -5736,7 +5734,7 @@ The values are default faces to use for highlighting the keywords.") ;; FIXME: Support strict mode-only future reserved words, after we know ;; which parts scopes are in strict mode, and which are not. -(defconst js2-reserved-words '(class enum export extends import super) +(defconst js2-reserved-words '(class enum export extends import static super) "Future reserved keywords in ECMAScript 5.1.") (defconst js2-keyword-names @@ -6164,8 +6162,11 @@ its relevant fields and puts it into `js2-ti-tokens'." (setf (js2-token-beg token) (- js2-ts-cursor 2)) (js2-skip-line) (setf (js2-token-comment-type token) 'line) - ;; include newline so highlighting goes to end of window - (cl-incf (js2-token-end token)) + ;; include newline so highlighting goes to end of + ;; window, if there actually is a newline; if we + ;; hit eof, then implicitly there isn't + (unless js2-ts-hit-eof + (cl-incf (js2-token-end token))) (throw 'return js2-COMMENT)) ;; is it a /* comment? (when (js2-match-char ?*) @@ -6779,7 +6780,7 @@ Shown at or above `js2-highlight-level' 3.") (defun js2-parse-highlight-member-expr-node (node) "Perform syntax highlighting of EcmaScript built-in properties. -The variable `js2-highlight-level' governs this highighting." +The variable `js2-highlight-level' governs this highlighting." (let (face target prop name pos end parent call-p callee) (cond ;; case 1: simple name, e.g. foo @@ -8094,7 +8095,8 @@ node are given relative start positions and correct lengths." js2-ERROR js2-SEMI js2-CLASS - js2-FUNCTION) + js2-FUNCTION + js2-EXPORT) "List of tokens that don't do automatic semicolon insertion.") (defconst js2-autoinsert-semi-and-warn @@ -8529,9 +8531,13 @@ invalid export statements." (when from-clause (push from-clause children)) (when declaration - (push declaration children)) + (push declaration children) + (when (not (js2-function-node-p declaration)) + (js2-auto-insert-semicolon declaration))) (when default - (push default children)) + (push default children) + (when (not (js2-function-node-p default)) + (js2-auto-insert-semicolon default))) (let ((node (make-js2-export-node :pos beg :len (- (js2-current-token-end) beg) @@ -8546,6 +8552,7 @@ invalid export statements." "Parse a for, for-in or for each-in statement. Last matched token must be js2-FOR." (let ((for-pos (js2-current-token-beg)) + (tmp-scope (make-js2-scope)) pn is-for-each is-for-in-or-of is-for-of in-pos each-pos tmp-pos init ; Node init is also foo in 'foo in object'. @@ -8563,78 +8570,83 @@ Last matched token must be js2-FOR." (if (js2-must-match js2-LP "msg.no.paren.for") (setq lp (- (js2-current-token-beg) for-pos))) (setq tt (js2-get-token)) - ;; 'for' makes local scope - (js2-push-scope (make-js2-scope)) + ;; Capture identifiers inside parens. We can't create the node + ;; (and use it as the current scope) until we know its type. + (js2-push-scope tmp-scope) (unwind-protect - ;; parse init clause - (let ((js2-in-for-init t)) ; set as dynamic variable - (cond - ((= tt js2-SEMI) - (js2-unget-token) - (setq init (make-js2-empty-expr-node))) - ((or (= tt js2-VAR) (= tt js2-LET)) - (setq init (js2-parse-variables tt (js2-current-token-beg)))) - (t - (js2-unget-token) - (setq init (js2-parse-expr))))) - (if (or (js2-match-token js2-IN) - (and (>= js2-language-version 200) - (js2-match-contextual-kwd "of") - (setq is-for-of t))) - (setq is-for-in-or-of t - in-pos (- (js2-current-token-beg) for-pos) - ;; scope of iteration target object is not the scope we've created above. - ;; stash current scope temporary. - cond (let ((js2-current-scope (js2-scope-parent-scope js2-current-scope))) - (js2-parse-expr))) ; object over which we're iterating - ;; else ordinary for loop - parse cond and incr - (js2-must-match js2-SEMI "msg.no.semi.for") - (setq cond (if (= (js2-peek-token) js2-SEMI) - (make-js2-empty-expr-node) ; no loop condition - (js2-parse-expr))) - (js2-must-match js2-SEMI "msg.no.semi.for.cond") - (setq tmp-pos (js2-current-token-end) - incr (if (= (js2-peek-token) js2-RP) - (make-js2-empty-expr-node :pos tmp-pos) - (js2-parse-expr)))) - (if (js2-must-match js2-RP "msg.no.paren.for.ctrl") - (setq rp (- (js2-current-token-beg) for-pos))) - (if (not is-for-in-or-of) - (setq pn (make-js2-for-node :init init - :condition cond - :update incr - :lp lp - :rp rp)) - ;; cond could be null if 'in obj' got eaten by the init node. - (if (js2-infix-node-p init) - ;; it was (foo in bar) instead of (var foo in bar) - (setq cond (js2-infix-node-right init) - init (js2-infix-node-left init)) - (if (and (js2-var-decl-node-p init) - (> (length (js2-var-decl-node-kids init)) 1)) - (js2-report-error "msg.mult.index"))) - (setq pn (make-js2-for-in-node :iterator init - :object cond - :in-pos in-pos - :foreach-p is-for-each - :each-pos each-pos - :forof-p is-for-of - :lp lp - :rp rp))) - (unwind-protect - (progn - (js2-enter-loop pn) - ;; We have to parse the body -after- creating the loop node, - ;; so that the loop node appears in the js2-loop-set, allowing - ;; break/continue statements to find the enclosing loop. - (setf body (js2-parse-statement) - (js2-loop-node-body pn) body - (js2-node-pos pn) for-pos - (js2-node-len pn) (- (js2-node-end body) for-pos)) - (js2-node-add-children pn init cond incr body)) - ;; finally - (js2-exit-loop)) + (progn + ;; parse init clause + (let ((js2-in-for-init t)) ; set as dynamic variable + (cond + ((= tt js2-SEMI) + (js2-unget-token) + (setq init (make-js2-empty-expr-node))) + ((or (= tt js2-VAR) (= tt js2-LET)) + (setq init (js2-parse-variables tt (js2-current-token-beg)))) + (t + (js2-unget-token) + (setq init (js2-parse-expr))))) + (if (or (js2-match-token js2-IN) + (and (>= js2-language-version 200) + (js2-match-contextual-kwd "of") + (setq is-for-of t))) + (setq is-for-in-or-of t + in-pos (- (js2-current-token-beg) for-pos) + ;; scope of iteration target object is not the scope we've created above. + ;; stash current scope temporary. + cond (let ((js2-current-scope (js2-scope-parent-scope js2-current-scope))) + (js2-parse-expr))) ; object over which we're iterating + ;; else ordinary for loop - parse cond and incr + (js2-must-match js2-SEMI "msg.no.semi.for") + (setq cond (if (= (js2-peek-token) js2-SEMI) + (make-js2-empty-expr-node) ; no loop condition + (js2-parse-expr))) + (js2-must-match js2-SEMI "msg.no.semi.for.cond") + (setq tmp-pos (js2-current-token-end) + incr (if (= (js2-peek-token) js2-RP) + (make-js2-empty-expr-node :pos tmp-pos) + (js2-parse-expr))))) (js2-pop-scope)) + (if (js2-must-match js2-RP "msg.no.paren.for.ctrl") + (setq rp (- (js2-current-token-beg) for-pos))) + (if (not is-for-in-or-of) + (setq pn (make-js2-for-node :init init + :condition cond + :update incr + :lp lp + :rp rp)) + ;; cond could be null if 'in obj' got eaten by the init node. + (if (js2-infix-node-p init) + ;; it was (foo in bar) instead of (var foo in bar) + (setq cond (js2-infix-node-right init) + init (js2-infix-node-left init)) + (if (and (js2-var-decl-node-p init) + (> (length (js2-var-decl-node-kids init)) 1)) + (js2-report-error "msg.mult.index"))) + (setq pn (make-js2-for-in-node :iterator init + :object cond + :in-pos in-pos + :foreach-p is-for-each + :each-pos each-pos + :forof-p is-for-of + :lp lp + :rp rp))) + ;; Transplant the declarations. + (setf (js2-scope-symbol-table pn) + (js2-scope-symbol-table tmp-scope)) + (unwind-protect + (progn + (js2-enter-loop pn) + ;; We have to parse the body -after- creating the loop node, + ;; so that the loop node appears in the js2-loop-set, allowing + ;; break/continue statements to find the enclosing loop. + (setf body (js2-parse-statement) + (js2-loop-node-body pn) body + (js2-node-pos pn) for-pos + (js2-node-len pn) (- (js2-node-end body) for-pos)) + (js2-node-add-children pn init cond incr body)) + ;; finally + (js2-exit-loop)) pn)) (defun js2-parse-try () @@ -9156,7 +9168,7 @@ Returns the parsed `js2-var-decl-node' expression node." (defun js2-parse-let (pos &optional stmt-p) "Parse a let expression or statement. A let-expression is of the form `let (vars) expr'. -A let-statment is of the form `let (vars) {statements}'. +A let-statement is of the form `let (vars) {statements}'. The third form of let is a variable declaration list, handled by `js2-parse-variables'." (let ((pn (make-js2-let-node :pos pos)) @@ -9261,11 +9273,10 @@ If NODE is non-nil, it is the AST node associated with the symbol." (let* ((js2-in-for-init nil) (expr (js2-parse-expr)) (pn (make-js2-paren-node :pos px-pos - :expr expr - :len (- (js2-current-token-end) - px-pos)))) + :expr expr))) (js2-node-add-children pn (js2-paren-node-expr pn)) (js2-must-match js2-RP "msg.no.paren") + (setf (js2-node-len pn) (- (js2-current-token-end) px-pos)) pn))))) (defun js2-parse-expr (&optional oneshot) @@ -10155,6 +10166,9 @@ We should have just parsed the 'for' keyword before calling this function." :loops (nreverse loops) :filters (and filter (list (car filter))) :form 'LEGACY_ARRAY)) + ;; Set comp loop's parent to the last loop. + ;; TODO: Get rid of the bogus expr scope. + (setf (js2-scope-parent-scope result) first) (apply #'js2-node-add-children result expr (car filter) (js2-comp-node-loops result)) result)) @@ -10308,9 +10322,14 @@ If ONLY-OF-P is non-nil, only the 'for (foo of bar)' form is allowed." (continue t) tt elems elem after-comma) (while continue - (setq static (and class-p (js2-match-token js2-STATIC)) - tt (js2-get-prop-name-token) + (setq tt (js2-get-prop-name-token) + static nil elem nil) + (when (and class-p (= js2-NAME tt) + (string= "static" (js2-current-token-string))) + (js2-record-face 'font-lock-keyword-face) + (setq static t + tt (js2-get-prop-name-token))) (cond ;; {foo: ...}, {'foo': ...}, {foo, bar, ...}, ;; {get foo() {...}}, {set foo(x) {...}}, or {foo(x) {...}} @@ -10350,13 +10369,13 @@ If ONLY-OF-P is non-nil, only the 'for (foo of bar)' form is allowed." (if elem (js2-node-set-prop elem 'STATIC t) (js2-report-error "msg.unexpected.static"))) ;; Handle commas, depending on class-p. - (let ((comma (js2-match-token js2-COMMA))) - (if class-p - (if comma - (js2-report-error "msg.class.unexpected.comma")) - (if comma - (setq after-comma (js2-current-token-end)) - (setq continue nil)))) + (let ((tok (js2-get-prop-name-token))) + (if (eq tok js2-COMMA) + (if class-p + (js2-report-error "msg.class.unexpected.comma") + (setq after-comma (js2-current-token-end))) + (js2-unget-token) + (unless class-p (setq continue nil)))) ;; Append any parsed element. (if elem (push elem elems))) ; end loop (js2-must-match js2-RC "msg.no.brace.prop") @@ -12070,7 +12089,7 @@ move backward across N balanced expressions." (when (setq child (js2-node-closest-child node (point) rp)) (setq pos (js2-node-abs-end child))) (setq pos (1+ rp)))) - ;; No parens or child nodes, looks for the end of the curren node. + ;; No parens or child nodes, looks for the end of the current node. (cl-incf pos (js2-node-len (if (js2-expr-stmt-node-p (js2-node-parent node)) ;; Stop after the semicolon.