summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJackson Ray Hamilton <jackson@jacksonrayhamilton.com>2019-06-04 08:37:36 -0700
committerJackson Ray Hamilton <jackson@jacksonrayhamilton.com>2019-06-04 09:05:40 -0700
commitea09b9fe34d2d715bf72a25e3f69ae2baff0b89c (patch)
treeb5f92b93bd438f60220351bbd9d1a399ce41923b /lisp
parentc4214e4dc19a40ebe22ea4db09ae3f8dd64a9143 (diff)
downloademacs-ea09b9fe34d2d715bf72a25e3f69ae2baff0b89c.tar.gz
emacs-ea09b9fe34d2d715bf72a25e3f69ae2baff0b89c.tar.bz2
emacs-ea09b9fe34d2d715bf72a25e3f69ae2baff0b89c.zip
Specify the matching chars for JSX open/close parenthesis
* lisp/progmodes/js.el (js-jsx--syntax-propertize-tag): Indicate the matching parenthesis character (since JSX’s < and > aren’t typical parenthesis) for the sake of packages like rainbow-delimiters which need that information.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/js.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 9a077b99a46..161fd5c00b0 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -2220,7 +2220,8 @@ testing for syntax only valid as JSX."
(cond
((= (char-after) ?>)
;; Make the closing “>” a close parenthesis.
- (put-text-property (point) (1+ (point)) 'syntax-table '(5))
+ (put-text-property (point) (1+ (point)) 'syntax-table
+ (eval-when-compile (string-to-syntax ")<")))
(forward-char)
(setq unambiguous t)
(throw 'stop nil))
@@ -2306,7 +2307,8 @@ testing for syntax only valid as JSX."
;; Save JSXBoundaryElement’s name’s match data for font-locking.
(if name-beg (put-text-property name-beg (1+ name-beg) 'js-jsx-tag-name name-match-data))
;; Make the opening “<” an open parenthesis.
- (put-text-property tag-beg (1+ tag-beg) 'syntax-table '(4))
+ (put-text-property tag-beg (1+ tag-beg) 'syntax-table
+ (eval-when-compile (string-to-syntax "(>")))
;; Prevent “out of range” errors when typing at the end of a buffer.
(setq tag-end (if (eobp) (1- (point)) (point)))
;; Mark beginning and end of tag for font-locking.