From 488881fda7e65380b4c414e30869cfa2c14f909e Mon Sep 17 00:00:00 2001
From: Fro-Q <froqqq@outlook.com>
Date: Thu, 24 Apr 2025 16:46:58 +0800
Subject: [PATCH] fix: bug that `{1}` in `js{1} add={2}` is not dealed to
 result in langName being `js{1}`

---
 src/node/markdown/plugins/highlightLines.ts | 41 ++++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/node/markdown/plugins/highlightLines.ts b/src/node/markdown/plugins/highlightLines.ts
index aadc9b42..34c6ce8b 100644
--- a/src/node/markdown/plugins/highlightLines.ts
+++ b/src/node/markdown/plugins/highlightLines.ts
@@ -1,37 +1,50 @@
 // Modified from https://github.com/egoist/markdown-it-highlight-lines
+// Now this plugin is only used to normalize line attrs.
 // The else part of line highlights logic is in './highlight.ts'.
-// Restore the `{0}` syntax recognized and processed by the markdown-it-attrs plugin
 
 import type { MarkdownItAsync } from 'markdown-it-async'
 
+const RE = /{([\d,-]+)}/
+
 export const highlightLinePlugin = (md: MarkdownItAsync) => {
   const fence = md.renderer.rules.fence!
   md.renderer.rules.fence = (...args) => {
     const [tokens, idx] = args
     const token = tokens[idx]
 
-    // due to use of markdown-it-attrs, the last `{0}` syntax would have been
+    // due to use of markdown-it-attrs, the {0} syntax would have been
     // converted to attrs on the token
-    // e.g.: `js add={1} remove={2}` => `js add={1} remove=`
-    //       `{2}` is stored in token.attrs
     const attr = token.attrs && token.attrs[0]
 
-    let removedLines = null
+    let lines = null
 
     if (!attr) {
-      return fence(...args)
-    }
+      // markdown-it-attrs maybe disabled
+      const rawInfo = token.info
+
+      if (!rawInfo || !RE.test(rawInfo)) {
+        return fence(...args)
+      }
+
+      const langName = rawInfo.replace(RE, '').trim()
 
-    removedLines = attr[0]
-    if (!removedLines || !/[\d,-]+/.test(removedLines)) {
-      return fence(...args)
+      // ensure the next plugin get the correct lang
+      token.info = langName
+
+      lines = RE.exec(rawInfo)![1]
     }
 
-    // except for case like `js{1}`, no trailing space
-    token.info += token.info.endsWith('=') ? '' : ' '
-    // add the line numbers back to the token
-    token.info += "{" + removedLines + "}"
+    if (!lines) {
+      lines = attr![0]
+
+      if (!lines || !/[\d,-]+/.test(lines)) {
+        return fence(...args)
+      }
+    }
 
+    token.info += '{' + lines + '}'
+    // ensure there is a space between the lang and the line numbers
+    token.info = token.info.replace(/(?<![=])\{/g, " {")
     return fence(...args)
   }
 }