[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 94b2721 31/49: Merge pull request #385 from mishoo/master
From: |
Dmitry Gutov |
Subject: |
[elpa] master 94b2721 31/49: Merge pull request #385 from mishoo/master |
Date: |
Mon, 16 Jan 2017 15:35:49 +0000 (UTC) |
branch: master
commit 94b27217cd8305029fdfdd2f4ef660622de8a582
Merge: 712dfb0 4d35da5
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #385 from mishoo/master
Fix the fix (error detection)
---
js2-mode.el | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/js2-mode.el b/js2-mode.el
index 8fdfb0e..12a5c6a 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -2094,13 +2094,13 @@ Returns nil if element is not found in the list."
"Signal a syntax error or record a parse error."
(if js2-recover-from-parse-errors
(js2-record-parse-error msg msg-arg pos len)
- (signal 'js2-syntax-error
- (list msg
- js2-ts-lineno
- (save-excursion
- (goto-char js2-ts-cursor)
- (current-column))
- js2-ts-hit-eof))))
+ (signal 'js2-syntax-error
+ (list msg
+ js2-ts-lineno
+ (save-excursion
+ (goto-char js2-ts-cursor)
+ (current-column))
+ js2-ts-hit-eof))))
(defun js2-report-warning (msg &optional msg-arg pos len face)
(if js2-compiler-report-warning-as-error
@@ -8655,18 +8655,18 @@ imports or a namespace import that follows it.
The current token must be js2-MUL."
(let ((beg (js2-current-token-beg)))
(cond
- ((and (js2-match-contextual-kwd "as")
- (js2-must-match-prop-name "msg.syntax"))
- (let ((node (make-js2-namespace-import-node
- :pos beg
- :len (- (js2-current-token-end) beg)
- :name (make-js2-name-node
- :pos (js2-current-token-beg)
- :len (- (js2-current-token-end)
- (js2-current-token-beg))
- :name (js2-current-token-string)))))
- (js2-node-add-children node (js2-namespace-import-node-name node))
- node))
+ ((js2-match-contextual-kwd "as")
+ (when (js2-must-match-prop-name "msg.syntax")
+ (let ((node (make-js2-namespace-import-node
+ :pos beg
+ :len (- (js2-current-token-end) beg)
+ :name (make-js2-name-node
+ :pos (js2-current-token-beg)
+ :len (- (js2-current-token-end)
+ (js2-current-token-beg))
+ :name (js2-current-token-string)))))
+ (js2-node-add-children node (js2-namespace-import-node-name node))
+ node)))
(t
(js2-unget-token)
(js2-report-error "msg.syntax")))))
- [elpa] master 1f12517 10/49: Merge pull request #353 from kaushalmodi/js2-jsx-mode-docstring-fix, (continued)
- [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, 2017/01/16
- [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 <=
- [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
- [elpa] master 6f2d51b 41/49: Fix the breakage from the previous commit, Dmitry Gutov, 2017/01/16
- [elpa] master 03c679e 48/49: Bump the version, Dmitry Gutov, 2017/01/16
- [elpa] master 8569ba6 47/49: Merge pull request #387 from futurist/master, Dmitry Gutov, 2017/01/16
- [elpa] master 80ebdee 42/49: Rename js2--collect-declared-symbols to js2--collect-target-symbols, Dmitry Gutov, 2017/01/16
- [elpa] master b575f17 19/49: Optimize a call to `append`, Dmitry Gutov, 2017/01/16
- [elpa] master e77fcd4 36/49: Refactor ‘js2-define-destruct-symbols’ on top of ‘js2--collect-declared-symbols’, Dmitry Gutov, 2017/01/16