fix(vscode): highlight classes with >< characters (#2256)

unocss · Feb 24, 2023 · 03c56c8 · 03c56c8
1 parent cb1784f
commit 03c56c8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 20 deletions.
diff --git a/packages/shared-common/src/index.ts b/packages/shared-common/src/index.ts
@@ -98,7 +98,7 @@ export function getMatchedPositions(code: string, matched: string[], hasVariantG
 
   // highlight for plain classes
   let start = 0
-  code.split(/([\s"'`;<>*]|:\(|\)"|\)\s)/g).forEach((i) => {
+  code.split(/([\s"'`;*]|:\(|\)"|\)\s)/g).forEach((i) => {
     const end = start + i.length
     if (isPug) {
       result.push(...getPlainClassMatchedPositionsForPug(i, plain, start))
@@ -133,7 +133,7 @@ export function getMatchedPositions(code: string, matched: string[], hasVariantG
         const [, pre, sep, body] = match
         const index = match.index!
         let start = index + pre.length + sep.length + 1
-        body.split(/([\s"'`;<>*]|:\(|\)"|\)\s)/g).forEach((i) => {
+        body.split(/([\s"'`;*]|:\(|\)"|\)\s)/g).forEach((i) => {
           const end = start + i.length
           const full = pre + sep + i
           if (plain.has(full)) {

diff --git a/test/pos.test.ts b/test/pos.test.ts
@@ -110,28 +110,41 @@ describe('matched-positions', async () => {
       presets: [
         presetUno(),
       ],
+      shortcuts: {
+        '<custom-shortcut': 'text-lg',
+      },
     })
 
-    expect(await match(uno, '<div class="bg-gray-900 h-4 hover:scale-100"></div>'))
+    expect(await match(uno, '<div class="bg-gray-900 h-4 hover:scale-100 [&>span]:text-white <custom-shortcut"></div>'))
       .toMatchInlineSnapshot(`
-      [
-        [
-          12,
-          23,
-          "bg-gray-900",
-        ],
-        [
-          24,
-          27,
-          "h-4",
-        ],
         [
-          28,
-          43,
-          "hover:scale-100",
-        ],
-      ]
-    `)
+          [
+            12,
+            23,
+            "bg-gray-900",
+          ],
+          [
+            24,
+            27,
+            "h-4",
+          ],
+          [
+            28,
+            43,
+            "hover:scale-100",
+          ],
+          [
+            44,
+            63,
+            "[&>span]:text-white",
+          ],
+          [
+            64,
+            80,
+            "<custom-shortcut",
+          ],
+        ]
+      `)
   })
 
   test('variant-group', async () => {