[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 2b32301 15/49: Propertize regexp starting with /= correctl
From: |
Dmitry Gutov |
Subject: |
[elpa] master 2b32301 15/49: Propertize regexp starting with /= correctly |
Date: |
Mon, 16 Jan 2017 15:35:47 +0000 (UTC) |
branch: master
commit 2b32301ac36963e712e4dbea951cc349b99a9db0
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Propertize regexp starting with /= correctly
Fixes #376.
---
js2-mode.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/js2-mode.el b/js2-mode.el
index e6d1c00..fb3482c 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -6395,14 +6395,14 @@ its relevant fields and puts it into `js2-ti-tokens'."
js2-TEMPLATE_HEAD
js2-NO_SUBS_TEMPLATE))))
-(defun js2-read-regexp (start-tt)
+(defun js2-read-regexp (start-tt start-pos)
"Called by parser when it gets / or /= in literal context."
(let (c err
in-class ; inside a '[' .. ']' character-class
flags
(continue t)
(token (js2-new-token 0)))
- (js2-record-text-property (1- js2-ts-cursor) js2-ts-cursor
+ (js2-record-text-property start-pos (1+ start-pos)
'syntax-table (string-to-syntax "\"/"))
(setq js2-ts-string-buffer nil)
(if (eq start-tt js2-ASSIGN_DIV)
@@ -10425,9 +10425,9 @@ array-literals, array comprehensions and regular
expressions."
(js2-parse-template-literal))
((or (= tt js2-DIV) (= tt js2-ASSIGN_DIV))
;; Got / or /= which in this context means a regexp literal
- (let ((px-pos (js2-current-token-beg))
- (flags (js2-read-regexp tt))
- (end (js2-current-token-end)))
+ (let* ((px-pos (js2-current-token-beg))
+ (flags (js2-read-regexp tt px-pos))
+ (end (js2-current-token-end)))
(prog1
(make-js2-regexp-node :pos px-pos
:len (- end px-pos)
- [elpa] master updated (218fd5a -> ff072bf), Dmitry Gutov, 2017/01/16
- [elpa] master b23d9e4 01/49: Fix Highlighting function name of form {"quoted name" () {...}}, Dmitry Gutov, 2017/01/16
- [elpa] master abe8d0c 02/49: Fix comment alignment, Dmitry Gutov, 2017/01/16
- [elpa] master 8e7ed39 06/49: Merge pull request #348 from dunn/makequiet, Dmitry Gutov, 2017/01/16
- [elpa] master 357547c 09/49: js2-jsx-mode docstring fix, Dmitry Gutov, 2017/01/16
- [elpa] master 2b32301 15/49: Propertize regexp starting with /= correctly,
Dmitry Gutov <=
- [elpa] master 68db1f5 05/49: Makefile: use -Q to avoid site-lisp loading, Dmitry Gutov, 2017/01/16
- [elpa] master 4e5babf 03/49: Merge pull request #345 from jacott/master, Dmitry Gutov, 2017/01/16
- [elpa] master 980eb3d 04/49: Support ES7 exponentiation, Dmitry Gutov, 2017/01/16
- [elpa] master 49f9761 08/49: js2-jsdoc-arg-tag-regexp: Recognize @module, Dmitry Gutov, 2017/01/16
- [elpa] master e45206b 11/49: js2-parse-class: Convert positions to relative for NAME and EXTENDS, too, Dmitry Gutov, 2017/01/16
- [elpa] master bea6942 13/49: Unbind js2-mode-show-node, Dmitry Gutov, 2017/01/16
- [elpa] master c0801b2 12/49: Propertize regexp literals like js-mode does, Dmitry Gutov, 2017/01/16
- [elpa] master 9a8aaa9 28/49: Fix length of name in namespace-import nodes, Dmitry Gutov, 2017/01/16
- [elpa] master 44c289f 24/49: Copy edits, Dmitry Gutov, 2017/01/16
- [elpa] master b6d9301 17/49: Merge pull request #377 from XeCycle/memfn-delete, Dmitry Gutov, 2017/01/16