@fresh-editor/fresh-editor 0.3.8 → 0.3.10

package/plugins/schemas/theme.schema.json

@@ -221,6 +221,7 @@
           30,
           30
         ],
+        "suggestion_fg": null,
         "suggestion_selected_bg": [
           58,
           79,
@@ -691,7 +692,7 @@
       }
     },
     "UiColors": {
-      "description": "UI element colors (tabs, menus, status bar, etc.)",
+      "description": "UI element colors (tabs, menus, status bar, etc.)\n\nNaming convention: every `*_bg` key that has text drawn on top of\nit MUST have a matching `*_fg` key, and renderers must pair them\n(never borrow a foreground from an unrelated surface — doing so is\nhow text ends up invisible when a theme's borrowed fg matches the\nreal bg). `popup_text_fg` is the foreground for `popup_bg` (kept\nunder its historical name with a `popup_fg` serde alias).\n\n`*_bg` keys WITHOUT a matching `*_fg` are intentional — they don't\ndraw their own text and inherit the surrounding foreground:\n  - lines / borders / separators: `tab_separator_bg`,\n    `popup_border_fg`, `menu_border_fg`, `menu_separator_fg`,\n    `split_separator_fg`, `scrollbar_*`, `tab_drop_zone_border`\n  - selection / hover / highlight tints layered over a surface that\n    keeps its base fg: `*_selection_bg`, `*_hover_bg`,\n    `suggestion_selected_bg`, `text_input_selection_bg`,\n    `semantic_highlight_bg`, `compose_margin_bg`, `inline_code_bg`",
       "type": "object",
       "properties": {
         "tab_active_fg": {
@@ -1011,7 +1012,7 @@
           ]
         },
         "popup_text_fg": {
-          "description": "Popup window text color",
+          "description": "Popup window text color. Per the `*_bg`/`*_fg` convention this\nis the foreground for `popup_bg`; `popup_fg` is accepted as an\nalias so theme JSON can use the convention-consistent name.",
           "$ref": "#/$defs/ColorDef",
           "default": "White"
         },
@@ -1024,6 +1025,18 @@
             30
           ]
         },
