diff --git a/app/src/protyle/render/highlightRender.ts b/app/src/protyle/render/highlightRender.ts
index dfd3ba675..224ebdadf 100644
--- a/app/src/protyle/render/highlightRender.ts
+++ b/app/src/protyle/render/highlightRender.ts
@@ -128,7 +128,6 @@ export const lineNumberRender = (block: HTMLElement, zoom = 1) => {
block.parentElement.style.lineHeight = `${((parseInt(block.parentElement.style.fontSize) || window.siyuan.config.editor.fontSize) * 1.625 * 0.85).toFixed(0)}px`;
const codeElement = block.lastElementChild as HTMLElement;
- let lineNumberHTML = "";
const lineList = codeElement.textContent.split(/\r\n|\r|\n|\u2028|\u2029/g);
if (lineList[lineList.length - 1] === "" && lineList.length > 1) {
lineList.pop();
@@ -136,32 +135,34 @@ export const lineNumberRender = (block: HTMLElement, zoom = 1) => {
block.firstElementChild.innerHTML = `${lineList.length}`;
codeElement.style.paddingLeft = `${block.firstElementChild.clientWidth + 16}px`;
+ const codeElementStyle = window.getComputedStyle(codeElement);
const lineNumberTemp = document.createElement("div");
lineNumberTemp.className = "hljs";
// 不能使用 codeElement.clientWidth,被忽略小数点导致宽度不一致
lineNumberTemp.setAttribute("style", `padding-left:${codeElement.style.paddingLeft};
width: ${codeElement.getBoundingClientRect().width / zoom}px;
-white-space:${codeElement.style.whiteSpace};
-word-break:${codeElement.style.wordBreak};
-font-variant-ligatures:${codeElement.style.fontVariantLigatures};
+white-space:${codeElementStyle.whiteSpace};
+word-break:${codeElementStyle.wordBreak};
+font-variant-ligatures:${codeElementStyle.fontVariantLigatures};
padding-right:0;max-height: none;box-sizing: border-box;position: absolute;padding-top:0 !important;padding-bottom:0 !important;min-height:auto !important;`);
lineNumberTemp.setAttribute("contenteditable", "true");
block.insertAdjacentElement("afterend", lineNumberTemp);
- const isWrap = codeElement.style.wordBreak === "break-word";
- lineList.map((line) => {
- let lineHeight = "";
- if (isWrap) {
+ let lineNumberHTML = "";
+ if (codeElement.style.wordBreak === "break-word") {
+ // 代码块开启了换行
+ lineList.map((line) => {
// windows 下空格高度为 0 https://github.com/siyuan-note/siyuan/issues/12346
lineNumberTemp.textContent = line.trim() ? line : "
";
// 不能使用 lineNumberTemp.getBoundingClientRect().height.toFixed(1) 否则
// windows 需等待字体下载完成再计算,否则导致不换行,高度计算错误
// https://github.com/siyuan-note/siyuan/issues/9029
// https://github.com/siyuan-note/siyuan/issues/9140
- lineHeight = ` style="height:${lineNumberTemp.clientHeight}px;"`;
- }
- lineNumberHTML += ``;
- });
+ lineNumberHTML += ``;
+ });
+ } else {
+ lineNumberHTML = "".repeat(lineList.length);
+ }
lineNumberTemp.remove();
block.firstElementChild.innerHTML = lineNumberHTML;