@fresh-editor/fresh-editor 0.2.23 → 0.2.24

package/plugins/markdown_compose.ts

@@ -37,6 +37,11 @@ function setGlobalComposeEnabled(value: boolean): void {
 interface TableWidthInfo {
   maxW: number[];
   allocated: number[];
+  // True iff this row is the markdown source separator (`|---|---|---|`) — the
+  // border code uses this to avoid drawing a duplicate `├─┼─┤` next to it.
+  // Optional for backwards-compat with persisted view states from older
+  // sessions.
+  isSourceSep?: boolean;
 }
 
 // Helper: check whether the active split has compose mode for this buffer
@@ -90,6 +95,161 @@ const HTML_ENTITY_MAP: Record<string, string> = {
   laquo: "\u00AB", raquo: "\u00BB", ensp: "\u2002", emsp: "\u2003", thinsp: "\u2009",
 };
 
+// =============================================================================
+// Table border virtual lines (top/bottom + inter-row separators)
+// =============================================================================
+//
+// Markdown tables source-encode only an underline-style separator between the
+// header and the first data row.  In compose mode we already conceal the
+// pipe characters into Unicode box-drawing (`│`, `├`, `┼`, `┤`).  This module
+// adds the *missing* visual frame: a `┌─┬─┐` top border above the header,
+// `├─┼─┤` separators between consecutive data rows (so each row reads as a
+// distinct cell), and a `└─┴─┘` bottom border below the last row.
+//
+// Implementation:
+//
+//   * Borders are virtual lines (no source bytes), keyed per-line via a
+//     unique namespace `md-tb-${lineNumber}`.  The namespace lets us
+//     clear+rebuild borders for one row without disturbing other tables.
+//   * "First/last/source-separator" classification is derived from the
+//     cached widthMap (a row is "known" iff it has a TableWidthInfo entry).
+//     This is cheap and stable across scrolls because widthMap accumulates.
+//   * Border column widths come from the same `allocated` widths used by
+//     processLineConceals, so the borders line up exactly with the cell
+//     conceals.
+
+/** Build a horizontal table border line of the given style for a row. */
+function buildTableBorderLine(
+  allocated: number[],
+  left: string,
+  mid: string,
+  right: string,
+): string {
+  // Each cell render is `│ <text padded to allocated[i] - 2> │` (2 chars of
+  // inside padding).  The matching border slot must therefore be
+  // `allocated[i]` wide of `─` characters between the corner/junction marks.
+  const parts: string[] = [];
+  for (let i = 0; i < allocated.length; i++) {
+    const fill = "─".repeat(Math.max(1, allocated[i]));
+    parts.push(fill);
+  }
+  return left + parts.join(mid) + right;
+}
+
+/** True if `lineContent` looks like a markdown table separator row. */
+function isTableSeparatorContent(lineContent: string): boolean {
+  return /^\|[-:\s|]+\|$/.test(lineContent.trim());
+}
+
+/** Re-emit the table border virtual lines for the given table-row group.
+ *
+ * Detects the group's first/last visible rows by consulting `widthMap`
+ * (which is updated by `processTableAlignment` before this runs).  A row at
+ * `lineNumber - 1` or `lineNumber + 1` that is *not* in `widthMap` is treated
+ * as the boundary of the table's visible extent.
+ */
+function processTableBorders(
+  bufferId: number,
+  lines: Array<{
+    line_number: number;
+    byte_start: number;
+    byte_end: number;
+    content: string;
+  }>,
+  widthMap: Map<number, TableWidthInfo>,
+): void {
+  // Use theme keys (resolved at render time so the borders follow theme
+  // changes — same pattern as addOverlay's fg/bg options).
+  //
+  //   * fg → editor.fg (the default document foreground, matching the
+  //     concealed `│` / `─` glyphs inside row text so the virtual
+  //     `┌─┬─┐` / `├─┼─┤` / `└─┴─┘` frame doesn't create a visible seam
+  //     where it meets the in-text borders)
+  //   * bg → editor.bg (matches the document background so the borders
+  //     blend in rather than carving an opaque slab through the page)
+  const borderOptions = { fg: "editor.fg", bg: "editor.bg" };
+
+  for (const line of lines) {
+    const ns = `md-tb-${line.line_number}`;
+    // Always start by clearing this row's previous borders (handles
+    // edits that removed/widened the row, scrolls that change the
+    // first/last classification, etc.).
+    editor.clearVirtualTextNamespace(bufferId, ns);
+
+    const trimmed = line.content.trim();
+    const isTableRow = trimmed.startsWith("|") || trimmed.endsWith("|");
+    if (!isTableRow) continue;
+
+    const widthInfo = widthMap.get(line.line_number);
+    if (!widthInfo || widthInfo.allocated.length === 0) continue;
+
+    const allocated = widthInfo.allocated;
+    // Prefer the cached flag (set by processTableAlignment from the source
+    // text of this exact row); fall back to a regex check in case this row
+    // was loaded from a persisted view state without the flag.
+    const isSourceSep = widthInfo.isSourceSep === true
+      || isTableSeparatorContent(line.content);
+
+    const prevIsTable = widthMap.has(line.line_number - 1);
+    const nextIsTable = widthMap.has(line.line_number + 1);
+
+    // Top border: only above the very first known row of the table.
+    // ┌─┬─┐ — opens the frame above the header.
+    if (!prevIsTable) {
+      editor.addVirtualLine(
+        bufferId,
+        line.byte_start,
+        buildTableBorderLine(allocated, "┌", "┬", "┐"),
+        borderOptions,
+        true, // above
+        ns,
+        0,
+      );
+    }
+
+    // Inter-row separator: between consecutive *data* rows.
+    //
+    // Skip if either side is the source separator row (`|---|---|---|`)
+    // because the source already provides `├─┼─┤` there via conceals —
+    // adding another above/below would draw two adjacent separator lines.
+    //
+    // Drawn ABOVE the current row when its predecessor is also a (non-
+    // source-separator) table row, so each row owns the separator that
+    // appears above it.
+    const prevInfo = widthMap.get(line.line_number - 1);
+    const prevIsSourceSep = prevInfo?.isSourceSep === true;
+    if (prevIsTable && !isSourceSep && !prevIsSourceSep) {
+      editor.addVirtualLine(
+        bufferId,
+        line.byte_start,
+        buildTableBorderLine(allocated, "├", "┼", "┤"),
+        borderOptions,
+        true, // above
+        ns,
+        1,
+      );
+    }
+
+    // Bottom border: only below the last known row of the table.
+    // └─┴─┘ — closes the frame.  Anchor at the END of the row's bytes
+    // (one before the trailing newline) and place "below".
+    if (!nextIsTable) {
+      // byte_end points just past the newline; anchor at last byte of
+      // the row content so the virtual line renders directly under it.
+      const anchor = Math.max(line.byte_start, line.byte_end - 1);
+      editor.addVirtualLine(
+        bufferId,
+        anchor,
+        buildTableBorderLine(allocated, "└", "┴", "┘"),
+        borderOptions,
+        false, // below
+        ns,
+        0,
+      );
+    }
+  }
+}
+
 // =============================================================================
 // Block-based parser for hanging indent support
 // =============================================================================
@@ -1375,18 +1535,25 @@ function processTableAlignment(
       if (allocGrew(widthMap.get(ln)!)) { needsRefresh = true; break; }
     }
 
-    // Store merged widths for all lines in the group AND propagate
-    // back to adjacent cached lines so they pick up wider columns
-    // without needing to be re-delivered by lines_changed.
-    const info: TableWidthInfo = { maxW: merged, allocated };
+    // Store merged widths for each line in the group.  We tag the source
+    // separator row (`|---|---|---|`) so the border renderer can skip
+    // drawing a duplicate `├─┼─┤` adjacent to it (the source separator is
+    // already concealed into one).  Each line gets its own info object so
+    // the per-row `isSourceSep` flag is independent.
     for (const line of group) {
-      widthMap.set(line.line_number, info);
+      const isSep = /^\|[-:\s|]+\|$/.test(line.content.trim());
+      widthMap.set(line.line_number, { maxW: merged, allocated, isSourceSep: isSep });
     }
+    // Adjacent cached lines (already-processed neighbours of this group)
+    // need their `allocated` updated but should keep their existing
+    // `isSourceSep` flag — they were classified when they were processed.
     for (let ln = firstLine - 1; widthMap.has(ln); ln--) {
-      widthMap.set(ln, info);
+      const prev = widthMap.get(ln)!;
+      widthMap.set(ln, { maxW: merged, allocated, isSourceSep: prev.isSourceSep });
     }
     for (let ln = lastLine + 1; widthMap.has(ln); ln++) {
-      widthMap.set(ln, info);
+      const prev = widthMap.get(ln)!;
+      widthMap.set(ln, { maxW: merged, allocated, isSourceSep: prev.isSourceSep });
     }
   }
 
