summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJackson Ray Hamilton <jackson@jacksonrayhamilton.com>2019-04-07 14:36:47 -0700
committerJackson Ray Hamilton <jackson@jacksonrayhamilton.com>2019-04-08 22:48:24 -0700
commit7a9dac5c944432cc2329473bb1dd9db9c0bfdd99 (patch)
treeb331864efe2500c8e73423398fb5197152028802 /lisp
parent98e36a3e31da10bf230743d285544305f730b60d (diff)
downloademacs-7a9dac5c944432cc2329473bb1dd9db9c0bfdd99.tar.gz
Improve whitespace and unary keyword parsing
* lisp/progmodes/js.el (js--name-start-chars): Remove, adding these chars back to js--name-start-re. (js--name-start-re): Add chars back from js--name-start-chars. (js-jsx--tag-start-re): Improve regexp to capture the tag name (so it can be disambiguated from a unary keyword), to match newlines (which are common in this spot), and to require at least one whitespace character before the attribute name. (js-jsx--matched-tag-type): Ensure the “tag name” isn’t possibly a unary keyword. (js-jsx--self-closing-re, js-jsx--matching-close-tag-pos): Allow whitespace around “<” and “>”. * test/manual/indent/jsx-unclosed-2.jsx: Add tests for unary keyword and whitespace parsing.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/js.el19
1 files changed, 11 insertions, 8 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 21e6b683b78..e42c455c84c 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -65,10 +65,7 @@
;;; Constants
-(defconst js--name-start-chars "a-zA-Z_$"
- "Character class chars matching the start of a JavaScript identifier.")
-
-(defconst js--name-start-re (concat "[" js--name-start-chars "]")
+(defconst js--name-start-re (concat "[a-zA-Z_$]")
"Regexp matching the start of a JavaScript identifier, without grouping.")
(defconst js--stmt-delim-chars "^;{}?:")
@@ -1907,7 +1904,12 @@ For use by `syntax-propertize-extend-region-functions'."
(if new-start (cons new-start end))))
(defconst js-jsx--tag-start-re
- (concat js--dotted-name-re "\\s-*[" js--name-start-chars "{/>]")
+ (concat "\\(" js--dotted-name-re "\\)\\(?:"
+ ;; Whitespace is only necessary if an attribute implies JSX.
+ "\\(?:\\s-\\|\n\\)*[{/>]"
+ "\\|"
+ "\\(?:\\s-\\|\n\\)+" js--name-start-re
+ "\\)")
"Regexp unambiguously matching a JSXOpeningElement.")
(defun js-jsx--matched-tag-type ()
@@ -1918,11 +1920,12 @@ else return `other'."
(cond
((= (char-after) ?/) (forward-char) 'close) ; JSXClosingElement/JSXClosingFragment
((= (char-after) ?>) (forward-char) 'other) ; JSXOpeningFragment
- ((looking-at js-jsx--tag-start-re) ; JSXOpeningElement
+ ((and (looking-at js-jsx--tag-start-re) ; JSXOpeningElement
+ (not (js--unary-keyword-p (match-string 1))))
(goto-char (match-end 0))
(if (= (char-before) ?/) 'self-closing 'other))))
-(defconst js-jsx--self-closing-re "/>"
+(defconst js-jsx--self-closing-re "/\\s-*>"
"Regexp matching the end of a self-closing JSXOpeningElement.")
(defun js-jsx--matching-close-tag-pos ()
@@ -1933,7 +1936,7 @@ JSXClosingFragment, skipping over any nested JSXElements to find
the match. Return nil if a match can’t be found."
(let ((tag-stack 1) tag-pos type last-pos pos)
(catch 'stop
- (while (and (re-search-forward "<" nil t) (not (eobp)))
+ (while (and (re-search-forward "<\\s-*" nil t) (not (eobp)))
(when (setq tag-pos (match-beginning 0)
type (js-jsx--matched-tag-type))
(when last-pos