[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c0801b2 12/49: Propertize regexp literals like js-mode doe
From: |
Dmitry Gutov |
Subject: |
[elpa] master c0801b2 12/49: Propertize regexp literals like js-mode does |
Date: |
Mon, 16 Jan 2017 15:35:47 +0000 (UTC) |
branch: master
commit c0801b25d6ada38cc93e7a6d33d5de0d1ad5bc1a
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Propertize regexp literals like js-mode does
Closes #368.
---
js2-mode.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/js2-mode.el b/js2-mode.el
index 31fe0d4..5f0f3c1 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -6403,6 +6403,8 @@ its relevant fields and puts it into `js2-ti-tokens'."
flags
(continue t)
(token (js2-new-token 0)))
+ (js2-record-text-property (1- js2-ts-cursor) js2-ts-cursor
+ 'syntax-table (string-to-syntax "\"/"))
(setq js2-ts-string-buffer nil)
(if (eq start-tt js2-ASSIGN_DIV)
;; mis-scanned /=
@@ -6429,6 +6431,8 @@ its relevant fields and puts it into `js2-ti-tokens'."
(setq in-class nil)))
(js2-add-to-string c))))
(unless err
+ (js2-record-text-property (1- js2-ts-cursor) js2-ts-cursor
+ 'syntax-table (string-to-syntax "\"/"))
(while continue
(cond
((js2-match-char ?g)
@@ -10430,8 +10434,7 @@ array-literals, array comprehensions and regular
expressions."
:len (- end px-pos)
:value (js2-current-token-string)
:flags flags)
- (js2-set-face px-pos end 'font-lock-string-face 'record)
- (js2-record-text-property px-pos end 'syntax-table '(2)))))
+ (js2-set-face px-pos end 'font-lock-string-face 'record))))
((or (= tt js2-NULL)
(= tt js2-THIS)
(= tt js2-SUPER)
- [elpa] master abe8d0c 02/49: Fix comment alignment, (continued)
- [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, 2017/01/16
- [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 <=
- [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
- [elpa] master 64ec0a2 14/49: Allow newline in globals declaration, Dmitry Gutov, 2017/01/16
- [elpa] master 2801681 26/49: Fix "pos" argument in template node constructors, Dmitry Gutov, 2017/01/16
- [elpa] master 712dfb0 29/49: Merge pull request #384 from mishoo/master, Dmitry Gutov, 2017/01/16
- [elpa] master df06798 23/49: Merge pull request #378 from JulianKniephoff/include-externs-locally, Dmitry Gutov, 2017/01/16
- [elpa] master 2a79649 33/49: Fix indentation after regexp in js2-old-indent.el, Dmitry Gutov, 2017/01/16
- [elpa] master f450de0 34/49: Handle destructuring assignments when classifying variables, Dmitry Gutov, 2017/01/16
- [elpa] master 90e37cd 45/49: Merge pull request #397 from lelit/issue393, Dmitry Gutov, 2017/01/16