@@ -1426,6 +1593,15 @@ function onMarkdownLinesChanged(data: {
     processLineSoftBreaks(data.buffer_id, line.content, line.byte_start, line.byte_end, cursors, line.line_number);
   }
 
+  // Add/refresh table border virtual lines (top/bottom + inter-row separators).
+  // Runs AFTER processTableAlignment so the widthMap reflects the latest
+  // allocated widths, and AFTER processLineConceals so the borders we draw
+  // line up with the cell pipes the conceals produce.
+  const widthMapForBorders = getTableWidths(data.buffer_id);
+  if (widthMapForBorders) {
+    processTableBorders(data.buffer_id, data.lines, widthMapForBorders);
+  }
+
   if (tableWidthsGrew) {
     editor.refreshLines(data.buffer_id);
   }

package/plugins/search_replace.i18n.json

@@ -36,7 +36,9 @@
     "panel.replace_all_btn": "Replace All (Alt+Ret)",
     "panel.type_pattern": "Type a search pattern above",
     "panel.matches_count": "Matches (%{count} in %{files} files)",
-    "panel.matches_title": "Matches"
+    "panel.matches_title": "Matches",
+    "prompt.confirm_replace": "Replace %{count} match(es) in %{files} file(s)? Undo only covers files still open in this session. Press Enter to confirm, Esc to cancel.",
+    "status.replace_cancelled": "Replacement cancelled"
   },
   "cs": {
     "cmd.search_replace": "Hledat a nahradit v projektu",
@@ -75,7 +77,9 @@
     "panel.replace_all_btn": "Nahradit vše (Alt+Ret)",
     "panel.type_pattern": "Zadejte vyhledávací vzor",
     "panel.matches_count": "Shody (%{count} v %{files} souborech)",
-    "panel.matches_title": "Shody"
+    "panel.matches_title": "Shody",
+    "prompt.confirm_replace": "Nahradit %{count} výskyt(ů) v %{files} souboru(ech)? Vrátit zpět lze jen soubory otevřené v této relaci. Enter potvrdí, Esc zruší.",
+    "status.replace_cancelled": "Nahrazení zrušeno"
   },
   "de": {
     "cmd.search_replace": "Suchen und Ersetzen im Projekt",
@@ -114,7 +118,9 @@
     "panel.replace_all_btn": "Alle ersetzen (Alt+Ret)",
     "panel.type_pattern": "Suchmuster oben eingeben",
     "panel.matches_count": "Treffer (%{count} in %{files} Dateien)",
-    "panel.matches_title": "Treffer"
+    "panel.matches_title": "Treffer",
+    "prompt.confirm_replace": "%{count} Treffer in %{files} Datei(en) ersetzen? Rückgängig wirkt nur auf Dateien, die in dieser Sitzung geöffnet sind. Enter bestätigt, Esc bricht ab.",
+    "status.replace_cancelled": "Ersetzen abgebrochen"
   },
   "es": {
     "cmd.search_replace": "Buscar y Reemplazar en Proyecto",
@@ -153,7 +159,9 @@
     "panel.replace_all_btn": "Reemplazar todo (Alt+Ret)",
     "panel.type_pattern": "Escriba un patrón de búsqueda",
     "panel.matches_count": "Coincidencias (%{count} en %{files} archivos)",
-    "panel.matches_title": "Coincidencias"
+    "panel.matches_title": "Coincidencias",
+    "prompt.confirm_replace": "¿Reemplazar %{count} coincidencia(s) en %{files} archivo(s)? Deshacer solo cubre los archivos abiertos en esta sesión. Intro confirma, Esc cancela.",
+    "status.replace_cancelled": "Reemplazo cancelado"
   },
   "fr": {
     "cmd.search_replace": "Rechercher et Remplacer dans le Projet",
@@ -192,7 +200,9 @@
     "panel.replace_all_btn": "Tout remplacer (Alt+Ret)",
     "panel.type_pattern": "Saisissez un motif de recherche",
     "panel.matches_count": "Correspondances (%{count} dans %{files} fichiers)",
-    "panel.matches_title": "Correspondances"
+    "panel.matches_title": "Correspondances",
+    "prompt.confirm_replace": "Remplacer %{count} correspondance(s) dans %{files} fichier(s) ? L'annulation ne concerne que les fichiers ouverts dans cette session. Entrée confirme, Échap annule.",
+    "status.replace_cancelled": "Remplacement annulé"
   },
   "it": {
     "cmd.search_replace": "Cerca e sostituisci nel progetto",
@@ -231,7 +241,9 @@
     "panel.replace_all_btn": "Sostituisci tutto (Alt+Ret)",
     "panel.type_pattern": "Digita un modello di ricerca",
     "panel.matches_count": "Corrispondenze (%{count} in %{files} file)",
-    "panel.matches_title": "Corrispondenze"
+    "panel.matches_title": "Corrispondenze",
+    "prompt.confirm_replace": "Sostituire %{count} corrispondenza/e in %{files} file? L'annulla copre solo i file aperti in questa sessione. Invio conferma, Esc annulla.",
+    "status.replace_cancelled": "Sostituzione annullata"
   },
   "ja": {
     "cmd.search_replace": "プロジェクト内で検索と置換",
@@ -270,7 +282,9 @@
     "panel.replace_all_btn": "すべて置換 (Alt+Ret)",
     "panel.type_pattern": "検索パターンを入力してください",
     "panel.matches_count": "一致 (%{files}ファイル中%{count}件)",
-    "panel.matches_title": "一致"
+    "panel.matches_title": "一致",
+    "prompt.confirm_replace": "%{files} 個のファイルで %{count} 件の一致を置換しますか？元に戻せるのはこのセッションで開いているファイルのみです。Enterで確認、Escでキャンセル。",
+    "status.replace_cancelled": "置換がキャンセルされました"
   },
   "ko": {
     "cmd.search_replace": "프로젝트에서 검색 및 바꾸기",
@@ -309,7 +323,9 @@
     "panel.replace_all_btn": "모두 바꾸기 (Alt+Ret)",
     "panel.type_pattern": "검색 패턴을 입력하세요",
     "panel.matches_count": "일치 (%{files}개 파일에서 %{count}개)",
-    "panel.matches_title": "일치"
+    "panel.matches_title": "일치",
+    "prompt.confirm_replace": "%{files}개 파일에서 %{count}개 일치를 바꾸시겠습니까? 실행 취소는 이 세션에서 열려 있는 파일에만 적용됩니다. Enter 확인, Esc 취소.",
+    "status.replace_cancelled": "바꾸기가 취소됨"
   },
   "pt-BR": {
     "cmd.search_replace": "Pesquisar e Substituir no Projeto",
@@ -348,7 +364,9 @@
     "panel.replace_all_btn": "Substituir tudo (Alt+Ret)",
     "panel.type_pattern": "Digite um padrão de pesquisa",
     "panel.matches_count": "Correspondências (%{count} em %{files} arquivos)",
-    "panel.matches_title": "Correspondências"
+    "panel.matches_title": "Correspondências",
+    "prompt.confirm_replace": "Substituir %{count} ocorrência(s) em %{files} arquivo(s)? Desfazer só cobre arquivos abertos nesta sessão. Enter confirma, Esc cancela.",
+    "status.replace_cancelled": "Substituição cancelada"
   },
   "ru": {
     "cmd.search_replace": "Поиск и замена в проекте",
@@ -387,7 +405,9 @@
     "panel.replace_all_btn": "Заменить все (Alt+Ret)",
     "panel.type_pattern": "Введите шаблон поиска",
     "panel.matches_count": "Совпадения (%{count} в %{files} файлах)",
-    "panel.matches_title": "Совпадения"
+    "panel.matches_title": "Совпадения",
+    "prompt.confirm_replace": "Заменить %{count} совпадений в %{files} файлах? Отмена применяется только к файлам, открытым в этом сеансе. Enter — подтвердить, Esc — отменить.",
+    "status.replace_cancelled": "Замена отменена"
   },
   "th": {
     "cmd.search_replace": "ค้นหาและแทนที่ในโปรเจกต์",
@@ -426,7 +446,9 @@
     "panel.replace_all_btn": "แทนที่ทั้งหมด (Alt+Ret)",
     "panel.type_pattern": "พิมพ์รูปแบบการค้นหา",
     "panel.matches_count": "รายการที่ตรงกัน (%{count} ใน %{files} ไฟล์)",
-    "panel.matches_title": "รายการที่ตรงกัน"
+    "panel.matches_title": "รายการที่ตรงกัน",
+    "prompt.confirm_replace": "แทนที่ %{count} รายการใน %{files} ไฟล์? เลิกทำครอบคลุมเฉพาะไฟล์ที่เปิดอยู่ในเซสชันนี้เท่านั้น กด Enter เพื่อยืนยัน, Esc เพื่อยกเลิก",
+    "status.replace_cancelled": "ยกเลิกการแทนที่"
   },
   "uk": {
     "cmd.search_replace": "Пошук та заміна в проекті",
@@ -465,7 +487,9 @@
     "panel.replace_all_btn": "Замінити все (Alt+Ret)",
     "panel.type_pattern": "Введіть шаблон пошуку",
     "panel.matches_count": "Збіги (%{count} у %{files} файлах)",
-    "panel.matches_title": "Збіги"
+    "panel.matches_title": "Збіги",
+    "prompt.confirm_replace": "Замінити %{count} збіг(ів) у %{files} файл(ах)? Скасування охоплює лише файли, відкриті в цьому сеансі. Enter — підтвердити, Esc — скасувати.",
+    "status.replace_cancelled": "Заміну скасовано"
   },
   "vi": {
     "cmd.search_replace": "Tìm và Thay thế trong Dự án",
@@ -504,7 +528,9 @@
     "panel.replace_all_btn": "Thay thế tất cả (Alt+Ret)",
     "panel.type_pattern": "Nhập mẫu tìm kiếm",
     "panel.matches_count": "Kết quả (%{count} trong %{files} tệp)",
-    "panel.matches_title": "Kết quả"
+    "panel.matches_title": "Kết quả",
+    "prompt.confirm_replace": "Thay thế %{count} kết quả trong %{files} tệp? Hoàn tác chỉ áp dụng cho các tệp đang mở trong phiên này. Enter để xác nhận, Esc để hủy.",
+    "status.replace_cancelled": "Đã hủy thay thế"
   },
   "zh-CN": {
     "cmd.search_replace": "在项目中搜索和替换",
@@ -543,6 +569,8 @@
     "panel.replace_all_btn": "全部替换 (Alt+Ret)",
     "panel.type_pattern": "请输入搜索模式",
     "panel.matches_count": "匹配 (%{files} 个文件中 %{count} 个)",
-    "panel.matches_title": "匹配"
+    "panel.matches_title": "匹配",
+    "prompt.confirm_replace": "在 %{files} 个文件中替换 %{count} 处匹配？撤销仅适用于本次会话中打开的文件。按 Enter 确认，Esc 取消。",
+    "status.replace_cancelled": "替换已取消"
   }
 }