yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Line numbers go missing when editing multiple blocks

Browse Source 
closes #4440
This commit is contained in:
Tom Moor
2022-12-18 22:19:37 -05:00
parent 67ec5a1a33
commit 0fa583e492
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
shared/editor/plugins/Prism.ts
View File

@@ -93,11 +93,13 @@ function getDecorations({
return; return;
} }
const lineDecorations = [];
if (!cache[block.pos] || !cache[block.pos].node.eq(block.node)) { if (!cache[block.pos] || !cache[block.pos].node.eq(block.node)) {
if (lineNumbers) { if (lineNumbers) {
const lineCount = const lineCount =
(block.node.textContent.match(/\n/g) || []).length + 1; (block.node.textContent.match(/\n/g) || []).length + 1;
decorations.push( lineDecorations.push(
Decoration.widget(block.pos + 1, () => { Decoration.widget(block.pos + 1, () => {
const el = document.createElement("div"); const el = document.createElement("div");
el.innerText = new Array(lineCount) el.innerText = new Array(lineCount)
@@ -108,7 +110,7 @@ function getDecorations({
return el; return el;
}) })
); );
decorations.push( lineDecorations.push(
Decoration.node(block.pos, block.pos + block.node.nodeSize, { Decoration.node(block.pos, block.pos + block.node.nodeSize, {
style: `--line-number-gutter-width: ${String(lineCount).length}`, style: `--line-number-gutter-width: ${String(lineCount).length}`,
}) })
@@ -116,7 +118,7 @@ function getDecorations({
} }
const nodes = refractor.highlight(block.node.textContent, language); const nodes = refractor.highlight(block.node.textContent, language);
const _decorations = flattenDeep(parseNodes(nodes)) const newDecorations = flattenDeep(parseNodes(nodes))
.map((node: ParsedNode) => { .map((node: ParsedNode) => {
const from = startPos; const from = startPos;
const to = from + node.text.length; const to = from + node.text.length;
@@ -134,13 +136,15 @@ function getDecorations({
Decoration.inline(node.from, node.to, { Decoration.inline(node.from, node.to, {
class: node.classes.join(" "), class: node.classes.join(" "),
}) })
); )
.concat(lineDecorations);
cache[block.pos] = { cache[block.pos] = {
node: block.node, node: block.node,
decorations: _decorations, decorations: newDecorations,
}; };
} }
cache[block.pos].decorations.forEach((decoration) => { cache[block.pos].decorations.forEach((decoration) => {
decorations.push(decoration); decorations.push(decoration);
}); });