Skip to content

Commit 15e7345

Browse files
fix(core): correct offset calculation in mergeWhitespaceTokens (#1162)
1 parent 355d207 commit 15e7345

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

packages/core/src/highlight/code-to-hast.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,15 @@ function mergeWhitespaceTokens(tokens: ThemedToken[][]): ThemedToken[][] {
287287
return tokens.map((line) => {
288288
const newLine: ThemedToken[] = []
289289
let carryOnContent = ''
290-
let firstOffset = 0
290+
let firstOffset: number | undefined
291291
line.forEach((token, idx) => {
292292
const isDecorated = token.fontStyle && (
293293
(token.fontStyle & FontStyle.Underline)
294294
|| (token.fontStyle & FontStyle.Strikethrough)
295295
)
296296
const couldMerge = !isDecorated
297297
if (couldMerge && token.content.match(/^\s+$/) && line[idx + 1]) {
298-
if (!firstOffset)
298+
if (firstOffset === undefined)
299299
firstOffset = token.offset
300300
carryOnContent += token.content
301301
}
@@ -304,20 +304,20 @@ function mergeWhitespaceTokens(tokens: ThemedToken[][]): ThemedToken[][] {
304304
if (couldMerge) {
305305
newLine.push({
306306
...token,
307-
offset: firstOffset,
307+
offset: firstOffset!,
308308
content: carryOnContent + token.content,
309309
})
310310
}
311311
else {
312312
newLine.push(
313313
{
314314
content: carryOnContent,
315-
offset: firstOffset,
315+
offset: firstOffset!,
316316
},
317317
token,
318318
)
319319
}
320-
firstOffset = 0
320+
firstOffset = undefined
321321
carryOnContent = ''
322322
}
323323
else {

0 commit comments

Comments
 (0)