diff options
| author | Jackson Ray Hamilton <jackson@jacksonrayhamilton.com> | 2019-04-07 14:36:47 -0700 |
|---|---|---|
| committer | Jackson Ray Hamilton <jackson@jacksonrayhamilton.com> | 2019-04-08 22:48:24 -0700 |
| commit | 7a9dac5c944432cc2329473bb1dd9db9c0bfdd99 (patch) | |
| tree | b331864efe2500c8e73423398fb5197152028802 /test | |
| parent | 98e36a3e31da10bf230743d285544305f730b60d (diff) | |
| download | emacs-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 'test')
| -rw-r--r-- | test/manual/indent/jsx-unclosed-2.jsx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/manual/indent/jsx-unclosed-2.jsx b/test/manual/indent/jsx-unclosed-2.jsx index 9d80a2e9ae2..be0a605503f 100644 --- a/test/manual/indent/jsx-unclosed-2.jsx +++ b/test/manual/indent/jsx-unclosed-2.jsx @@ -19,6 +19,10 @@ if (foo > bar) void 0 if (foo < await bar) void 0 while (await foo > bar) void 0 +<div> + {foo < await bar} +</div> + // Allow unary keyword names as null-valued JSX attributes. // (As if this will EVER happen…) <Foo yield> @@ -40,3 +44,15 @@ while (await foo > bar) void 0 // “-” may be used in a JSXAttribute’s name. <Foo a-b-c="" x-y-z="" /> + +// Weird spaces should be tolerated. +< div > + < div > + < div + attr="" + / > + < div + attr="" + / > + < / div> +< / div > |