@peaceroad/markdown-it-renderer-fence 0.7.0 → 0.9.0

package/src/fence/render-api-provider.js

@@ -1,9 +1,9 @@
 import {
-  classifyShikiScopeKeyword,
+  classifyShikiScopeRole,
   getShikiRawScopeName,
-  normalizeShikiKeywordLangAliasMap,
-  resolveShikiKeywordLangForFence,
-} from '../custom-highlight/shiki-keyword.js'
+  normalizeShikiRoleLangAliasMap,
+  resolveShikiRoleLangForFence,
+} from '../custom-highlight/shiki-role.js'
 import {
   escapeHtmlAttr,
   getCustomHighlightPayloadMap,
@@ -20,6 +20,7 @@ import {
 } from '../custom-highlight/scope-name.js'
 import {
   commentLineClass,
+  getCommentLineRanges,
   normalizeEmphasisRanges,
 } from './render-shared.js'
 import {
@@ -46,9 +47,9 @@ const defaultCustomHighlightOpt = {
   scopePrefix: 'hl',
   includeScopeStyles: true,
   shikiScopeMode: 'auto',
-  shikiKeywordClassifier: null,
-  shikiKeywordLangResolver: null,
-  shikiKeywordLangAliases: null,
+  shikiRoleClassifier: null,
+  shikiRoleLangResolver: null,
+  shikiRoleLangAliases: null,
 }
 
 const normalizeCustomHighlightProvider = (provider) => {
@@ -60,7 +61,7 @@ const normalizeCustomHighlightProvider = (provider) => {
 const normalizeShikiScopeMode = (mode) => {
   const key = String(mode || '').trim().toLowerCase()
   if (!key) return null
-  if (key === 'keyword') return 'keyword'
+  if (key === 'role') return 'role'
   if (key === 'semantic') return 'semantic'
   if (key === 'color') return 'color'
   if (key === 'auto') return 'auto'
@@ -135,7 +136,7 @@ const buildShikiInternalLangAliasMap = (highlighter) => {
     } catch (e) {}
     rawMap[rawName] = canonical
   }
-  return normalizeShikiKeywordLangAliasMap(rawMap)
+  return normalizeShikiRoleLangAliasMap(rawMap)
 }
 
 const normalizeCustomHighlightOpt = (opt = {}) => {
@@ -162,11 +163,11 @@ const normalizeCustomHighlightOpt = (opt = {}) => {
   } else {
     next.theme = normalizedTheme.singleTheme || null
   }
-  if (typeof next.shikiKeywordClassifier !== 'function') next.shikiKeywordClassifier = null
-  if (typeof next.shikiKeywordLangResolver !== 'function') next.shikiKeywordLangResolver = null
-  next.shikiKeywordLangAliases = normalizeShikiKeywordLangAliasMap(next.shikiKeywordLangAliases)
+  if (typeof next.shikiRoleClassifier !== 'function') next.shikiRoleClassifier = null
+  if (typeof next.shikiRoleLangResolver !== 'function') next.shikiRoleLangResolver = null
+  next.shikiRoleLangAliases = normalizeShikiRoleLangAliasMap(next.shikiRoleLangAliases)
   next._shikiInternalLangAliasMap =
-    (next.provider === 'shiki' && next.shikiScopeMode === 'keyword')
+    (next.provider === 'shiki' && next.shikiScopeMode === 'role')
       ? buildShikiInternalLangAliasMap(next.highlighter)
       : null
   const fallbackOn = Array.isArray(next.fallbackOn) ? next.fallbackOn : fallbackOnDefault
@@ -272,27 +273,26 @@ const sameScopeStyles = (a, b) => {
   return true
 }
 
-const getLogicalLinesAndOffsets = (text) => {
-  const rawLines = text.split('\n')
-  const logicalLineCount = rawLines.length > 0 && rawLines[rawLines.length - 1] === '' ? rawLines.length - 1 : rawLines.length
-  const lines = new Array(logicalLineCount)
-  const offsets = new Array(logicalLineCount)
-  let cursor = 0
-  for (let i = 0; i < logicalLineCount; i++) {
-    const line = rawLines[i]
-    lines[i] = line
-    offsets[i] = [cursor, cursor + line.length]
-    cursor += line.length + 1
+const getLogicalLineOffsets = (text) => {
+  const str = String(text ?? '')
+  const offsets = []
+  if (!str) return offsets
+  let lineStart = 0
+  for (let i = 0; i < str.length; i++) {
+    const code = str.charCodeAt(i)
+    if (code !== 10 && code !== 13) continue
+    offsets.push([lineStart, i])
+    if (code === 13 && i + 1 < str.length && str.charCodeAt(i + 1) === 10) i++
+    lineStart = i + 1
   }
-  return { lines, offsets }
+  if (lineStart < str.length) offsets.push([lineStart, str.length])
+  return offsets
 }
 
 const getShikiTokenStyle = (token) => {
   const style = {}
   if (typeof token.color === 'string' && token.color) style.color = token.color
   const fontStyle = Number.isFinite(token.fontStyle) ? token.fontStyle : 0
-  if (fontStyle & 1) style.fontStyle = 'italic'
-  if (fontStyle & 2) style.fontWeight = '700'
   if (fontStyle & 4) style.textDecoration = 'underline'
   return normalizeScopeStyle(style)
 }
@@ -459,21 +459,21 @@ const hasShikiOffsets = (tokenLines) => {
   return false
 }
 
-const getShikiScopeName = (tok, lang, style, opt, preResolvedKeywordLang = '') => {
+const getShikiScopeName = (tok, lang, style, opt, preResolvedRoleLang = '') => {
   const scopeMode = (opt && opt.shikiScopeMode) || 'auto'
   const rawScope = getShikiRawScopeName(tok)
-  let customKeywordName = null
-  const isKeywordScopeMode = scopeMode === 'keyword'
-  if (isKeywordScopeMode && opt && typeof opt.shikiKeywordClassifier === 'function') {
+  let customRoleName = null
+  const isRoleScopeMode = scopeMode === 'role'
+  if (isRoleScopeMode && opt && typeof opt.shikiRoleClassifier === 'function') {
     try {
-      const customName = opt.shikiKeywordClassifier(rawScope, tok, { lang, style, scopeMode })
-      if (customName != null && customName !== '') customKeywordName = String(customName)
+      const customName = opt.shikiRoleClassifier(rawScope, tok, { lang, style, scopeMode })
+      if (customName != null && customName !== '') customRoleName = String(customName)
     } catch (e) {}
   }
-  if (isKeywordScopeMode) {
-    if (customKeywordName) return 'shiki-' + customKeywordName
-    const bucket = classifyShikiScopeKeyword(rawScope, tok, lang, opt, preResolvedKeywordLang)
-    return 'shiki-' + bucket
+  if (isRoleScopeMode) {
+    if (customRoleName) return 'shiki-role-' + customRoleName
+    const bucket = classifyShikiScopeRole(rawScope, tok, lang, opt, preResolvedRoleLang)
+    return 'shiki-role-' + bucket
   }
   if (scopeMode === 'semantic') {
     if (rawScope) return 'shiki-' + rawScope
@@ -515,11 +515,11 @@ const createRangesFromShikiTokens = (lang, tokenLines, opt) => {
     scopeMode === 'auto' ||
     scopeMode === 'color' ||
     scopeMode === 'semantic' ||
-    (scopeMode === 'keyword' && !!(opt && typeof opt.shikiKeywordClassifier === 'function'))
+    (scopeMode === 'role' && !!(opt && typeof opt.shikiRoleClassifier === 'function'))
   const needTokenStyle = includeScopeStyles || needStyleForScopeName
-  let preResolvedKeywordLang = ''
-  if (scopeMode === 'keyword' && (!opt || typeof opt.shikiKeywordLangResolver !== 'function')) {
-    preResolvedKeywordLang = resolveShikiKeywordLangForFence(lang, opt)
+  let preResolvedRoleLang = ''
+  if (scopeMode === 'role' && (!opt || typeof opt.shikiRoleLangResolver !== 'function')) {
+    preResolvedRoleLang = resolveShikiRoleLangForFence(lang, opt)
   }
   let cursor = 0
   for (let i = 0; i < tokenLines.length; i++) {
@@ -534,7 +534,7 @@ const createRangesFromShikiTokens = (lang, tokenLines, opt) => {
       const start = hasOffset ? tok.offset : cursor
       const end = start + content.length
       const style = needTokenStyle ? getShikiTokenStyle(tok) : null
-      const scope = getShikiScopeName(tok, lang, style, opt, preResolvedKeywordLang)
+      const scope = getShikiScopeName(tok, lang, style, opt, preResolvedRoleLang)
       entries.push({ scope, start, end, style })
       cursor = end
     }
@@ -551,6 +551,7 @@ const normalizeCustomProviderRanges = (result) => {
   const entries = []
   for (const range of source.ranges) {
     let scope
+    let scopeIndex = null
     let start
     let end
     let style
@@ -567,10 +568,11 @@ const normalizeCustomProviderRanges = (result) => {
     } else {
       continue
     }
-    if (typeof scope === 'number' && scopes && scopes[scope] != null) scope = scopes[scope]
+    if (Number.isSafeInteger(scope)) scopeIndex = scope
+    if (scopeIndex != null && scopes && scopes[scopeIndex] != null) scope = scopes[scopeIndex]
     if (scope == null) continue
     if (!style && scopeStyles) {
-      if (typeof scope === 'number' && Array.isArray(scopeStyles)) style = scopeStyles[scope]
+      if (scopeIndex != null && Array.isArray(scopeStyles)) style = scopeStyles[scopeIndex]
       else style = scopeStyles[String(scope)]
     }
     entries.push({ scope: String(scope), start, end, style: normalizeScopeStyle(style) })
@@ -609,7 +611,12 @@ const buildApiPayload = (entries, text, lang, engine, scopePrefix, includeScopeS
       }
       scopeKeyToIndex.set(key, scopeIndex)
     }
-    ranges.push([scopeIndex, start, end])
+    const previousRange = ranges.length ? ranges[ranges.length - 1] : null
+    if (previousRange && previousRange[0] === scopeIndex && previousRange[2] === start) {
+      previousRange[2] = end
+    } else {
+      ranges.push([scopeIndex, start, end])
+    }
   }
   const payload = {
     v: customHighlightPayloadSchemaVersion,
@@ -629,8 +636,8 @@ const pushLineFeatureRanges = (entries, content, emphasizeLines, setEmphasizeLin
   const needsEmphasis = !!(setEmphasizeLines && emphasizeLines && emphasizeLines.length > 0)
   const needsCommentScan = !!(commentMarkValue && content.indexOf(commentMarkValue) !== -1)
   if (!needsEmphasis && !needsCommentScan) return
-  const { lines, offsets } = getLogicalLinesAndOffsets(content)
-  const maxLine = lines.length
+  const offsets = needsEmphasis ? getLogicalLineOffsets(content) : null
+  const maxLine = offsets ? offsets.length : 0
   if (needsEmphasis) {
     const normalized = normalizeEmphasisRanges(emphasizeLines, maxLine)
     for (const [s, e] of normalized) {
@@ -640,11 +647,11 @@ const pushLineFeatureRanges = (entries, content, emphasizeLines, setEmphasizeLin
     }
   }
   if (needsCommentScan) {
-    for (let i = 0; i < lines.length; i++) {
-      if (lines[i].trimStart().startsWith(commentMarkValue)) {
-        const [start, end] = offsets[i]
-        if (end > start) entries.push({ scope: commentLineClass, start, end })
-      }
+    const ranges = getCommentLineRanges(content, commentMarkValue)
+    if (!ranges) return
+    for (let i = 0; i < ranges.length; i++) {
+      const [start, end] = ranges[i]
+      entries.push({ scope: commentLineClass, start, end })
     }
   }
 }
@@ -657,8 +664,8 @@ const buildShikiTokenOption = (chOpt, targetLang, themeOverride = '') => {
 }
 
 const getApiProviderEntries = (token, lang, chOpt, md, env, override) => {
-  const context = { token, md, env, option: chOpt }
   if (chOpt.provider === 'custom') {
+    const context = { token, md, env, option: chOpt }
     const getRanges = chOpt._customGetRanges
     if (typeof getRanges !== 'function') throw new Error('customHighlight.getRanges must be a function')
     const result = getRanges(token.content, lang, context)
@@ -666,6 +673,7 @@ const getApiProviderEntries = (token, lang, chOpt, md, env, override) => {
     return normalizeCustomProviderRanges(result)
   }
   if (chOpt.provider === 'hljs') {
+    const context = { token, md, env, option: chOpt }
     const highlightFn = chOpt._hljsHighlightFn
     if (typeof highlightFn !== 'function') {
       throw new Error('customHighlight.hljsHighlight (or customHighlight.highlight / md.options.highlight) must be a function when provider=hljs')

package/src/fence/render-api-renderer.js

@@ -1,4 +1,5 @@
 import {
+  escapeHtmlAttr,
   escapeJsonForScript,
 } from '../custom-highlight/payload-utils.js'
 import {
@@ -28,7 +29,7 @@ import {
   renderFenceMarkup,
 } from './render-markup.js'
 
-const apiDisableLineFeatureList = Object.freeze(['setLineNumber', 'line-number-skip', 'line-number-set', 'lineEndSpanThreshold', 'line-notes'])
+const apiDisableLineFeatureList = Object.freeze(['setLineNumber', 'line-number-skip', 'line-number-set', 'setEmphasizeLines', 'lineEndSpanThreshold', 'comment-mark', 'line-notes'])
 
 let fallbackCustomHighlightSeq = 0
 
@@ -49,8 +50,7 @@ const buildApiPreAttrs = (preWrapValue, wrapEnabled, opt) => {
   return preAttrs
 }
 
-const renderFenceApiOrPlain = (token, lang, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberSetValue, wrapEnabled, preWrapValue, commentMarkValue, lineNotes, lineNoteIdPrefix, includePayload, timings) => {
-  const isSamp = opt._sampReg.test(lang)
+const renderFenceApiOrPlain = (token, lang, isSamp, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberSetValue, wrapEnabled, preWrapValue, commentMarkValue, lineNotes, lineNoteIdPrefix, includePayload, timings) => {
   const tag = isSamp ? 'samp' : 'code'
   let content = md.utils.escapeHtml(token.content)
   const lineStrategy = opt.customHighlight.lineFeatureStrategy
@@ -92,8 +92,9 @@ const renderFenceApiOrPlain = (token, lang, md, opt, slf, env, startNumber, emph
       env[customHighlightDataEnvKey][id] = payload
     } else {
       const payloadJson = escapeJsonForScript(payload)
-      const scriptId = `pre-highlight-data-${id}`
-      inlinePayloadScript = `<script type="application/json" id="${scriptId}" ${customHighlightPreAttr}="${id}">${payloadJson}</script>\n`
+      const scriptId = escapeHtmlAttr(`pre-highlight-data-${id}`)
+      const escapedId = escapeHtmlAttr(id)
+      inlinePayloadScript = `<script type="application/json" id="${scriptId}" ${customHighlightPreAttr}="${escapedId}">${payloadJson}</script>\n`
     }
   }
 
@@ -119,6 +120,7 @@ const getFenceHtml = (context, md, opt, slf, env) => {
   const commentMarkValue = context.commentMarkValue
   const lineNotes = context.lineNotes
   const lineNoteIdPrefix = context.lineNoteIdPrefix
+  const isSamp = context.isSamp
 
   const apiDecisionBase = {
     renderer: 'api',
@@ -130,12 +132,13 @@ const getFenceHtml = (context, md, opt, slf, env) => {
       : [],
   }
   try {
-    const html = renderFenceApiOrPlain(token, lang, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberSetValue, wrapEnabled, preWrapValue, commentMarkValue, lineNotes, lineNoteIdPrefix, true, timings)
+    const html = renderFenceApiOrPlain(token, lang, isSamp, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberSetValue, wrapEnabled, preWrapValue, commentMarkValue, lineNotes, lineNoteIdPrefix, true, timings)
     if (timingEnabled) apiDecisionBase.timings = finalizeFenceTimings(timings, fenceStartedAt)
     emitFenceDecision(opt, apiDecisionBase)
     return html
   } catch (err) {
-    if (opt.customHighlight.fallback === 'plain' && shouldApplyApiFallbackForReason(opt.customHighlight, 'provider-error')) {
+    if (!shouldApplyApiFallbackForReason(opt.customHighlight, 'provider-error')) throw err
+    if (opt.customHighlight.fallback === 'plain') {
       const fallbackDecision = {
         renderer: 'api',
         includePayload: false,
@@ -144,14 +147,27 @@ const getFenceHtml = (context, md, opt, slf, env) => {
         reason: 'provider-error',
         lineFeatureStrategy: opt.customHighlight.lineFeatureStrategy,
       }
-      const html = renderFenceApiOrPlain(token, lang, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberSetValue, wrapEnabled, preWrapValue, commentMarkValue, lineNotes, lineNoteIdPrefix, false, timings)
+      const html = renderFenceApiOrPlain(token, lang, isSamp, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberSetValue, wrapEnabled, preWrapValue, commentMarkValue, lineNotes, lineNoteIdPrefix, false, timings)
       if (timingEnabled) fallbackDecision.timings = finalizeFenceTimings(timings, fenceStartedAt)
       emitFenceDecision(opt, fallbackDecision)
       return html
     }
+    const fallbackDecision = {
+      renderer: 'api',
+      includePayload: false,
+      fallbackUsed: true,
+      fallback: 'markup',
+      reason: 'provider-error',
+      lineFeatureStrategy: opt.customHighlight.lineFeatureStrategy,
+    }
+    const markupOpt = typeof opt.onFenceDecision === 'function'
+      ? { ...opt, onFenceDecision: null }
+      : opt
+    const html = renderFenceMarkup(context, md, markupOpt, slf)
+    if (timingEnabled) fallbackDecision.timings = finalizeFenceTimings(timings, fenceStartedAt)
+    emitFenceDecision(opt, fallbackDecision)
+    return html
   }
-
-  return renderFenceMarkup(context, md, opt, slf)
 }
 
 export {

package/src/fence/render-api-runtime.js

@@ -297,6 +297,20 @@ const applyCustomHighlights = (root, options = {}) => {
             break
           }
         }
+        if (sameRefs && prevState.blockCache instanceof Map) {
+          for (const [blockId, codeEl] of blockRefs) {
+            const cached = prevState.blockCache.get(blockId)
+            const textSnapshot = typeof codeEl.textContent === 'string' ? codeEl.textContent : null
+            const boundaryRefs = getCodeBoundaryRefs(codeEl)
+            if (!cached ||
+              cached.textSnapshot !== textSnapshot ||
+              cached.firstRef !== boundaryRefs.first ||
+              cached.lastRef !== boundaryRefs.last) {
+              sameRefs = false
+              break
+            }
+          }
+        }
         if (sameRefs) {
           if (emitDiag) emitDiag({ type: 'runtime-skip', reason: 'unchanged' })
           return { appliedBlocks: 0, appliedRanges: 0, skipped: true, reason: 'unchanged' }
@@ -308,6 +322,7 @@ const applyCustomHighlights = (root, options = {}) => {
   let insertedScopeStyleMap = null
   if (!incremental) clearAppliedHighlightNames(queryRoot)
   const allScopeRanges = new Map()
+  const runtimeScopeNamesByVariant = new Map()
   let appliedBlocks = 0
   let appliedRanges = 0
   let pendingCss = ''
@@ -342,17 +357,12 @@ const applyCustomHighlights = (root, options = {}) => {
     if (payloadDigestByBlock) {
       blockPayloadDigest = payloadDigestByBlock.get(blockId)
       if (blockPayloadDigest === undefined) {
-        const prevCached = prevBlockCache ? prevBlockCache.get(blockId) : null
-        if (prevCached && prevCached.payloadRef === payload && prevCached.variantKey === activePayload.variantKey) {
-          blockPayloadDigest = prevCached.payloadDigest || ''
-        } else {
-          blockPayloadDigest = getCachedPayloadString(payload, payloadStringifyCache) + `|variant=${activePayload.variantKey || ''}`
-        }
+        blockPayloadDigest = getCachedPayloadString(payload, payloadStringifyCache) + `|variant=${activePayload.variantKey || ''}`
         payloadDigestByBlock.set(blockId, blockPayloadDigest)
       }
     }
-    const textSnapshot = typeof codeEl.textContent === 'string' ? codeEl.textContent : null
-    const boundaryRefs = getCodeBoundaryRefs(codeEl)
+    const textSnapshot = incremental && typeof codeEl.textContent === 'string' ? codeEl.textContent : null
+    const boundaryRefs = incremental ? getCodeBoundaryRefs(codeEl) : null
     const cached = prevBlockCache ? prevBlockCache.get(blockId) : null
     if (cached &&
       cached.codeEl === codeEl &&
@@ -404,6 +414,11 @@ const applyCustomHighlights = (root, options = {}) => {
     const appliedNames = new Set()
     const appliedNameList = []
     const scopeRuntimeNames = new Array(activePayload.scopes.length)
+    let runtimeScopeNameCache = runtimeScopeNamesByVariant.get(activePayload.variantKey)
+    if (!runtimeScopeNameCache) {
+      runtimeScopeNameCache = new Map()
+      runtimeScopeNamesByVariant.set(activePayload.variantKey, runtimeScopeNameCache)
+    }
     const scopeStyles = Array.isArray(activePayload.scopeStyles) ? activePayload.scopeStyles : null
     const blockScopeRanges = nextBlockCache ? new Map() : null
     const blockScopeMetaParts = nextBlockCache ? new Map() : null
@@ -448,7 +463,12 @@ const applyCustomHighlights = (root, options = {}) => {
       }
       let runtimeName = scopeRuntimeNames[scopeIdx]
       if (!runtimeName) {
-        runtimeName = getRuntimeScopeName(scopeName, activePayload.variantKey)
+        const scopeCacheKey = String(scopeName)
+        runtimeName = runtimeScopeNameCache.get(scopeCacheKey)
+        if (!runtimeName) {
+          runtimeName = getRuntimeScopeName(scopeCacheKey, activePayload.variantKey)
+          runtimeScopeNameCache.set(scopeCacheKey, runtimeName)
+        }
         scopeRuntimeNames[scopeIdx] = runtimeName
         if (scopeStyles) {
           const css = styleToHighlightCss(scopeStyles[scopeIdx])
@@ -514,7 +534,6 @@ const applyCustomHighlights = (root, options = {}) => {
     if (nextBlockCache) {
       nextBlockCache.set(blockId, {
         codeEl,
-        payloadRef: payload,
         variantKey: activePayload.variantKey || '',
         payloadDigest: blockPayloadDigest,
         textSnapshot,

package/src/fence/render-api.js

@@ -40,6 +40,9 @@ const shouldRuntimeFallback = (reason, opt = {}) => {
   return shouldApplyApiFallbackForReason(chOpt, reason)
 }
 
+const customHighlightEnvInitInstalledKey = '__rendererFenceCustomHighlightEnvInitInstalled'
+const customHighlightEnvInitOptionKey = '__rendererFenceCustomHighlightEnvInitOption'
+
 const mditRendererFenceCustomHighlight = (md, option) => {
   const opt = {
     ...createCommonFenceOptionDefaults(md),
@@ -69,7 +72,7 @@ const mditRendererFenceCustomHighlight = (md, option) => {
     opt.customHighlight._hasShikiHighlighter = !!(opt.customHighlight.highlighter && typeof opt.customHighlight.highlighter.codeToTokens === 'function')
     const tokenOptionBase = {}
     if (opt.customHighlight._singleTheme) tokenOptionBase.theme = opt.customHighlight._singleTheme
-    if (opt.customHighlight.shikiScopeMode === 'semantic' || opt.customHighlight.shikiScopeMode === 'keyword') {
+    if (opt.customHighlight.shikiScopeMode === 'semantic' || opt.customHighlight.shikiScopeMode === 'role') {
       tokenOptionBase.includeExplanation = 'scopeName'
     }
     opt.customHighlight._shikiTokenOptionBase = Object.keys(tokenOptionBase).length ? tokenOptionBase : null
@@ -78,17 +81,22 @@ const mditRendererFenceCustomHighlight = (md, option) => {
   finalizeCommonFenceOption(opt)
   installLineNotesCoreRule(md)
 
-  md.core.ruler.before('block', customHighlightEnvInitRuleName, (state) => {
-    const env = state && state.env
-    if (!env || typeof env !== 'object') return
-    if (opt.customHighlight.transport === 'env') {
-      env[customHighlightDataEnvKey] = {}
-      env[customHighlightSeqEnvKey] = 0
-      return
-    }
-    delete env[customHighlightDataEnvKey]
-    delete env[customHighlightSeqEnvKey]
-  })
+  md[customHighlightEnvInitOptionKey] = opt.customHighlight
+  if (!md[customHighlightEnvInitInstalledKey]) {
+    md[customHighlightEnvInitInstalledKey] = true
+    md.core.ruler.before('block', customHighlightEnvInitRuleName, (state) => {
+      const env = state && state.env
+      if (!env || typeof env !== 'object') return
+      const chOpt = md[customHighlightEnvInitOptionKey]
+      if (chOpt && chOpt.transport === 'env') {
+        env[customHighlightDataEnvKey] = {}
+        env[customHighlightSeqEnvKey] = 0
+        return
+      }
+      delete env[customHighlightDataEnvKey]
+      delete env[customHighlightSeqEnvKey]
+    })
+  }
 
   md.renderer.rules.fence = (tokens, idx, options, env, slf) => {
     const context = prepareFenceRenderContext(tokens, idx, opt)

package/src/fence/render-markup.js

@@ -8,6 +8,7 @@ import {
   commentLineClass,
   emitFenceDecision,
   finalizeFenceTimings,
+  getCommentLineFlags,
   getLogicalLineCount,
   getNowMs,
   normalizeEmphasisRanges,
@@ -22,7 +23,8 @@ import {
   parsePreCodeWrapper,
 } from '../utils/pre-code-wrapper-parser.js'
 
-const markupPassthroughDisabledFeatures = Object.freeze(['setLineNumber', 'line-number-skip', 'line-number-set', 'setEmphasizeLines', 'lineEndSpanThreshold', 'comment-mark', 'line-notes', 'samp'])
+const markupHighlightPreDisabledFeatures = Object.freeze(['setLineNumber', 'line-number-skip', 'line-number-set', 'setEmphasizeLines', 'lineEndSpanThreshold', 'comment-mark', 'line-notes', 'samp'])
+const markupPassthroughDisabledFeatures = Object.freeze([...markupHighlightPreDisabledFeatures, 'wrap', 'setPreWrapStyle'])
 
 const renderFenceMarkup = (context, md, opt, slf) => {
   const token = context.token
@@ -40,7 +42,7 @@ const renderFenceMarkup = (context, md, opt, slf) => {
   const lineNotes = context.lineNotes
   const lineNoteIdPrefix = context.lineNoteIdPrefix
 
-  const isSamp = opt._sampReg.test(lang)
+  const isSamp = context.isSamp
   const sourceContent = token.content
   let content = sourceContent
   let commentLines
@@ -113,41 +115,48 @@ const renderFenceMarkup = (context, md, opt, slf) => {
 
   const useHighlightPre = opt.useHighlightPre && hasHighlightPre
   const needLineNumber = !useHighlightPre && opt.setLineNumber && startNumber >= 0
+  const wantsEmphasis = !useHighlightPre && opt.setEmphasizeLines && emphasizeLines.length > 0
+  const wantsAdvancedLineNumbers = needLineNumber && (lineNumberSkipValue !== undefined || lineNumberSetValue !== undefined)
+  const wantsLineNotes = !useHighlightPre && !!(lineNotes && lineNotes.length)
+  const hasCommentCandidate = !!(
+    !useHighlightPre &&
+    commentMarkValue &&
+    sourceContent.indexOf(commentMarkValue) !== -1
+  )
+  const needsMappedLineCounts = wantsAdvancedLineNumbers || wantsLineNotes || hasCommentCandidate
   let sourceLogicalLineCount = -1
   let highlightedLogicalLineCount = -1
-  const ensureLogicalLineCounts = () => {
-    if (sourceLogicalLineCount === -1) sourceLogicalLineCount = getLogicalLineCount(sourceContent)
-    if (highlightedLogicalLineCount === -1) highlightedLogicalLineCount = getLogicalLineCount(content)
-  }
+  if (wantsEmphasis || needsMappedLineCounts) highlightedLogicalLineCount = getLogicalLineCount(content)
+  if (needsMappedLineCounts) sourceLogicalLineCount = getLogicalLineCount(sourceContent)
+  const highlightedHasTrailingBreak = content.endsWith('\n') || content.endsWith('\r')
+  const needsLastLineWrapCheck = !highlightedHasTrailingBreak && (needLineNumber || wantsEmphasis || wantsLineNotes)
+  if (needsLastLineWrapCheck && highlightedLogicalLineCount < 0) highlightedLogicalLineCount = getLogicalLineCount(content)
+  if (needsLastLineWrapCheck && sourceLogicalLineCount < 0) sourceLogicalLineCount = getLogicalLineCount(sourceContent)
+  const wrapLastLine = !!(
+    needsLastLineWrapCheck &&
+    highlightedLogicalLineCount > 0 &&
+    highlightedLogicalLineCount === sourceLogicalLineCount
+  )
+
   let normalizedEmphasis = []
-  if (!useHighlightPre && opt.setEmphasizeLines && emphasizeLines.length > 0) {
-    ensureLogicalLineCounts()
+  if (wantsEmphasis) {
     normalizedEmphasis = normalizeEmphasisRanges(emphasizeLines, highlightedLogicalLineCount)
   }
   let lineNumberPlan = null
-  if (needLineNumber && (lineNumberSkipValue !== undefined || lineNumberSetValue !== undefined)) {
-    ensureLogicalLineCounts()
+  if (wantsAdvancedLineNumbers) {
     lineNumberPlan = resolveAdvancedLineNumberPlan(lineNumberSkipValue, lineNumberSetValue, sourceLogicalLineCount, highlightedLogicalLineCount)
   }
   let lineNotePlan = null
-  if (!useHighlightPre && lineNotes && lineNotes.length) {
-    ensureLogicalLineCounts()
+  if (wantsLineNotes) {
     lineNotePlan = resolveLineNotesPlan(lineNotes, sourceLogicalLineCount, highlightedLogicalLineCount, lineNoteIdPrefix)
   }
   const needEmphasis = normalizedEmphasis.length > 0
   const needEndSpan = opt.lineEndSpanThreshold > 0
 
-  if (!useHighlightPre && commentMarkValue && sourceContent.indexOf(commentMarkValue) !== -1) {
-    ensureLogicalLineCounts()
+  if (hasCommentCandidate) {
     if (highlightedLogicalLineCount === sourceLogicalLineCount) {
-      const rawLines = sourceContent.split('\n')
-      for (let i = 0; i < rawLines.length; i++) {
-        if (rawLines[i].trimStart().startsWith(commentMarkValue)) {
-          if (!commentLines) commentLines = []
-          commentLines[i] = true
-          needComment = true
-        }
-      }
+      commentLines = getCommentLineFlags(sourceContent, commentMarkValue)
+      needComment = !!commentLines
     }
   }
 
@@ -168,16 +177,17 @@ const renderFenceMarkup = (context, md, opt, slf) => {
       commentLineClass,
       lineNumberPlan,
       lineNotePlan,
+      wrapLastLine,
     )
     if (timingEnabled) addTimingMs(timings, 'lineSplitMs', getNowMs() - splitStartedAt)
   }
 
-  const tag = isSamp ? 'samp' : 'code'
+  const tag = useHighlightPre ? 'code' : (isSamp ? 'samp' : 'code')
   const decision = {
     renderer: 'markup',
     useHighlightPre,
     hasHighlightPre,
-    disabledFeatures: useHighlightPre ? markupPassthroughDisabledFeatures : [],
+    disabledFeatures: useHighlightPre ? markupHighlightPreDisabledFeatures : [],
   }
   if (timingEnabled) decision.timings = finalizeFenceTimings(timings, fenceStartedAt)
   emitFenceDecision(opt, decision)