fix: mergeWhitespaceTokens offset calculation

shikijs · Feb 1, 2024 · 3cf46d5 · 3cf46d5
1 parent 94dbc8a
commit 3cf46d5
Show file tree

Hide file tree

Showing 34 changed files with 641 additions and 6,612 deletions.
diff --git a/packages/core/src/code-to-hast.ts b/packages/core/src/code-to-hast.ts
@@ -197,6 +197,7 @@ function mergeWhitespaceTokens(tokens: ThemedToken[][]) {
           if (couldMerge) {
             newLine.push({
               ...token,
+              offset: firstOffset,
               content: carryOnContent + token.content,
             })
           }
@@ -209,6 +210,7 @@ function mergeWhitespaceTokens(tokens: ThemedToken[][]) {
               token,
             )
           }
+          firstOffset = 0
           carryOnContent = ''
         }
         else {

diff --git a/packages/twoslash/src/core.ts b/packages/twoslash/src/core.ts
@@ -52,7 +52,6 @@ export function createTransformerFactory(
           lang = langAlias[this.options.lang]
 
         if (filter(lang, code, this.options)) {
-          this.options.mergeWhitespaces = 'never'
           const twoslash = twoslasher(code, lang, twoslashOptions)
           this.meta.twoslash = twoslash
           this.options.lang = twoslash.meta.extension || lang

diff --git a/packages/twoslash/test/out/classic/compiler_errors.html b/packages/twoslash/test/out/classic/compiler_errors.html
diff --git a/packages/twoslash/test/out/classic/completions.html b/packages/twoslash/test/out/classic/completions.html
diff --git a/packages/twoslash/test/out/classic/cuts_out_unnecessary_code.html b/packages/twoslash/test/out/classic/cuts_out_unnecessary_code.html
diff --git a/packages/twoslash/test/out/classic/simple.html b/packages/twoslash/test/out/classic/simple.html