[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 91e722a 27/49: Merge pull request #381 from mgiles/templat
From: |
Dmitry Gutov |
Subject: |
[elpa] master 91e722a 27/49: Merge pull request #381 from mgiles/template-pos |
Date: |
Mon, 16 Jan 2017 15:35:48 +0000 (UTC) |
branch: master
commit 91e722a798fc8c30cfa4fad119acc83892d41e9c
Merge: 82bbd97 2801681
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #381 from mgiles/template-pos
Fix "pos" argument in template node constructors
---
js2-mode.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/js2-mode.el b/js2-mode.el
index 7d52e07..dc86321 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -3773,7 +3773,7 @@ You can tell the quote type by looking at the first
character."
(:include js2-node)
(:constructor nil)
(:constructor make-js2-template-node (&key (type
js2-TEMPLATE_HEAD)
- beg len kids)))
+ pos len kids)))
"Template literal."
kids) ; `js2-string-node' is used for string segments, other nodes
; for substitutions inside.
@@ -3796,7 +3796,7 @@ You can tell the quote type by looking at the first
character."
(:include js2-node)
(:constructor nil)
(:constructor make-js2-tagged-template-node (&key (type
js2-TAGGED_TEMPLATE)
- beg len tag
template)))
+ pos len tag
template)))
"Tagged template literal."
tag ; `js2-node' with the tag expression.
template) ; `js2-template-node' with the template.
@@ -10157,9 +10157,9 @@ Returns an expression tree that includes PN, the parent
node."
(defun js2-parse-tagged-template (tag-node tpl-node)
"Parse tagged template expression."
- (let* ((beg (js2-node-pos tag-node))
- (pn (make-js2-tagged-template-node :beg beg
- :len (- (js2-current-token-end)
beg)
+ (let* ((pos (js2-node-pos tag-node))
+ (pn (make-js2-tagged-template-node :pos pos
+ :len (- (js2-current-token-end)
pos)
:tag tag-node
:template tpl-node)))
(js2-node-add-children pn tag-node tpl-node)
@@ -10466,7 +10466,7 @@ array-literals, array comprehensions and regular
expressions."
(setq tt (js2-get-token 'TEMPLATE_TAIL))
(push (make-js2-string-node :type tt) kids))
(setq kids (nreverse kids))
- (let ((tpl (make-js2-template-node :beg beg
+ (let ((tpl (make-js2-template-node :pos beg
:len (- (js2-current-token-end) beg)
:kids kids)))
(apply #'js2-node-add-children tpl kids)
- [elpa] master 454b242 20/49: Update NEWS.md, (continued)
- [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, 2017/01/16
- [elpa] master 91e722a 27/49: Merge pull request #381 from mgiles/template-pos,
Dmitry Gutov <=
- [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