+        "suggestion_fg": {
+          "description": "Text color for content drawn on `suggestion_bg` (autocomplete\nitems, the overlay-prompt title/input field). Falls back to\n`popup_text_fg` so existing themes need no change.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/ColorDef"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
         "suggestion_selected_bg": {
           "description": "Selected suggestion background",
           "$ref": "#/$defs/ColorDef",

package/plugins/search_replace.ts

@@ -68,16 +68,19 @@ interface PanelState {
   caseSensitive: boolean;
   useRegex: boolean;
   wholeWords: boolean;
-  // Scope (§1): when false, results are restricted to `sourceBufferPath`.
+  // Scope (§1): when false, results are restricted to the source buffer.
   // `sourceBufferPath` is the absolute path of the buffer that was
   // active when the panel opened; `sourceBufferRelPath` is the
-  // cwd-relative display form. Empty path means the source buffer was
-  // unsaved/virtual; in that case the "current file" mode degrades to
-  // "no matches" and the toggle visually still flips, but the user
-  // can't usefully restrict to an unnamed buffer.
+  // cwd-relative display form. An empty path means the source buffer is
+  // unnamed/unsaved — in that case scope filtering falls back to
+  // `sourceBufferId`, and the host searches that buffer's in-memory
+  // content directly (it has no on-disk file the project walk can find).
   allFiles: boolean;
   sourceBufferPath: string;
   sourceBufferRelPath: string;
+  // Buffer id of the source buffer, used to scope/replace unnamed buffers
+  // by id when there's no path to match on. 0 means "unknown".
+  sourceBufferId: number;
   // Layout
   viewportWidth: number;
   // State
@@ -918,12 +921,16 @@ function updatePanelContent(): void {
   //                                       trailing match-count stats.
   //   * `Row{ Toggle, Toggle, Toggle, Spacer, Button }`
   //                                       — case/regex/whole + Replace All.
+  //   * `HintBar{ ... }`                  — keyboard-hint row, sits
+  //                                       directly above the matches
+  //                                       section.
   //   * `Raw{ separator entry }`         — matches divider.
   //   * `List{ ... }` or `Raw{empty msg}` — virtual-scrolled match
   //                                       rows (host owns scroll +
   //                                       selection styling +
-  //                                       click routing).
-  //   * `HintBar{ ... }`                  — keyboard-hint footer.
+  //                                       click routing). Last child
+  //                                       so the match list is the
+  //                                       final thing in the buffer.
   if (!panel.widgetPanel) {
     panel.widgetPanel = new WidgetPanel(panel.resultsBufferId);
   }
@@ -932,9 +939,9 @@ function updatePanelContent(): void {
       buildLine1Spec(),
       buildOptionsRowSpec(),
       buildScopeRowSpec(),
+      hintBar(buildHelpHints()),
       raw(buildPanelEntries("postOptions"), "separator"),
       buildMatchListSpec(),
-      hintBar(buildHelpHints()),
     ),
   );
   // The Tree's `expandedKeys` field on the spec is initial-only —
@@ -1060,6 +1067,9 @@ async function performSearch(pattern: string, silent?: boolean): Promise<SearchR
       caseSensitive: panel.caseSensitive,
       maxResults: MAX_RESULTS,
       wholeWords: panel.wholeWords,
+      // Lets the host search an unnamed/unsaved source buffer in-memory;
+      // it has no on-disk file the project walk could otherwise reach.
+      sourceBufferId: panel.sourceBufferId,
     });
     activeSearchHandle = handle;
 
@@ -1108,10 +1118,15 @@ async function performSearch(pattern: string, silent?: boolean): Promise<SearchR
       const newExpandedKeys: string[] = []; // file rows added this batch
       for (const m of chunk) {
         // §1 scope filter: when scope is "current file only", drop
-        // matches from any other path. Done client-side because the
-        // host grep API is project-wide. Empty sourceBufferPath
-        // (unsaved buffer) filters everything out by design.
-        if (!panel.allFiles && m.file !== panel.sourceBufferPath) continue;
+        // matches from any other source. Done client-side because the
+        // host grep API is project-wide. A named buffer matches by path;
+        // an unnamed/unsaved buffer (empty sourceBufferPath) matches by
+        // buffer id instead — the host tags its in-memory matches with it.
+        if (!panel.allFiles) {
+          const sameFile = !!panel.sourceBufferPath && m.file === panel.sourceBufferPath;
+          const sameBuffer = !!panel.sourceBufferId && m.bufferId === panel.sourceBufferId;
+          if (!sameFile && !sameBuffer) continue;
+        }
         const result: SearchResult = { match: m, selected: true };
         allResults.push(result);
         let fileIdx = streamingFileIndexByPath?.get(m.file);
@@ -1276,8 +1291,10 @@ async function openPanel(opts?: { allFiles?: boolean }): Promise<void> {
   // Try to pre-fill search from editor selection
   let prefill = "";
   let sourceBufferPath = "";
+  let sourceBufferId = 0;
   try {
     const activeId = editor.getActiveBufferId();
+    sourceBufferId = activeId;
     sourceBufferPath = editor.getBufferPath(activeId) || "";
     const cursor = editor.getPrimaryCursor();
     if (cursor && cursor.selection) {
@@ -1304,6 +1321,7 @@ async function openPanel(opts?: { allFiles?: boolean }): Promise<void> {
     panel.allFiles = allFiles;
     panel.sourceBufferPath = sourceBufferPath;
     panel.sourceBufferRelPath = sourceBufferRelPath;
+    panel.sourceBufferId = sourceBufferId;
     updatePanelContent();
     if (panel.searchPattern) rerunSearchDebounced();
     return;
@@ -1329,6 +1347,7 @@ async function openPanel(opts?: { allFiles?: boolean }): Promise<void> {
     allFiles,
     sourceBufferPath,
     sourceBufferRelPath,
+    sourceBufferId,
     viewportWidth: DEFAULT_WIDTH,
     busy: false,
     searchPerformed: false,
@@ -1383,29 +1402,42 @@ async function executeReplacements(results?: SearchResult[]): Promise<string> {
     return editor.t("status.no_selected");
   }
 
-  const fileGroups: Map<string, Array<[number, number]>> = new Map();
+  // Group edits per target. Matches in an open buffer carry a non-zero
+  // bufferId; key by it so an unnamed buffer (whose `file` is a shared
+  // "[No Name]" label) still resolves to the right buffer rather than
+  // colliding with another unnamed buffer's matches. On-disk files
+  // (bufferId 0) key by path and are opened/saved by the host as before.
+  type Group = { filePath: string; bufferId: number; matches: Array<[number, number]> };
+  const groups: Map<string, Group> = new Map();
   for (const result of toReplace) {
-    const file = result.match.file;
-    if (!fileGroups.has(file)) {
-      fileGroups.set(file, []);
+    const bufferId = result.match.bufferId || 0;
+    const key = bufferId > 0 ? `buf:${bufferId}` : result.match.file;
+    let group = groups.get(key);
+    if (!group) {
+      group = { filePath: result.match.file, bufferId, matches: [] };
+      groups.set(key, group);
     }
-    fileGroups.get(file)!.push([result.match.byteOffset, result.match.length]);
+    group.matches.push([result.match.byteOffset, result.match.length]);
   }
 
   let filesModified = 0;
   let replacementsCount = 0;
   const errors: string[] = [];
 
-  const keys: string[] = [];
-  fileGroups.forEach((_v, k) => keys.push(k));
-  for (const filePath of keys) {
-    const matches = fileGroups.get(filePath)!;
+  const groupList: Group[] = [];
+  groups.forEach((g) => groupList.push(g));
+  for (const group of groupList) {
     try {
-      const result = await editor.replaceInFile(filePath, matches, panel.replaceText);
+      const result = await editor.replaceInFile(
+        group.filePath,
+        group.matches,
+        panel.replaceText,
+        group.bufferId
+      );
       replacementsCount += result.replacements;
       if (result.replacements > 0) filesModified++;
     } catch (e) {
-      errors.push(`${filePath}: ${e instanceof Error ? e.message : String(e)}`);
+      errors.push(`${group.filePath}: ${e instanceof Error ? e.message : String(e)}`);
     }
   }
 
@@ -1451,12 +1483,22 @@ async function rerunSearch(): Promise<void> {
   if (panel && currentSearchGeneration === myGen) {
     panel.busy = false;
     panel.searchPerformed = true;
-    // Only one tiny mutation needed: refresh matchStats since it
-    // depends on the busy flag and searchPerformed (showing
-    // "No matches" vs "Searching…"). The tree's nodes already
-    // reflect the final state — no full re-emit needed.
     if (panel.widgetPanel) {
-      panel.widgetPanel.setRawEntries("matchStats", buildMatchStatsEntries());
+      if (panel.searchResults.length === 0) {
+        // Zero matches: the match-list body is an empty-state `raw()`
+        // last rendered while `busy` was still true → "Searching…".
+        // `setRawEntries("matchStats", …)` only refreshes the small
+        // count label next to the inputs, not the body, so without a
+        // full re-emit the body stays stuck on "Searching…". Re-emit
+        // now that the flags are final so it shows "No matches".
+        // Cheap: the tree is empty (no per-node serialization cost).
+        updatePanelContent();
+      } else {
+        // Only one tiny mutation needed: refresh matchStats since it
+        // depends on the busy flag and searchPerformed. The tree's
+        // nodes already reflect the final state — no full re-emit.
+        panel.widgetPanel.setRawEntries("matchStats", buildMatchStatsEntries());
+      }
     }
   }
 }

package/plugins/theme_editor.i18n.json

@@ -219,6 +219,8 @@
     "field.text_input_selection_bg_desc": "pozadí pro vybraný text uvnitř textového pole widgetu",
     "field.suggestion_bg": "Suggestion pozadí",
     "field.suggestion_bg_desc": "Autocomplete suggestion pozadí",
+    "field.suggestion_fg": "Suggestion popředí",
+    "field.suggestion_fg_desc": "barva textu na pozadí návrhu",
     "field.suggestion_selected_bg": "Suggestion Selected pozadí",
     "field.suggestion_selected_bg_desc": "Selected suggestion pozadí",
     "field.help_bg": "Help pozadí",
@@ -534,6 +536,8 @@
     "field.text_input_selection_bg_desc": "Hintergrund der Auswahl in einer Widget-Texteingabe",
     "field.suggestion_bg": "Vorschlag Hintergrund",
     "field.suggestion_bg_desc": "Hintergrund der Autovervollstaendigung",
+    "field.suggestion_fg": "Vorschlag Vordergrund",
+    "field.suggestion_fg_desc": "Textfarbe auf dem Vorschlagshintergrund",
     "field.suggestion_selected_bg": "Ausgewaehlter Vorschlag Hintergrund",
     "field.suggestion_selected_bg_desc": "Hintergrund des ausgewaehlten Vorschlags",
     "field.help_bg": "Hilfe Hintergrund",
@@ -925,6 +929,8 @@
     "field.text_input_selection_bg_desc": "Background for selected text inside a widget text input",
     "field.suggestion_bg": "Suggestion Background",
     "field.suggestion_bg_desc": "Autocomplete suggestion background",
+    "field.suggestion_fg": "Suggestion Foreground",
+    "field.suggestion_fg_desc": "Text color drawn on the suggestion background",
     "field.suggestion_selected_bg": "Suggestion Selected Background",
     "field.suggestion_selected_bg_desc": "Selected suggestion background",
     "field.help_bg": "Help Background",
@@ -1236,6 +1242,8 @@
     "field.text_input_selection_bg_desc": "Color de fondo del texto seleccionado dentro de un campo de texto de widget",
     "field.suggestion_bg": "Fondo de sugerencia",
     "field.suggestion_bg_desc": "Fondo de sugerencia de autocompletado",
+    "field.suggestion_fg": "Primer plano de sugerencia",
+    "field.suggestion_fg_desc": "Color de texto sobre el fondo de sugerencia",
     "field.suggestion_selected_bg": "Fondo de sugerencia seleccionada",
     "field.suggestion_selected_bg_desc": "Fondo de sugerencia seleccionada",
     "field.help_bg": "Fondo de ayuda",
@@ -1587,6 +1595,8 @@
     "field.text_input_selection_bg_desc": "Couleur de fond du texte selectionne dans un champ de saisie de widget",
     "field.suggestion_bg": "Arriere-plan suggestion",
     "field.suggestion_bg_desc": "Arriere-plan de l'autocompletion",
+    "field.suggestion_fg": "Premier plan suggestion",
+    "field.suggestion_fg_desc": "Couleur du texte sur l'arriere-plan de suggestion",
     "field.suggestion_selected_bg": "Arriere-plan suggestion selectionnee",
     "field.suggestion_selected_bg_desc": "Arriere-plan de la suggestion selectionnee",
     "field.help_bg": "Arriere-plan aide",
@@ -1938,6 +1948,8 @@
     "field.text_input_selection_bg_desc": "ウィジェットのテキスト入力欄で選択されたテキストの背景色",
     "field.suggestion_bg": "候補背景",
     "field.suggestion_bg_desc": "オートコンプリート候補の背景",
+    "field.suggestion_fg": "候補前景",
+    "field.suggestion_fg_desc": "候補背景上のテキスト色",
     "field.suggestion_selected_bg": "選択候補背景",
     "field.suggestion_selected_bg_desc": "選択された候補の背景",
     "field.help_bg": "ヘルプ背景",
@@ -2325,6 +2337,8 @@
     "field.text_input_selection_bg_desc": "위젯 텍스트 입력란에서 선택된 텍스트의 배경색",
     "field.suggestion_bg": "Suggestion 배경",
     "field.suggestion_bg_desc": "Autocomplete suggestion 배경",
+    "field.suggestion_fg": "Suggestion 전경",
+    "field.suggestion_fg_desc": "추천 배경 위의 텍스트 색상",
     "field.suggestion_selected_bg": "Suggestion Selected 배경",
     "field.suggestion_selected_bg_desc": "Selected suggestion 배경",
     "field.help_bg": "Help 배경",
@@ -2676,6 +2690,8 @@
     "field.text_input_selection_bg_desc": "cor de fundo do texto selecionado dentro de um campo de entrada de widget",
     "field.suggestion_bg": "Suggestion fundo",
     "field.suggestion_bg_desc": "Autocomplete suggestion fundo",
+    "field.suggestion_fg": "Suggestion primeiro plano",
+    "field.suggestion_fg_desc": "Cor do texto sobre o fundo de sugestão",
     "field.suggestion_selected_bg": "Suggestion Selected fundo",
     "field.suggestion_selected_bg_desc": "Selected suggestion fundo",
     "field.help_bg": "Help fundo",
@@ -3027,6 +3043,8 @@
     "field.text_input_selection_bg_desc": "цвет фона выделенного текста внутри текстового поля виджета",
     "field.suggestion_bg": "Suggestion фон",
     "field.suggestion_bg_desc": "Autocomplete suggestion фон",
+    "field.suggestion_fg": "Suggestion передний план",
+    "field.suggestion_fg_desc": "Цвет текста на фоне подсказки",
     "field.suggestion_selected_bg": "Suggestion Selected фон",
     "field.suggestion_selected_bg_desc": "Selected suggestion фон",
     "field.help_bg": "Help фон",
@@ -3378,6 +3396,8 @@
     "field.text_input_selection_bg_desc": "สีพื้นหลังของข้อความที่เลือกในช่องป้อนข้อความของวิดเจ็ต",
     "field.suggestion_bg": "Suggestion พื้นหลัง",
     "field.suggestion_bg_desc": "Autocomplete suggestion พื้นหลัง",
+    "field.suggestion_fg": "Suggestion พื้นหน้า",
+    "field.suggestion_fg_desc": "สีข้อความบนพื้นหลังคำแนะนำ",
     "field.suggestion_selected_bg": "Suggestion Selected พื้นหลัง",
     "field.suggestion_selected_bg_desc": "Selected suggestion พื้นหลัง",
     "field.help_bg": "Help พื้นหลัง",
@@ -3729,6 +3749,8 @@
     "field.text_input_selection_bg_desc": "колір фону виділеного тексту всередині текстового поля віджета",
     "field.suggestion_bg": "Suggestion фон",
     "field.suggestion_bg_desc": "Autocomplete suggestion фон",
+    "field.suggestion_fg": "Suggestion передній план",
+    "field.suggestion_fg_desc": "Колір тексту на тлі підказки",
     "field.suggestion_selected_bg": "Suggestion Selected фон",
     "field.suggestion_selected_bg_desc": "Selected suggestion фон",
     "field.help_bg": "Help фон",
@@ -4080,6 +4102,8 @@
     "field.text_input_selection_bg_desc": "Màu nền của văn bản đã chọn bên trong ô nhập văn bản của widget",
     "field.suggestion_bg": "Nền gợi ý",
     "field.suggestion_bg_desc": "Nền gợi ý tự động hoàn thành",
+    "field.suggestion_fg": "Tiền cảnh gợi ý",
+    "field.suggestion_fg_desc": "Màu văn bản trên nền gợi ý",
     "field.suggestion_selected_bg": "Nền gợi ý đã chọn",
     "field.suggestion_selected_bg_desc": "Nền gợi ý đã chọn",
     "field.help_bg": "Nền trợ giúp",
@@ -4395,6 +4419,8 @@
     "field.text_input_selection_bg_desc": "小部件文本输入框中所选文本的背景颜色",
     "field.suggestion_bg": "建议背景",
     "field.suggestion_bg_desc": "自动补全建议背景",
+    "field.suggestion_fg": "建议前景",
+    "field.suggestion_fg_desc": "建议背景上的文本颜色",
     "field.suggestion_selected_bg": "选中建议背景",
     "field.suggestion_selected_bg_desc": "选中建议的背景",
     "field.help_bg": "帮助背景",
@@ -4758,6 +4784,8 @@
     "field.text_input_selection_bg_desc": "Colore di sfondo del testo selezionato all'interno di un campo di testo widget",
     "field.suggestion_bg": "Sfondo suggerimento",
     "field.suggestion_bg_desc": "Sfondo del suggerimento di completamento automatico",
+    "field.suggestion_fg": "Primo piano suggerimento",
+    "field.suggestion_fg_desc": "Colore del testo sullo sfondo del suggerimento",
     "field.suggestion_selected_bg": "Sfondo suggerimento selezionato",
     "field.suggestion_selected_bg_desc": "Sfondo del suggerimento selezionato",
     "field.help_bg": "Sfondo aiuto",

package/plugins/vi_mode.ts

@@ -395,7 +395,7 @@ registerHandler("vi_line_end", vi_line_end);
 async function vi_first_non_blank() : Promise<void> {
   consumeCount(); // Count doesn't apply
   // Get line start position directly (avoids stale snapshot from executeAction)
-  const line = editor.getCursorLine();
+  const line = editor.getPrimaryCursor()?.line ?? 0;
   const bufferId = editor.getActiveBufferId();
   const lineStart = await editor.getLineStartPosition(line);
   if (lineStart === null) {
@@ -939,7 +939,7 @@ async function vi_visual_block() : Promise<void> {
   // Calculate line and column for block anchor
   const cursorPos = editor.getCursorPosition();
   if (cursorPos !== null) {
-    const line = editor.getCursorLine() ?? 1;
+    const line = editor.getPrimaryCursor()?.line ?? 1;
     const lineStart = await editor.getLineStartPosition(line);
     const col = lineStart !== null ? cursorPos - lineStart : 0;
     state.visualBlockAnchor = { line, col };
@@ -2702,7 +2702,7 @@ async function executeCommand(
       if (info) {
         const modified = info.modified ? editor.t("info.modified") : "";
         const path = info.path || editor.t("info.no_name");
-        const line = editor.getCursorLine();
+        const line = editor.getPrimaryCursor()?.line ?? 0;
         return { message: editor.t("info.file", { path, modified, line: String(line), bytes: String(info.length) }) };
       }
       return { error: editor.t("error.no_buffer") };