refactor: avoid circular refs

packages/shikiji-core/src/tokenizer-ansi.ts

@@ -1,8 +1,7 @@
 import { createAnsiSequenceParser, createColorPalette, namedColors } from 'ansi-sequence-parser'
 import type { ThemeRegistrationResolved, ThemedToken, TokenizeWithThemeOptions } from './types'
 import { FontStyle } from './types'
-import { applyColorReplacements } from './tokenizer'
-import { splitLines } from '.'
+import { applyColorReplacements, splitLines } from './utils'
 
 export function tokenizeAnsiWithTheme(
   theme: ThemeRegistrationResolved,

packages/shikiji-core/src/tokenizer.ts

@@ -5,7 +5,7 @@ import type { IGrammar } from './textmate'
 import { INITIAL } from './textmate'
 import type { CodeToThemedTokensOptions, FontStyle, ShikiInternal, ThemeRegistrationResolved, ThemedToken, ThemedTokenScopeExplanation, TokenizeWithThemeOptions } from './types'
 import { StackElementMetadata } from './stack-element-metadata'
-import { isPlaintext, splitLines } from './utils'
+import { applyColorReplacements, isPlaintext, splitLines } from './utils'
 import { tokenizeAnsiWithTheme } from './tokenizer-ansi'
 
 export function codeToThemedTokens(
@@ -198,7 +198,3 @@ function explainThemeScope(
   }
   return result
 }
-
-export function applyColorReplacements(color: string, replacements?: Record<string, string>): string {
-  return replacements?.[color.toLowerCase()] || color
-}

packages/shikiji-core/src/utils.ts

@@ -51,3 +51,7 @@ export function addClassToHast(node: Element, className: string | string[]) {
       node.properties.class.push(c)
   }
 }
+
+export function applyColorReplacements(color: string, replacements?: Record<string, string>): string {
+  return replacements?.[color.toLowerCase()] || color
+}

packages/shikiji-twoslash/style-rich.css

@@ -171,7 +171,7 @@
   background-color: var(--twoslash-tag-bg);
   border-left: 3px solid var(--twoslash-tag-color);
   color: var(--twoslash-tag-color);
-  padding: 6px 6px;
+  padding: 6px 10px;
   margin: 0.2em 0;
   display: flex;
   align-items: center;