Improved tag matching for JSX

FIameCaster · Aug 20, 2023 · 38fa98b · 38fa98b
1 parent 2c8a786
commit 38fa98b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/package/package.json b/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prism-code-editor",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "Lightweight, extensible code editor for the web using Prism",
   "main": "./dist/index.js",

diff --git a/package/src/extensions/matchTags.ts b/package/src/extensions/matchTags.ts
@@ -58,14 +58,14 @@ export const createTagMatcher = (editor: PrismEditor): TagMatcher => {
 
 					if (Array.isArray(content)) {
 						if (type == "tag") {
-							const [{ length: openingLength }, tagName] = <[Prism.Token, string?]>(
+							let [{ length: openingLength }, tagName] = <[Prism.Token, (string | Prism.Token)?]>(
 								(<Prism.Token>content[0]).content
 							)
+							let closingLength = (<Prism.Token>content[content.length - 1]).length
 
-							const closingLength = (<Prism.Token>content[content.length - 1]).length
-
-							// Skip self-closing tags or JSX fragments
-							if (closingLength == 1 && tagName && (noVoidTags || !voidTags.has(tagName))) {
+							// Skip self-closing tags
+							if (closingLength == 1 && (noVoidTags || !voidTags.has(<string>tagName))) {
+								tagName = <string>((<Prism.Token>tagName)?.content || tagName)
 								if (openingLength == 1) {
 									stack.push([tagIndex, tagName])
 								} else {