From 70bf9111c8145f405a86061b4d26dbb2cfbb0843 Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Fri, 17 Jul 2026 14:26:55 +0900 Subject: [PATCH 01/12] Update README for current features --- README.md | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 55c1fd9..aeddae9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TXTeditor -TXTeditor 0.4.7 is a Windows-focused desktop editor for Diablo II / Diablo II: Resurrected style tab-separated `.txt` data files. It is built as a Tauri v2 desktop app with a canvas-rendered virtual grid for editing large tables. +TXTeditor is a Windows-focused desktop editor for Diablo II / Diablo II: Resurrected style tab-separated `.txt` data files. It is built as a Tauri v2 desktop app with a canvas-rendered virtual grid for editing large tables. TXTeditor is a personal project. I am not an experienced programmer, and most of the implementation was built with the help of OpenAI Codex. The app may contain bugs, incomplete behavior, or rough edges, but I am sharing it in case it is useful to others. @@ -8,36 +8,46 @@ TXTeditor is not affiliated with, endorsed by, or connected to Blizzard Entertai ## Features -- Open single `.txt` files. -- Open a D2R `data/global/excel` style folder or workspace. +- Open individual `.txt` files and supported D2R localization `.json` files. +- Open a D2R `data/global/excel` style folder or workspace, including subfolders when desired. +- Open file paths passed to TXTeditor when the desktop app starts. - Edit tab-separated data in a grid interface. +- Edit `data/local/lng/strings/*.json` localization files in a dedicated JSON code editor. - Canvas virtualization for large files. -- Frozen first row and first column. -- Zoom, search, undo, and redo. -- Copy, cut, paste, fill, and simple arithmetic operations on selections. +- Independently freeze the first row and first column; the selected state is remembered between runs. +- Grid zoom, forward and backward search, undo, and redo. +- Copy, cut, paste, fill, and simple arithmetic operations on selections, including filling a multi-cell selection by pasting one value. - Hide and unhide rows or columns. +- Optionally lock mouse-based row-height and column-width resizing. - D2R-aware linting in the live Problems panel. - Select either Vector-LSP or Legacy Lint as the active lint engine. -- Click a diagnostic to jump to the matching file, row, column, and cell. -- RotW and 2.4 lint profile toggle. +- Run cross-file lint rules against the active workspace or the sibling files of an individually opened table. +- Click a diagnostic to jump to the matching table cell or JSON range. +- Configure versioned schema and bundled reference data, or use RotW and 2.4 profiles with Legacy Lint. -## Lint Profiles +## Localization JSON -TXTeditor includes RotW and 2.4 lint profiles. These rules are based on the behavior of [d2rlint](https://github.com/eezstreet/d2rlint), the original D2R linting tool made by eezstreet, and are integrated into TXTeditor's live Problems panel. +TXTeditor recognizes D2R localization files under `data/local/lng/strings/*.json`. These files open in a CodeMirror-based editor with JSON syntax highlighting, bracket matching, folding, search, and syntax markers. Saving uses the same document tab workflow as table files. If an open JSON file changes on disk, TXTeditor asks whether to reload the disk version or keep the editor version. -The RotW-oriented lint behavior has been checked against the project's current d2rlint-compatible fixture/oracle workflow. Other data sets, mod variants, or future rule changes may still expose bugs or differences. +Localization JSON diagnostics are available through **Lint Options** when Vector-LSP is selected. They are disabled by default and can be enabled or disabled individually for duplicate IDs or keys, required string fields, and unused localization keys. The unused-key rule also has a configurable lower ID threshold. Only JSON files present in the mod are checked; layout JSON contributes key-usage evidence without being treated as an editable localization document. -## Lint Engines +Malformed JSON is reported as a syntax problem. When semantic results from the last parse are still relevant, a syntax error does not make those existing findings appear resolved merely because the current document cannot be parsed. -Version 0.4.1 adds a lint engine selector in Settings. +## Lint Engines -Vector-LSP is the default engine for first-time runs and keeps the 0.4 behavior: bundled Vector-LSP diagnostics, Vector-LSP hover, Lint Options, and Problems panel integration. +Vector-LSP is the default engine for first-time runs. It provides bundled Vector-LSP diagnostics, Vector-LSP hover, Lint Options, localization JSON diagnostics, and Problems panel integration. -Legacy Lint restores the earlier built-in lint path from TXTeditor 0.33. In Legacy Lint mode, the Problems panel shows the RotW / 2.4 profile selector and Rules panel, and diagnostics are produced by TXTeditor's built-in legacy lint engine instead of Vector-LSP. +Legacy Lint uses TXTeditor's built-in lint path. In Legacy Lint mode, the Problems panel shows the RotW / 2.4 profile selector and Rules panel, and diagnostics are produced by TXTeditor instead of Vector-LSP. These rules are based on the behavior of [d2rlint](https://github.com/eezstreet/d2rlint), the original D2R linting tool made by eezstreet. You can switch between Vector-LSP and Legacy Lint while TXTeditor is running. Only the selected engine updates the active diagnostics, cell markers, overview-ruler marks, and Problems panel. Switching back to Vector-LSP resyncs open files with Vector-LSP and restores the stored Vector-LSP Hover preference. -Version 0.4.1 integrates [vector-lsp](https://github.com/eezstreet/vector-lsp) created by eezstreet while allowing users to choose Vector-LSP or Legacy Lint as the active lint engine. +Cross-file rules use the files in the active workspace. For a separately opened `.txt` file, sibling tables in the same folder provide its lint context. Folder workspaces include subfolders by default; **Exclude subfolders when opening a folder** in Settings limits the session to the selected folder itself. + +Versioned bundled reference data can supply tables that are absent from the current mod. A local workspace, sibling, or explicitly opened table takes precedence over the bundled fallback, so diagnostics follow the files being edited. One selected reference version is used for the whole lint session. + +The RotW-oriented lint behavior has been checked against the project's current d2rlint-compatible fixture/oracle workflow. Other data sets, mod variants, or future rule changes may still expose bugs or differences. + +TXTeditor uses a [modified fork of vector-lsp](https://github.com/yinyin333333/vector-lsp) that includes application-specific integration changes. This fork is derived from the [original vector-lsp](https://github.com/eezstreet/vector-lsp) created by eezstreet and remains subject to the original project's attribution and license. ## Build @@ -74,7 +84,7 @@ The toolbar **Shortcuts** button lets you replace command and grid-scrolling sho - `Ctrl+O`: open file - `Ctrl+S`: save - `Ctrl+Shift+S`: save as -- `Ctrl+F`: search +- `Ctrl+F`: search from the active cell - `Ctrl+B`: toggle Explorer panel - `Ctrl+L`: toggle Problems panel - `Ctrl+H`: reset all row heights to default @@ -86,15 +96,16 @@ The toolbar **Shortcuts** button lets you replace command and grid-scrolling sho - `Ctrl+A`: select all - `Ctrl+P` / `Ctrl+Shift+P`: command palette - `Ctrl+W`: close current tab -- `Ctrl+Plus`: zoom in -- `Ctrl+Minus`: zoom out -- `Ctrl+0`: reset zoom +- `Ctrl+Plus`: zoom in on the table grid +- `Ctrl+Minus`: zoom out on the table grid +- `Ctrl+0`: reset table-grid zoom - `PageUp` / `PageDown`: scroll one grid page vertically - `Home` / `End`: scroll to the top or bottom of the grid - `Shift+Home` / `Shift+End`: scroll to the left or right edge of the grid - `Enter` / `F2`: edit cell - `Escape`: cancel edit - `Tab` / `Shift+Tab`: move horizontally after edit +- `Enter` / `Shift+Enter` in the Find window: find next / previous ## Acknowledgements From 64061577b3d3e70f90a0371b67bee8aa094a8cc7 Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Fri, 17 Jul 2026 14:33:23 +0900 Subject: [PATCH 02/12] Update README.md --- README.md | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index aeddae9..7e02498 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TXTeditor -TXTeditor is a Windows-focused desktop editor for Diablo II / Diablo II: Resurrected style tab-separated `.txt` data files. It is built as a Tauri v2 desktop app with a canvas-rendered virtual grid for editing large tables. +TXTeditor is a Windows-focused desktop editor for Diablo II / Diablo II: Resurrected style tab-separated `.txt` data files and supported D2R JSON string files. It is built as a Tauri v2 desktop app with a canvas-rendered virtual grid for editing large tables. TXTeditor is a personal project. I am not an experienced programmer, and most of the implementation was built with the help of OpenAI Codex. The app may contain bugs, incomplete behavior, or rough edges, but I am sharing it in case it is useful to others. @@ -8,7 +8,7 @@ TXTeditor is not affiliated with, endorsed by, or connected to Blizzard Entertai ## Features -- Open individual `.txt` files and supported D2R localization `.json` files. +- Open individual `.txt` files and supported D2R JSON string files. - Open a D2R `data/global/excel` style folder or workspace, including subfolders when desired. - Open file paths passed to TXTeditor when the desktop app starts. - Edit tab-separated data in a grid interface. @@ -22,32 +22,49 @@ TXTeditor is not affiliated with, endorsed by, or connected to Blizzard Entertai - D2R-aware linting in the live Problems panel. - Select either Vector-LSP or Legacy Lint as the active lint engine. - Run cross-file lint rules against the active workspace or the sibling files of an individually opened table. +- Optionally lint supported D2R JSON string files with Vector-LSP. - Click a diagnostic to jump to the matching table cell or JSON range. - Configure versioned schema and bundled reference data, or use RotW and 2.4 profiles with Legacy Lint. -## Localization JSON +## JSON Editing -TXTeditor recognizes D2R localization files under `data/local/lng/strings/*.json`. These files open in a CodeMirror-based editor with JSON syntax highlighting, bracket matching, folding, search, and syntax markers. Saving uses the same document tab workflow as table files. If an open JSON file changes on disk, TXTeditor asks whether to reload the disk version or keep the editor version. +TXTeditor includes a dedicated JSON code editor based on [CodeMirror](https://codemirror.net/). It currently supports D2R string files under `data/local/lng/strings/*.json`, with JSON syntax highlighting, bracket matching, folding, search, and syntax markers. -Localization JSON diagnostics are available through **Lint Options** when Vector-LSP is selected. They are disabled by default and can be enabled or disabled individually for duplicate IDs or keys, required string fields, and unused localization keys. The unused-key rule also has a configurable lower ID threshold. Only JSON files present in the mod are checked; layout JSON contributes key-usage evidence without being treated as an editable localization document. +JSON files use the same document tab and save workflow as table files. If an open JSON file changes on disk, TXTeditor asks whether to reload the disk version or keep the editor version. -Malformed JSON is reported as a syntax problem. When semantic results from the last parse are still relevant, a syntax error does not make those existing findings appear resolved merely because the current document cannot be parsed. +## Linting -## Lint Engines +Lint results appear in the live Problems panel. Selecting a diagnostic opens the matching table cell or JSON range. -Vector-LSP is the default engine for first-time runs. It provides bundled Vector-LSP diagnostics, Vector-LSP hover, Lint Options, localization JSON diagnostics, and Problems panel integration. +### Lint Engines -Legacy Lint uses TXTeditor's built-in lint path. In Legacy Lint mode, the Problems panel shows the RotW / 2.4 profile selector and Rules panel, and diagnostics are produced by TXTeditor instead of Vector-LSP. These rules are based on the behavior of [d2rlint](https://github.com/eezstreet/d2rlint), the original D2R linting tool made by eezstreet. +Vector-LSP is the default engine for first-time runs. It provides bundled Vector-LSP diagnostics, Vector-LSP hover, Lint Options, JSON lint support, and Problems panel integration. + +Legacy Lint uses TXTeditor's built-in lint path. In Legacy Lint mode, diagnostics are produced by TXTeditor instead of Vector-LSP, and the Problems panel provides the profile selector and Rules panel. You can switch between Vector-LSP and Legacy Lint while TXTeditor is running. Only the selected engine updates the active diagnostics, cell markers, overview-ruler marks, and Problems panel. Switching back to Vector-LSP resyncs open files with Vector-LSP and restores the stored Vector-LSP Hover preference. +TXTeditor uses a [modified fork of vector-lsp](https://github.com/yinyin333333/vector-lsp) that includes application-specific integration changes. This fork is derived from the [original vector-lsp](https://github.com/eezstreet/vector-lsp) created by eezstreet and remains subject to the original project's attribution and license. + +### Lint Profiles + +Legacy Lint includes RotW and 2.4 profiles. These rules are based on the behavior of [d2rlint](https://github.com/eezstreet/d2rlint), the original D2R linting tool made by eezstreet. + +The RotW-oriented lint behavior has been checked against the project's current d2rlint-compatible fixture/oracle workflow. Other data sets, mod variants, or future rule changes may still expose bugs or differences. + +### Reference Data and Cross-File Lint + Cross-file rules use the files in the active workspace. For a separately opened `.txt` file, sibling tables in the same folder provide its lint context. Folder workspaces include subfolders by default; **Exclude subfolders when opening a folder** in Settings limits the session to the selected folder itself. Versioned bundled reference data can supply tables that are absent from the current mod. A local workspace, sibling, or explicitly opened table takes precedence over the bundled fallback, so diagnostics follow the files being edited. One selected reference version is used for the whole lint session. -The RotW-oriented lint behavior has been checked against the project's current d2rlint-compatible fixture/oracle workflow. Other data sets, mod variants, or future rule changes may still expose bugs or differences. +### JSON Lint -TXTeditor uses a [modified fork of vector-lsp](https://github.com/yinyin333333/vector-lsp) that includes application-specific integration changes. This fork is derived from the [original vector-lsp](https://github.com/eezstreet/vector-lsp) created by eezstreet and remains subject to the original project's attribution and license. +Vector-LSP can lint the supported D2R JSON string files. JSON lint is disabled by default and can be enabled through **Lint Options**. Individual rules can check duplicate IDs or keys, required string fields, and unused string keys. The unused-key rule also has a configurable lower ID threshold. + +Only JSON files present in the mod are checked. D2R layout JSON is used as evidence when checking whether string keys are used, but layout files are not opened as editable string documents. + +Malformed JSON is reported as a syntax problem. When semantic results from the last successful parse are still relevant, a syntax error does not make those existing findings appear resolved merely because the current document cannot be parsed. ## Build From b4b28675ffe8f2a849da4be8e470c48be881f6e9 Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Fri, 17 Jul 2026 18:28:52 +0900 Subject: [PATCH 03/12] Add navigation, replace, and clone workflows --- README.md | 4 + index.html | 8 + src/app.js | 22 +-- src/core/operations.js | 23 ++- src/core/search.js | 49 ++++++ src/styles.css | 13 ++ src/ui/app-elements.js | 4 + src/ui/canvas-grid.js | 11 +- src/ui/codemirror-json-editor-entry.js | 9 + src/ui/command-registry.js | 20 ++- src/ui/controllers/app-event-controller.js | 19 +- .../controllers/command-surface-controller.js | 17 +- src/ui/controllers/grid-command-controller.js | 40 ++++- src/ui/controllers/json-editor-controller.js | 1 + src/ui/controllers/search-controller.js | 95 +++++++++- src/ui/controllers/shell-controller.js | 18 +- src/ui/document-lifecycle-policy.js | 6 + src/ui/edit-policy.js | 3 +- src/ui/grid-selection-policy.js | 3 +- src/ui/prompt-dialog.js | 3 +- src/ui/shortcut-policy.js | 16 +- tests/app-controller.test.js | 13 +- tests/core.test.js | 5 +- tests/grid-policy.test.js | 2 + tests/json-document-tabs.test.js | 4 + tests/replace-navigation-shortcuts.test.js | 164 ++++++++++++++++++ tests/search-controller-regression.test.js | 57 +++++- tests/table-document-state.test.js | 39 ++++- 28 files changed, 618 insertions(+), 50 deletions(-) create mode 100644 tests/replace-navigation-shortcuts.test.js diff --git a/README.md b/README.md index 7e02498..29a9ef6 100644 --- a/README.md +++ b/README.md @@ -102,6 +102,9 @@ The toolbar **Shortcuts** button lets you replace command and grid-scrolling sho - `Ctrl+S`: save - `Ctrl+Shift+S`: save as - `Ctrl+F`: search from the active cell +- `F3` / `Shift+F3`: find next / previous +- `Ctrl+Shift+H`: find and replace +- `Ctrl+G`: go to a displayed row number - `Ctrl+B`: toggle Explorer panel - `Ctrl+L`: toggle Problems panel - `Ctrl+H`: reset all row heights to default @@ -113,6 +116,7 @@ The toolbar **Shortcuts** button lets you replace command and grid-scrolling sho - `Ctrl+A`: select all - `Ctrl+P` / `Ctrl+Shift+P`: command palette - `Ctrl+W`: close current tab +- `Ctrl+Tab` / `Ctrl+Shift+Tab`: move to the next / previous open tab - `Ctrl+Plus`: zoom in on the table grid - `Ctrl+Minus`: zoom out on the table grid - `Ctrl+0`: reset table-grid zoom diff --git a/index.html b/index.html index 56e4841..0e1b3b6 100644 --- a/index.html +++ b/index.html @@ -82,12 +82,20 @@

Find

+
+
diff --git a/src/app.js b/src/app.js index 00de07f..a54f062 100644 --- a/src/app.js +++ b/src/app.js @@ -201,19 +201,12 @@ gridCommandController = createGridCommandController({ saveSelectionState, renderChrome, showError, + promptNumber, applyFreezeToDoc, rowsForContextOperation, columnsFromSelection }); -const { - toggleFreeze, - unhideAll, - zoomBy, - zoomReset, - resetRowHeights, - resizeFit, - cloneRows -} = gridCommandController; +const { toggleFreeze, unhideAll, zoomBy, zoomReset, resetRowHeights, goToRow, resizeFit, cloneRows, cloneColumns } = gridCommandController; lspController = createLspController({ state, els, @@ -324,6 +317,7 @@ const searchController = createSearchController({ activeDoc, updateActiveProblemHighlight, saveSelectionState, + applyEdits, jsonSearch: jsonEditorController, focusActiveEditor }); @@ -368,13 +362,18 @@ const commandController = createCommandController({ redo, showSearch: searchController.showSearch, findNext: searchController.findNext, + findPrevious: searchController.findPrevious, + showReplace: searchController.showReplace, + goToRow, + nextTab: () => shellController?.switchTab(1), + previousTab: () => shellController?.switchTab(-1), copySelection, pasteSelection, cutSelection, selectAll, addRows, insertRows, - cloneRows, + cloneRows, cloneColumns, addColumns, insertColumns, unhideAll, @@ -436,7 +435,7 @@ shellController = createShellController({ syncDockLayout, syncProblemsHeaderLayout, scheduleHoverPrewarm, - ensureDocumentSession: lspController.ensureStandaloneSession, + ensureDocumentSession: lspController.ensureStandaloneSession, commitActiveEditor, saveSelectionState, recordUiPerf, perfNow, @@ -477,6 +476,7 @@ const eventController = createAppEventController({ selectAll, jsonEditorOwnsTarget: jsonEditorController.editorOwnsTarget, handleExternalChangeDialogClick: documentController.handleExternalChangeDialogClick, + commitActiveEditor, focusActiveEditor }); renderChrome(); diff --git a/src/core/operations.js b/src/core/operations.js index 1dfae65..bb1763a 100644 --- a/src/core/operations.js +++ b/src/core/operations.js @@ -218,7 +218,7 @@ export function cloneRowsCommand(doc, rows, insertAt = null) { .filter((row) => row > 0 && row < doc.rowCount) .sort((a, b) => a - b); const values = targets.map((row) => Array.from({ length: doc.columnCount }, (_, column) => doc.getCell(row, column))); - const at = clamp(insertAt ?? ((targets.at(-1) ?? 0) + 1), 1, doc.rowCount); + const at = clamp(insertAt ?? doc.rowCount, 1, doc.rowCount); return makeCustomCommand(`Clone ${targets.length} Row(s)`, { empty: targets.length === 0, redo(target) { @@ -281,6 +281,27 @@ export function addColumnsCommand(doc, count = 1) { }); } +export function cloneColumnsCommand(doc, columns, insertAt = null) { + const targets = [...new Set(columns)] + .filter((column) => column >= 0 && column < doc.columnCount) + .sort((a, b) => a - b); + const values = Array.from({ length: doc.rowCount }, (_, row) => targets.map((column) => doc.getCell(row, column))); + const widths = targets.map((column) => doc.columnWidths[column]); + const at = clamp(insertAt ?? doc.columnCount, 0, doc.columnCount); + return makeCustomCommand(`Clone ${targets.length} Column(s)`, { + empty: targets.length === 0, + redo(target) { + target.restoreColumns(at, values, widths); + }, + undo(target) { + target.removeColumns(at, targets.length); + }, + contentChanged: true, + lspChange: { kind: "insertColumns", index: at, count: targets.length }, + undoLspChange: { kind: "deleteColumns", index: at, count: targets.length } + }); +} + export function deleteColumnsCommand(doc, index, count = 1) { const at = clamp(index, 0, Math.max(0, doc.columnCount - 1)); let deleted = null; diff --git a/src/core/search.js b/src/core/search.js index 3ddadc8..f8ac603 100644 --- a/src/core/search.js +++ b/src/core/search.js @@ -30,6 +30,34 @@ export function findInTable(doc, query, start = { row: 0, column: 0 }, options = return null; } +export function replaceNextInTable(doc, query, replacement, start = { row: 0, column: 0 }, options = {}) { + const found = findInTable(doc, query, start, { ...options, includeStart: true }); + if (!found) return { found: null, edits: [], replacementCount: 0 }; + const current = doc.getCell(found.row, found.column); + const replaced = replaceText(current, query, replacement, { ...options, limit: 1 }); + return { + found, + edits: replaced.count ? [{ row: found.row, column: found.column, value: replaced.value }] : [], + replacementCount: replaced.count + }; +} + +export function replaceAllInTable(doc, query, replacement, options = {}) { + if (!query) return { edits: [], replacementCount: 0 }; + const scope = normalizeSearchScope(options.scope); + const edits = []; + let replacementCount = 0; + for (let index = 0; index < searchCandidateCount(doc, scope); index++) { + const { row, column } = searchCandidateAt(doc, scope, index); + const current = doc.getCell(row, column); + const replaced = replaceText(current, query, replacement, options); + if (!replaced.count) continue; + edits.push({ row, column, value: replaced.value }); + replacementCount += replaced.count; + } + return { edits, replacementCount }; +} + export function normalizeSearchDirection(direction) { return direction === SEARCH_DIRECTION_BACKWARD ? SEARCH_DIRECTION_BACKWARD : SEARCH_DIRECTION_FORWARD; } @@ -68,3 +96,24 @@ function searchableText(value, options = {}) { const text = String(value); return options.matchCase ? text : text.toLocaleLowerCase(); } + +function replaceText(value, query, replacement, options = {}) { + const source = String(value); + const needle = searchableText(query, options); + if (!needle) return { value: source, count: 0 }; + const haystack = searchableText(source, options); + const replacementText = String(replacement); + const limit = Number.isFinite(options.limit) ? Math.max(0, options.limit) : Number.POSITIVE_INFINITY; + let cursor = 0; + let count = 0; + let result = ""; + while (cursor <= source.length && count < limit) { + const match = haystack.indexOf(needle, cursor); + if (match < 0) break; + result += source.slice(cursor, match) + replacementText; + cursor = match + String(query).length; + count += 1; + } + if (!count) return { value: source, count: 0 }; + return { value: result + source.slice(cursor), count }; +} diff --git a/src/styles.css b/src/styles.css index d90fc20..586f292 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1447,6 +1447,7 @@ details:not([open]) .problem-file-header::before { min-width: 188px; max-width: 240px; max-height: calc(100vh - 16px); + overflow-x: hidden; overflow-y: auto; padding: 4px; border: 1px solid var(--gridLine); @@ -1608,6 +1609,18 @@ details:not([open]) .problem-file-header::before { margin-bottom: 0; } +.search-replace-row { + display: grid; + gap: 6px; + color: var(--muted); + font-size: 12px; +} + +.search-replace-row.hidden, +.search-replace-actions.hidden { + display: none; +} + .search-scope { display: flex; width: fit-content; diff --git a/src/ui/app-elements.js b/src/ui/app-elements.js index 7feb844..bdae008 100644 --- a/src/ui/app-elements.js +++ b/src/ui/app-elements.js @@ -27,7 +27,11 @@ export const APP_ELEMENT_IDS = Object.freeze({ lintRulesPanel: "lintRulesPanel", lintSummary: "lintSummary", searchPanel: "searchPanel", + searchTitle: "searchTitle", searchInput: "searchInput", + searchReplaceRow: "searchReplaceRow", + searchReplaceInput: "searchReplaceInput", + searchReplaceActions: "searchReplaceActions", searchStatus: "searchStatus", palette: "palette", paletteInput: "paletteInput", diff --git a/src/ui/canvas-grid.js b/src/ui/canvas-grid.js index b2ec0b7..03fd00b 100644 --- a/src/ui/canvas-grid.js +++ b/src/ui/canvas-grid.js @@ -600,6 +600,8 @@ export class CanvasGrid { key, shiftKey: event.shiftKey, ctrlKey: event.ctrlKey, + altKey: event.altKey, + metaKey: event.metaKey, focus: this.selection.focus, rowCount: this.doc.rowCount, columnCount: this.doc.columnCount, @@ -645,7 +647,14 @@ export class CanvasGrid { } onEditorKeyDown(event) { - const keyAction = editorKeyAction({ key: event.key, shiftKey: event.shiftKey, editMode: this.editMode }); + const keyAction = editorKeyAction({ + key: event.key, + shiftKey: event.shiftKey, + ctrlKey: event.ctrlKey, + altKey: event.altKey, + metaKey: event.metaKey, + editMode: this.editMode + }); if (keyAction.action === "commit-move") { event.preventDefault(); this.commitEdit(); diff --git a/src/ui/codemirror-json-editor-entry.js b/src/ui/codemirror-json-editor-entry.js index abb4bf8..46552fd 100644 --- a/src/ui/codemirror-json-editor-entry.js +++ b/src/ui/codemirror-json-editor-entry.js @@ -187,6 +187,15 @@ export function openJsonSearch(view) { return Boolean(view && openSearchPanel(view)); } +export function openJsonReplace(view) { + if (!view) return false; + const opened = openSearchPanel(view); + const replaceInput = view.dom.querySelector(".cm-search input[name='replace']"); + replaceInput?.focus(); + replaceInput?.select(); + return Boolean(opened); +} + export function findNextJson(view) { return Boolean(view && findNext(view)); } diff --git a/src/ui/command-registry.js b/src/ui/command-registry.js index 9996455..2d2c662 100644 --- a/src/ui/command-registry.js +++ b/src/ui/command-registry.js @@ -5,6 +5,11 @@ export const COMMAND_LABELS_BASE = [ ["save-as", "Save As"], ["search", "Find/Search"], ["find-next", "Find Next"], + ["find-previous", "Find Previous"], + ["replace", "Find and Replace"], + ["go-to-row", "Go to Row"], + ["next-tab", "Next Tab"], + ["previous-tab", "Previous Tab"], ["undo", "Undo"], ["redo", "Redo"], ["copy", "Copy"], @@ -21,6 +26,7 @@ export const COMMAND_LABELS_BASE = [ ["unhide-all", "Unhide All"], ["add-column", "Add Column"], ["insert-column", "Insert Columns..."], + ["clone-column", "Clone Column(s)"], ["delete-column", "Delete Column"], ["clear-column", "Clear Column"], ["hide-column", "Hide Column"], @@ -88,6 +94,11 @@ const COMMAND_ACTIONS = new Map([ ["redo", { type: "handler", name: "redo" }], ["search", { type: "handler", name: "showSearch" }], ["find-next", { type: "handler", name: "findNext" }], + ["find-previous", { type: "handler", name: "findPrevious" }], + ["replace", { type: "handler", name: "showReplace" }], + ["go-to-row", { type: "handler", name: "goToRow" }], + ["next-tab", { type: "handler", name: "nextTab" }], + ["previous-tab", { type: "handler", name: "previousTab" }], ["copy", { type: "handler", name: "copySelection" }], ["paste", { type: "handler", name: "pasteSelection" }], ["cut", { type: "handler", name: "cutSelection" }], @@ -102,6 +113,7 @@ const COMMAND_ACTIONS = new Map([ ["unhide-rows", { type: "execute", name: "unhideRows" }], ["add-column", { type: "handler", name: "addColumns" }], ["insert-column", { type: "handler", name: "insertColumns" }], + ["clone-column", { type: "handler", name: "cloneColumns" }], ["delete-column", { type: "execute", name: "deleteColumn" }], ["clear-column", { type: "execute", name: "clearColumn" }], ["hide-column", { type: "execute", name: "hideColumn" }], @@ -162,12 +174,13 @@ export function rowCommandItems({ cloneDisabled = false } = {}) { ]; } -export function columnCommandItems() { +export function columnCommandItems({ cloneDisabled = false } = {}) { return [ { id: "add-column", label: "Add Columns..." }, { id: "insert-column", label: "Insert Columns..." }, { id: "hide-column", label: "Hide Column(s)" }, - { id: "delete-column", label: "Delete Column(s)" } + { id: "delete-column", label: "Delete Column(s)" }, + { id: "clone-column", label: "Clone Column(s)", disabled: cloneDisabled } ]; } @@ -188,7 +201,8 @@ export function mathCommandItems() { } const JSON_DOCUMENT_COMMANDS = new Set([ - "open-file", "open-folder", "save-file", "save-as", "search", "find-next", + "open-file", "open-folder", "save-file", "save-as", "search", "find-next", "find-previous", "replace", + "next-tab", "previous-tab", "undo", "redo", "select-all", "toggle-sidebar", "toggle-theme", "open-app-settings", "open-shortcut-settings", "open-settings", "toggle-lint", "toggle-lint-rules", "show-explorer", "show-problems" diff --git a/src/ui/controllers/app-event-controller.js b/src/ui/controllers/app-event-controller.js index a8846d2..d10e5c0 100644 --- a/src/ui/controllers/app-event-controller.js +++ b/src/ui/controllers/app-event-controller.js @@ -35,6 +35,7 @@ export function createAppEventController({ selectAll, jsonEditorOwnsTarget = () => false, handleExternalChangeDialogClick = () => {}, + commitActiveEditor = () => {}, focusActiveEditor = () => els.host.focus() }) { function wireEvents() { @@ -114,11 +115,14 @@ export function createAppEventController({ if (!editingCell && jsonEditorOwnsTarget(event.target)) { const appOwned = new Set([ "open-file", "save-file", "save-as", "toggle-sidebar", "toggle-problems", - "show-palette", "close-tab" + "show-palette", "close-tab", "next-tab", "previous-tab", + "search", "find-next", "find-previous", "replace" ]); if (!shortcutAction || !appOwned.has(shortcutAction)) return; } else if (!editingCell && isTextInputTarget(event.target)) { - return; + const findInOpenSearch = !els.searchPanel.classList.contains("hidden") + && (shortcutAction === "find-next" || shortcutAction === "find-previous"); + if (!findInOpenSearch) return; } if (shortcutAction) return runGlobalShortcutAction(event, shortcutAction); } @@ -151,6 +155,12 @@ export function createAppEventController({ if (action === "save-as") return prevent(event, saveAs); if (action === "save-file") return prevent(event, saveFile); if (action === "search") return prevent(event, searchController.showSearch); + if (action === "find-next") return prevent(event, () => runEditorNavigationCommand("find-next")); + if (action === "find-previous") return prevent(event, () => runEditorNavigationCommand("find-previous")); + if (action === "replace") return prevent(event, () => runEditorNavigationCommand("replace")); + if (action === "go-to-row") return prevent(event, () => runEditorNavigationCommand("go-to-row")); + if (action === "next-tab") return prevent(event, () => runEditorNavigationCommand("next-tab")); + if (action === "previous-tab") return prevent(event, () => runEditorNavigationCommand("previous-tab")); if (action === "redo") return prevent(event, redo); if (action === "undo") return prevent(event, undo); if (action === "show-palette") return prevent(event, showPalette); @@ -163,6 +173,11 @@ export function createAppEventController({ return undefined; } + function runEditorNavigationCommand(action) { + commitActiveEditor(); + return runCommand(action); + } + function prevent(event, fn) { event.preventDefault(); Promise.resolve(fn()).catch(showError); diff --git a/src/ui/controllers/command-surface-controller.js b/src/ui/controllers/command-surface-controller.js index ac60bf0..1b7c9b2 100644 --- a/src/ui/controllers/command-surface-controller.js +++ b/src/ui/controllers/command-surface-controller.js @@ -57,7 +57,7 @@ export function createCommandSurfaceController({ const focusRow = hit?.row ?? state.selection.focus.row; const focusCol = hit?.column ?? state.selection.focus.column; const entries = [ - { type: "submenu", label: "Column Operations", items: columnCommandItems() }, + { type: "submenu", label: "Column Operations", items: columnItems() }, { type: "submenu", label: "Row Operations", items: rowItems() }, { id: "resize-fit", label: "Resize To Fit" }, { id: "resize-selected-fit", label: "Resize Selected To Fit" }, @@ -85,6 +85,9 @@ export function createCommandSurfaceController({ activate(); }); } + for (const button of els.contextMenu.querySelectorAll(":scope > button[data-run]")) { + button.addEventListener("mouseenter", closeContextSubmenu); + } els.contextMenu.classList.remove("hidden"); els.contextMenu.dataset.x = String(x); els.contextMenu.dataset.y = String(y); @@ -113,6 +116,11 @@ export function createCommandSurfaceController({ positionSubmenu(group); } + function closeContextSubmenu() { + state.contextMenuActiveGroup = ""; + for (const group of els.contextMenu.querySelectorAll(".menu-group.active")) group.classList.remove("active"); + } + function positionSubmenu(group) { const submenu = group.querySelector(".submenu"); if (!submenu) return; @@ -138,7 +146,7 @@ export function createCommandSurfaceController({ els.contextMenu.classList.add("hidden"); Object.assign(state, contextMenuHiddenState()); setContextMenuOpen(false); - for (const group of els.contextMenu.querySelectorAll(".menu-group.active")) group.classList.remove("active"); + closeContextSubmenu(); } function setContextMenuOpen(open) { @@ -167,6 +175,11 @@ export function createCommandSurfaceController({ return rowCommandItems({ cloneDisabled }); } + function columnItems() { + const cloneDisabled = activeDoc().columnCount === 0; + return columnCommandItems({ cloneDisabled }); + } + return { hideContextMenu, positionContextMenu, diff --git a/src/ui/controllers/grid-command-controller.js b/src/ui/controllers/grid-command-controller.js index 590c4f2..dffcf81 100644 --- a/src/ui/controllers/grid-command-controller.js +++ b/src/ui/controllers/grid-command-controller.js @@ -1,6 +1,7 @@ import { clamp } from "../../core/table-model.js"; import { makeCustomCommand } from "../../core/undo.js"; import { + cloneColumnsCommand, cloneRowsCommand, hiddenColumnsCommand, hiddenRowsCommand, @@ -19,6 +20,7 @@ export function createGridCommandController({ saveSelectionState, renderChrome, showError, + promptNumber = async () => null, applyFreezeToDoc, rowsForContextOperation, columnsFromSelection, @@ -75,6 +77,26 @@ export function createGridCommandController({ renderChrome(); } + async function goToRow() { + if (!hasOpenDocument()) return; + const doc = activeDoc(); + const rowNumber = await promptNumber({ + title: "Go to Row", + message: `Enter a row number from 1 to ${doc.rowCount}.`, + defaultValue: Math.min(doc.rowCount, state.selection.focus.row + 1), + min: 1, + max: doc.rowCount + }); + if (rowNumber === null) return; + const row = rowNumber - 1; + const column = clamp(state.selection.focus.column, 0, Math.max(0, doc.columnCount - 1)); + state.selection.set(row, column); + saveSelectionState(doc); + grid.scrollCellToCenter(row, column); + grid.draw(); + renderChrome(); + } + function resizeFit(useSelection) { const doc = activeDoc(); const columns = useSelection ? columnsFromSelection() : indexRange(0, doc.columnCount - 1); @@ -97,14 +119,14 @@ export function createGridCommandController({ const doc = activeDoc(); const rows = rowsForContextOperation().filter((row) => row > 0 && row < doc.rowCount); if (!rows.length) return showError("Select one or more body rows to clone."); - const insertAt = clamp(Math.max(...rows) + 1, 1, doc.rowCount); - execute(cloneRowsCommand(doc, rows, insertAt)); - const column = clamp(state.selection.focus.column, 0, Math.max(0, doc.columnCount - 1)); - state.selection.setRange(insertAt, 0, insertAt + rows.length - 1, doc.columnCount - 1, { row: insertAt, column }); - saveSelectionState(doc); - grid.scrollCellIntoView(insertAt, column); - grid.draw(); - renderChrome(); + execute(cloneRowsCommand(doc, rows, doc.rowCount)); + } + + function cloneColumns() { + const doc = activeDoc(); + const columns = columnsFromSelection().filter((column) => column >= 0 && column < doc.columnCount); + if (!columns.length) return showError("Select one or more columns to clone."); + execute(cloneColumnsCommand(doc, columns, doc.columnCount)); } function commitResize(resize) { @@ -121,9 +143,11 @@ export function createGridCommandController({ zoomBy, zoomReset, resetRowHeights, + goToRow, resizeFit, autoFitColumns, cloneRows, + cloneColumns, commitResize }; } diff --git a/src/ui/controllers/json-editor-controller.js b/src/ui/controllers/json-editor-controller.js index af51a77..588b576 100644 --- a/src/ui/controllers/json-editor-controller.js +++ b/src/ui/controllers/json-editor-controller.js @@ -136,6 +136,7 @@ export function createJsonEditorController({ findPrevious: () => run("findPreviousJson"), focusActive, navigateToDiagnostic, + openReplace: () => run("openJsonReplace"), openSearch: () => run("openJsonSearch"), reconcileDiagnosticHighlight, refreshAppearance, diff --git a/src/ui/controllers/search-controller.js b/src/ui/controllers/search-controller.js index 67127bf..c2ec732 100644 --- a/src/ui/controllers/search-controller.js +++ b/src/ui/controllers/search-controller.js @@ -3,7 +3,9 @@ import { SEARCH_DIRECTION_BACKWARD, SEARCH_DIRECTION_FORWARD, findInTable, - normalizeSearchScope + normalizeSearchScope, + replaceAllInTable, + replaceNextInTable } from "../../core/search.js"; import { clampSearchModalPosition, @@ -17,7 +19,17 @@ import { shouldSubmitSearchKey } from "../search-policy.js"; -export function createSearchController({ state, els, grid, activeDoc, updateActiveProblemHighlight, saveSelectionState = () => {}, jsonSearch = null, focusActiveEditor = () => els.host.focus() }) { +export function createSearchController({ + state, + els, + grid, + activeDoc, + updateActiveProblemHighlight, + saveSelectionState = () => {}, + applyEdits = () => {}, + jsonSearch = null, + focusActiveEditor = () => els.host.focus() +}) { const searchModalCandidate = els.searchPanel.querySelector?.(".search-modal"); const searchModal = searchModalCandidate?.classList && typeof searchModalCandidate.getBoundingClientRect === "function" @@ -89,6 +101,7 @@ export function createSearchController({ state, els, grid, activeDoc, updateActi function showSearch() { if (isJsonDocument(activeDoc())) return jsonSearch?.openSearch?.(); + setReplaceMode(false); Object.assign(state.search, searchStateAfterInput()); els.searchPanel.classList.remove("hidden"); clampSearchModalToViewport(); @@ -96,6 +109,22 @@ export function createSearchController({ state, els, grid, activeDoc, updateActi els.searchInput.select(); } + function showReplace() { + if (isJsonDocument(activeDoc())) return jsonSearch?.openReplace?.(); + setReplaceMode(true); + Object.assign(state.search, searchStateAfterInput()); + els.searchPanel.classList.remove("hidden"); + clampSearchModalToViewport(); + els.searchInput.focus(); + els.searchInput.select(); + } + + function setReplaceMode(enabled) { + if (els.searchTitle) els.searchTitle.textContent = enabled ? "Find and Replace" : "Find"; + setElementHidden(els.searchReplaceRow, !enabled); + setElementHidden(els.searchReplaceActions, !enabled); + } + function closeSearch() { searchDrag = null; els.searchPanel.classList.add("hidden"); @@ -141,6 +170,47 @@ export function createSearchController({ state, els, grid, activeDoc, updateActi return find(SEARCH_DIRECTION_BACKWARD); } + function replaceNext() { + if (isJsonDocument(activeDoc())) return jsonSearch?.openReplace?.(); + const query = els.searchInput.value; + const scope = selectedSearchScope(); + const focus = state.selection.focus; + const result = replaceNextInTable(activeDoc(), query, els.searchReplaceInput?.value ?? "", focus, { scope }); + if (!result.found || !result.replacementCount) { + els.searchStatus.textContent = "No results"; + return false; + } + applyEdits(result.edits, "Replace"); + const target = searchTargetForResult(scope, result.found, focus); + Object.assign(state.search, searchStateAfterFind(query, scope)); + state.selection.set(target.row, target.column); + saveSelectionState(); + grid.scrollCellToCenter(target.row, target.column, searchScrollOptionsForScope(scope)); + grid.draw(); + updateActiveProblemHighlight(); + els.searchStatus.textContent = `Replaced 1 match at ${searchStatusText(scope, result.found, target)}`; + return true; + } + + function replaceAll() { + if (isJsonDocument(activeDoc())) return jsonSearch?.openReplace?.(); + const query = els.searchInput.value; + const scope = selectedSearchScope(); + const result = replaceAllInTable(activeDoc(), query, els.searchReplaceInput?.value ?? "", { scope }); + if (!result.replacementCount) { + els.searchStatus.textContent = "No results"; + return 0; + } + applyEdits(result.edits, "Replace All"); + Object.assign(state.search, searchStateAfterInput()); + saveSelectionState(); + grid.draw(); + updateActiveProblemHighlight(); + const cells = result.edits.length; + els.searchStatus.textContent = `Replaced ${result.replacementCount} match${result.replacementCount === 1 ? "" : "es"} in ${cells} cell${cells === 1 ? "" : "s"}`; + return result.replacementCount; + } + function submitSearch(event) { if (!shouldSubmitSearchKey(event.key)) return false; event.preventDefault(); @@ -160,6 +230,16 @@ export function createSearchController({ state, els, grid, activeDoc, updateActi els.searchInput.addEventListener("input", () => { Object.assign(state.search, searchStateAfterInput()); }); + els.searchReplaceInput?.addEventListener("keydown", (event) => { + if (shouldSubmitSearchKey(event.key)) { + event.preventDefault(); + replaceNext(); + } + if (shouldCloseSearchKey(event.key)) { + event.preventDefault(); + closeSearch(); + } + }); els.searchPanel.querySelectorAll("input[name='searchScope']").forEach((input) => { input.addEventListener("keydown", submitSearch); input.addEventListener("change", () => { @@ -168,6 +248,8 @@ export function createSearchController({ state, els, grid, activeDoc, updateActi }); els.searchPanel.addEventListener("click", (event) => { if (event.target.closest("[data-search-previous]")) findPrevious(); + if (event.target.closest("[data-search-replace]")) replaceNext(); + if (event.target.closest("[data-search-replace-all]")) replaceAll(); if (event.target === els.searchPanel || event.target.closest("[data-search-close]")) closeSearch(); }); els.searchPanel.addEventListener("wheel", (event) => { @@ -186,7 +268,16 @@ export function createSearchController({ state, els, grid, activeDoc, updateActi closeSearch, findNext, findPrevious, + replaceAll, + replaceNext, + showReplace, showSearch, wireEvents }; } + +function setElementHidden(element, hidden) { + if (!element?.classList) return; + if (hidden) element.classList.add("hidden"); + else element.classList.remove("hidden"); +} diff --git a/src/ui/controllers/shell-controller.js b/src/ui/controllers/shell-controller.js index 10d1771..9bfa29a 100644 --- a/src/ui/controllers/shell-controller.js +++ b/src/ui/controllers/shell-controller.js @@ -1,4 +1,5 @@ import { isJsonDocument, isTableDocument } from "../../core/document-file-state.js"; +import { cyclicDocumentIndex } from "../document-lifecycle-policy.js"; import { renderWorkspaceFileList } from "../workspace-file-list-policy.js"; export function createShellController({ @@ -25,6 +26,7 @@ export function createShellController({ syncProblemsHeaderLayout, scheduleHoverPrewarm, ensureDocumentSession = async () => {}, + commitActiveEditor = () => {}, saveSelectionState = () => {}, recordUiPerf, perfNow, @@ -176,6 +178,8 @@ export function createShellController({ } function selectTab(index) { + if (index < 0 || index >= state.docs.length) return Promise.resolve(); + commitActiveEditor(); saveSelectionState(); state.active = index; const doc = activeDoc(); @@ -198,6 +202,16 @@ export function createShellController({ return Promise.resolve(); } + function switchTab(delta) { + const index = cyclicDocumentIndex({ + activeIndex: state.active, + documentCount: state.docs.length, + delta + }); + if (index < 0 || index === state.active) return Promise.resolve(); + return selectTab(index); + } + function bindExplorerFilter() { if (!els.explorerFilter || els.explorerFilter.dataset.bound) return; els.explorerFilter.dataset.bound = "true"; @@ -279,6 +293,8 @@ export function createShellController({ return { collapsedFileGroups, renderDiagnosticsChrome, - renderChrome + renderChrome, + selectTab, + switchTab }; } diff --git a/src/ui/document-lifecycle-policy.js b/src/ui/document-lifecycle-policy.js index c0a7989..c7b3f20 100644 --- a/src/ui/document-lifecycle-policy.js +++ b/src/ui/document-lifecycle-policy.js @@ -20,6 +20,12 @@ export function activeIndexAfterTabClose({ activeIndex, closeIndex, documentCoun return Math.max(0, Math.min(remainingCount - 1, next)); } +export function cyclicDocumentIndex({ activeIndex, documentCount, delta = 1 }) { + if (documentCount <= 0) return -1; + const current = Math.max(0, Math.min(documentCount - 1, Number(activeIndex) || 0)); + return ((current + Number(delta || 0)) % documentCount + documentCount) % documentCount; +} + export function closeDialogMessage(doc) { return `${doc.name} has unsaved changes.`; } diff --git a/src/ui/edit-policy.js b/src/ui/edit-policy.js index eb7791d..376c084 100644 --- a/src/ui/edit-policy.js +++ b/src/ui/edit-policy.js @@ -14,7 +14,7 @@ export function arrowNavigationDelta(key) { return { rowDelta: 0, columnDelta: 0 }; } -export function editorKeyAction({ key, shiftKey = false, editMode = null } = {}) { +export function editorKeyAction({ key, shiftKey = false, ctrlKey = false, altKey = false, metaKey = false, editMode = null } = {}) { if (shouldCommitEditOnArrow(editMode, key)) { return { action: "commit-move", ...arrowNavigationDelta(key) }; } @@ -22,6 +22,7 @@ export function editorKeyAction({ key, shiftKey = false, editMode = null } = {}) return { action: "commit-move", rowDelta: shiftKey ? -1 : 1, columnDelta: 0 }; } if (key === "Tab") { + if (ctrlKey || altKey || metaKey) return { action: "none" }; return { action: "commit-move", rowDelta: 0, columnDelta: shiftKey ? -1 : 1 }; } if (key === "Escape") return { action: "cancel" }; diff --git a/src/ui/grid-selection-policy.js b/src/ui/grid-selection-policy.js index dbac04b..6cccf15 100644 --- a/src/ui/grid-selection-policy.js +++ b/src/ui/grid-selection-policy.js @@ -52,8 +52,9 @@ export function hasFullColumnRange(ranges, rowCount) { return ranges.some((rect) => rect.top === 0 && rect.bottom >= rowCount - 1); } -export function keyboardSelectionTarget({ key, shiftKey = false, ctrlKey = false, focus, rowCount, columnCount, jumpRow, jumpColumn }) { +export function keyboardSelectionTarget({ key, shiftKey = false, ctrlKey = false, altKey = false, metaKey = false, focus, rowCount, columnCount, jumpRow, jumpColumn }) { let { row, column } = focus; + if (key === "Tab" && (ctrlKey || altKey || metaKey)) return null; if (key === "Tab") column += shiftKey ? -1 : 1; else if (key === "ArrowDown") row = ctrlKey ? jumpRow(row, 1) : row + 1; else if (key === "ArrowUp") row = ctrlKey ? jumpRow(row, -1) : row - 1; diff --git a/src/ui/prompt-dialog.js b/src/ui/prompt-dialog.js index 4ff5eff..9863b4e 100644 --- a/src/ui/prompt-dialog.js +++ b/src/ui/prompt-dialog.js @@ -54,7 +54,7 @@ export function askText({ title, message, defaultValue = "", inputMode = "text", }); } -export function promptNumber({ title, message, defaultValue = "", min = null, allowFloat = false, askText }) { +export function promptNumber({ title, message, defaultValue = "", min = null, max = null, allowFloat = false, askText }) { return askText({ title, message, @@ -66,6 +66,7 @@ export function promptNumber({ title, message, defaultValue = "", min = null, al if (text === "" || !Number.isFinite(number)) return { error: "Enter a valid number." }; if (!allowFloat && String(number) !== text) return { error: "Enter a whole number." }; if (min !== null && number < min) return { error: `Enter a number ${min} or higher.` }; + if (max !== null && number > max) return { error: `Enter a number ${max} or lower.` }; return { value: number }; } }); diff --git a/src/ui/shortcut-policy.js b/src/ui/shortcut-policy.js index 429fe1d..af28173 100644 --- a/src/ui/shortcut-policy.js +++ b/src/ui/shortcut-policy.js @@ -5,6 +5,10 @@ export const SHORTCUT_DEFINITIONS = Object.freeze([ shortcut("save-file", "Save", ["Ctrl+S"], { allowWhileEditing: true }), shortcut("save-as", "Save As", ["Ctrl+Shift+S"], { allowWhileEditing: true }), shortcut("search", "Find/Search", ["Ctrl+F"]), + shortcut("find-next", "Find Next", ["F3"], { allowWhileEditing: true }), + shortcut("find-previous", "Find Previous", ["Shift+F3"], { allowWhileEditing: true }), + shortcut("replace", "Find and Replace", ["Ctrl+Shift+H"], { allowWhileEditing: true }), + shortcut("go-to-row", "Go to Row", ["Ctrl+G"], { allowWhileEditing: true }), shortcut("undo", "Undo", ["Ctrl+Z"]), shortcut("redo", "Redo", ["Ctrl+Y", "Ctrl+Shift+Z"]), shortcut("copy", "Copy", ["Ctrl+C"]), @@ -14,6 +18,8 @@ export const SHORTCUT_DEFINITIONS = Object.freeze([ shortcut("clear-selection", "Clear Cell(s)", ["Delete"]), shortcut("show-palette", "Command Palette", ["Ctrl+P", "Ctrl+Shift+P"]), shortcut("close-tab", "Close Current Tab", ["Ctrl+W"], { allowWhileEditing: true }), + shortcut("next-tab", "Next Tab", ["Ctrl+Tab"], { allowWhileEditing: true }), + shortcut("previous-tab", "Previous Tab", ["Ctrl+Shift+Tab"], { allowWhileEditing: true }), shortcut("toggle-sidebar", "Toggle Explorer", ["Ctrl+B"]), shortcut("toggle-problems", "Toggle Problems", ["Ctrl+L"], { allowWhileEditing: true }), shortcut("reset-row-heights", "Reset Row Heights", ["Ctrl+H"], { allowWhileEditing: true }), @@ -133,7 +139,8 @@ export function validateShortcutChord(value) { const chord = normalizeShortcutChord(value); if (!chord) return { valid: false, message: "Press a non-modifier key." }; const { key, modifiers } = shortcutChordParts(chord); - if (FIXED_NAVIGATION_KEYS.has(key)) { + const modifiedTab = key === "Tab" && modifiers.some((modifier) => modifier === "Ctrl" || modifier === "Alt" || modifier === "Meta"); + if (FIXED_NAVIGATION_KEYS.has(key) && !modifiedTab) { return { valid: false, message: `${key} is reserved for grid editing and navigation.` }; } if (isPrintableShortcutKey(key) && !modifiers.some((modifier) => modifier === "Ctrl" || modifier === "Alt" || modifier === "Meta")) { @@ -148,10 +155,11 @@ export function shortcutActionForEvent(event, bindings, { } = {}) { const chord = shortcutChordFromEvent(event); if (!chord) return null; + const { key } = shortcutChordParts(chord); for (const definition of SHORTCUT_DEFINITIONS) { if (definition.context !== context) continue; if (editingCell && !definition.allowWhileEditing) continue; - if (editingCell && !event.ctrlKey && !event.altKey && !event.metaKey) continue; + if (editingCell && !event.ctrlKey && !event.altKey && !event.metaKey && !isFunctionShortcutKey(key)) continue; const assigned = Array.isArray(bindings?.[definition.action]) ? bindings[definition.action] : definition.defaults; if (assigned.includes(chord)) return definition.action; } @@ -236,3 +244,7 @@ function shortcutChordParts(chord) { function isPrintableShortcutKey(key) { return key.length === 1 || key === "Space" || key === "Plus" || key === "Minus"; } + +function isFunctionShortcutKey(key) { + return /^F([1-9]|1\d|2[0-4])$/.test(key); +} diff --git a/tests/app-controller.test.js b/tests/app-controller.test.js index 5ea0e75..ea2167b 100644 --- a/tests/app-controller.test.js +++ b/tests/app-controller.test.js @@ -826,7 +826,7 @@ test("closing an active Vector tab waits for didClose before rebinding the revea }); test("context menu command item registries preserve expected command groups", () => { - assert.deepEqual(columnCommandItems().map((item) => item.id), ["add-column", "insert-column", "hide-column", "delete-column"]); + assert.deepEqual(columnCommandItems().map((item) => item.id), ["add-column", "insert-column", "hide-column", "delete-column", "clone-column"]); assert.deepEqual(fillCommandItems().map((item) => item.id), ["fill", "increment-fill"]); assert.deepEqual(mathCommandItems().map((item) => item.id), ["math-add", "math-subtract", "math-multiply", "math-divide"]); const commandSurfaceController = readFileSync(new URL("../src/ui/controllers/command-surface-controller.js", import.meta.url), "utf8"); @@ -1082,7 +1082,7 @@ test("dock drop UI is removed and docked controls keep a single-row Problems hea assert.doesNotMatch(css, /\.problems-panel\[data-dock-edge="left"\] \.lint-controls/); }); -test("context menu uses one explicit active submenu and exposes Clone Row only", () => { +test("context menu uses one explicit active submenu and exposes row and column cloning", () => { const css = readFileSync(new URL("../src/styles.css", import.meta.url), "utf8"); const activeGroup = { dataset: { menuGroup: "Row Operations" } }; const inactiveGroup = { dataset: { menuGroup: "Column Operations" } }; @@ -1092,8 +1092,10 @@ test("context menu uses one explicit active submenu and exposes Clone Row only", assert.equal(contextMenuGroupIsActive(inactiveGroup, activeGroup), false); assert.deepEqual(contextMenuHiddenState(), { contextMenuActiveGroup: "", contextMenuOpen: false }); assert.equal(rowCommandItems().some((item) => item.id === "clone-row" && item.label === "Clone Row"), true); + assert.equal(columnCommandItems().some((item) => item.id === "clone-column" && item.label === "Clone Column(s)"), true); assert.equal(rowCommandItems().some((item) => item.label === "Swap Rows"), false); assert.match(css, /\.menu-group\.active > \.submenu\s*\{\s*display: block;/); + assert.match(css, /\.submenu\s*\{[\s\S]*overflow-x:\s*hidden;[\s\S]*overflow-y:\s*auto;/); assert.doesNotMatch(css, /\.menu-group:hover \.submenu/); }); @@ -1104,6 +1106,13 @@ test("row context menu orders Clone Row after hide and delete without changing c assert.deepEqual(rowItems.at(-1), { id: "clone-row", label: "Clone Row", disabled: true }); }); +test("column context menu orders Clone Column(s) after hide and delete", () => { + const columnItems = columnCommandItems({ cloneDisabled: true }); + const ids = columnItems.map((item) => item.id); + assert.deepEqual(ids, ["add-column", "insert-column", "hide-column", "delete-column", "clone-column"]); + assert.deepEqual(columnItems.at(-1), { id: "clone-column", label: "Clone Column(s)", disabled: true }); +}); + test("Settings modal exposes immediate visual settings without save cancel apply", () => { const css = readFileSync(new URL("../src/styles.css", import.meta.url), "utf8"); const controls = appSettingsVisualControls({ diff --git a/tests/core.test.js b/tests/core.test.js index 9a4c241..976fafc 100644 --- a/tests/core.test.js +++ b/tests/core.test.js @@ -181,7 +181,7 @@ test("prewarm is disabled so background hover cannot block user hover", () => { assert.equal(shouldCancelPrewarmForUserHover(), true); }); -test("version metadata is bumped to TXTeditor 0.4.7", () => { +test("release metadata remains 0.4.7 while the README introduction stays version-independent", () => { const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")); const lock = JSON.parse(readFileSync(new URL("../package-lock.json", import.meta.url), "utf8")); const cargoToml = readFileSync(new URL("../src-tauri/Cargo.toml", import.meta.url), "utf8"); @@ -196,5 +196,6 @@ test("version metadata is bumped to TXTeditor 0.4.7", () => { assert.match(cargoToml, /description = "TXTeditor 0\.4\.7/); assert.match(cargoLock, /name = "txteditor"\r?\nversion = "0\.4\.7"/); assert.equal(tauri.version, "0.4.7"); - assert.match(readme, /TXTeditor 0\.4\.7 is/); + assert.match(readme, /^# TXTeditor\r?\n\r?\nTXTeditor is a Windows-focused desktop editor/); + assert.doesNotMatch(readme, /TXTeditor 0\.4\.7 is/); }); diff --git a/tests/grid-policy.test.js b/tests/grid-policy.test.js index 60fde94..4bea50b 100644 --- a/tests/grid-policy.test.js +++ b/tests/grid-policy.test.js @@ -171,6 +171,8 @@ test("grid keyboard selection target preserves tab and arrow navigation semantic assert.deepEqual(keyboardSelectionTarget({ ...base, key: "Tab" }), { row: 2, column: 3, extend: false }); assert.deepEqual(keyboardSelectionTarget({ ...base, key: "Tab", shiftKey: true }), { row: 2, column: 1, extend: false }); + assert.equal(keyboardSelectionTarget({ ...base, key: "Tab", ctrlKey: true }), null); + assert.equal(keyboardSelectionTarget({ ...base, key: "Tab", ctrlKey: true, shiftKey: true }), null); assert.deepEqual(keyboardSelectionTarget({ ...base, key: "ArrowDown", shiftKey: true }), { row: 3, column: 2, extend: true }); assert.deepEqual(keyboardSelectionTarget({ ...base, key: "ArrowRight", ctrlKey: true }), { row: 2, column: 3, extend: false }); assert.deepEqual(keyboardSelectionTarget({ ...base, key: "ArrowUp", ctrlKey: true }), { row: 0, column: 2, extend: false }); diff --git a/tests/json-document-tabs.test.js b/tests/json-document-tabs.test.js index ab50a5b..bb98498 100644 --- a/tests/json-document-tabs.test.js +++ b/tests/json-document-tabs.test.js @@ -494,6 +494,7 @@ test("JSON editor controller retains state and navigates an exact diagnostic ran let selected = null; let cleared = 0; let measured = 0; + let replaceOpened = 0; const fakeModule = { createJsonEditorState({ text }) { return { doc: { length: text.length, toString: () => text } }; @@ -511,6 +512,7 @@ test("JSON editor controller retains state and navigates an exact diagnostic ran undoJsonEditor() { return true; }, redoJsonEditor() { return true; }, openJsonSearch() { return true; }, + openJsonReplace() { replaceOpened += 1; return true; }, findNextJson() { return true; }, findPreviousJson() { return true; }, selectAllJson() { return true; } @@ -540,6 +542,8 @@ test("JSON editor controller retains state and navigates an exact diagnostic ran assert.equal(cleared, 0, "ordinary editor selection changes must not clear the problem highlight"); controller.refreshAppearance(); assert.equal(measured, 1); + assert.equal(controller.openReplace(), true); + assert.equal(replaceOpened, 1); controller.reconcileDiagnosticHighlight([]); assert.equal(cleared, 1); assert.equal(doc.activeDiagnosticId, null); diff --git a/tests/replace-navigation-shortcuts.test.js b/tests/replace-navigation-shortcuts.test.js new file mode 100644 index 0000000..af76ba3 --- /dev/null +++ b/tests/replace-navigation-shortcuts.test.js @@ -0,0 +1,164 @@ +import assert from "node:assert/strict"; +import test from "node:test"; +import { TableDocument } from "../src/core/table-model.js"; +import { SelectionModel } from "../src/core/selection.js"; +import { + SEARCH_SCOPE_COLUMN_TITLES, + SEARCH_SCOPE_ROW_TITLES, + replaceAllInTable, + replaceNextInTable +} from "../src/core/search.js"; +import { makeCellCommand } from "../src/core/undo.js"; +import { columnCommandItems, commandActionForId } from "../src/ui/command-registry.js"; +import { createGridCommandController } from "../src/ui/controllers/grid-command-controller.js"; +import { cyclicDocumentIndex } from "../src/ui/document-lifecycle-policy.js"; +import { globalShortcutAction } from "../src/ui/global-shortcut-policy.js"; +import { promptNumber } from "../src/ui/prompt-dialog.js"; +import { validateShortcutChord } from "../src/ui/shortcut-policy.js"; + +test("table replace-next and replace-all are case-insensitive and scope-aware", () => { + const doc = TableDocument.fromText("skills.txt", "Name\tDescription\nBash\tbash bash\nZeal\tbash"); + + const next = replaceNextInTable(doc, "BASH", "hit", { row: 1, column: 0 }); + assert.deepEqual(next.found, { row: 1, column: 0 }); + assert.deepEqual(next.edits, [{ row: 1, column: 0, value: "hit" }]); + assert.equal(next.replacementCount, 1); + + const all = replaceAllInTable(doc, "bash", "hit"); + assert.equal(all.replacementCount, 4); + assert.deepEqual(all.edits, [ + { row: 1, column: 0, value: "hit" }, + { row: 1, column: 1, value: "hit hit" }, + { row: 2, column: 1, value: "hit" } + ]); + + assert.equal(replaceAllInTable(doc, "name", "id", { scope: SEARCH_SCOPE_COLUMN_TITLES }).replacementCount, 1); + assert.equal(replaceAllInTable(doc, "zeal", "frenzy", { scope: SEARCH_SCOPE_ROW_TITLES }).replacementCount, 1); +}); + +test("Replace All is recorded as one reversible cell command", () => { + const doc = TableDocument.fromText("skills.txt", "name\tdesc\nbash\tbash bash"); + const result = replaceAllInTable(doc, "bash", "hit"); + const command = makeCellCommand("Replace All", doc, result.edits); + + command.redo(doc); + assert.equal(doc.getCell(1, 0), "hit"); + assert.equal(doc.getCell(1, 1), "hit hit"); + command.undo(doc); + assert.equal(doc.getCell(1, 0), "bash"); + assert.equal(doc.getCell(1, 1), "bash bash"); +}); + +test("new navigation shortcuts map to commands and modified Tab remains configurable", () => { + assert.equal(globalShortcutAction({ key: "F3" }), "find-next"); + assert.equal(globalShortcutAction({ key: "F3", shiftKey: true }), "find-previous"); + assert.equal(globalShortcutAction({ key: "h", ctrlKey: true, shiftKey: true }), "replace"); + assert.equal(globalShortcutAction({ key: "g", ctrlKey: true }), "go-to-row"); + assert.equal(globalShortcutAction({ key: "Tab", ctrlKey: true }), "next-tab"); + assert.equal(globalShortcutAction({ key: "Tab", ctrlKey: true, shiftKey: true }), "previous-tab"); + assert.equal(globalShortcutAction({ key: "F3" }, { editingCell: true }), "find-next"); + assert.equal(globalShortcutAction({ key: "F3", shiftKey: true }, { editingCell: true }), "find-previous"); + assert.equal(globalShortcutAction({ key: "h", ctrlKey: true }), "reset-row-heights"); + assert.equal(validateShortcutChord("Ctrl+Tab").valid, true); + assert.equal(validateShortcutChord("Ctrl+Shift+Tab").valid, true); + assert.equal(validateShortcutChord("Tab").valid, false); + assert.equal(validateShortcutChord("Shift+Tab").valid, false); +}); + +test("new commands are registered with their intended handlers", () => { + assert.deepEqual(commandActionForId("find-previous"), { type: "handler", name: "findPrevious" }); + assert.deepEqual(commandActionForId("replace"), { type: "handler", name: "showReplace" }); + assert.deepEqual(commandActionForId("go-to-row"), { type: "handler", name: "goToRow" }); + assert.deepEqual(commandActionForId("next-tab"), { type: "handler", name: "nextTab" }); + assert.deepEqual(commandActionForId("previous-tab"), { type: "handler", name: "previousTab" }); + assert.deepEqual(commandActionForId("clone-column"), { type: "handler", name: "cloneColumns" }); + assert.deepEqual(columnCommandItems().at(-1), { id: "clone-column", label: "Clone Column(s)", disabled: false }); +}); + +test("tab navigation wraps in both directions", () => { + assert.equal(cyclicDocumentIndex({ activeIndex: 0, documentCount: 3, delta: 1 }), 1); + assert.equal(cyclicDocumentIndex({ activeIndex: 2, documentCount: 3, delta: 1 }), 0); + assert.equal(cyclicDocumentIndex({ activeIndex: 0, documentCount: 3, delta: -1 }), 2); + assert.equal(cyclicDocumentIndex({ activeIndex: 0, documentCount: 0, delta: 1 }), -1); +}); + +test("Go to Row uses the displayed one-based row number", async () => { + const doc = TableDocument.fromText("skills.txt", "name\nrow1\nrow2\nrow3"); + const calls = []; + const state = { + selection: { + focus: { row: 0, column: 0 }, + set(row, column) { this.focus = { row, column }; } + } + }; + const controller = createGridCommandController({ + state, + grid: { + scrollCellToCenter: (row, column) => calls.push(["scroll", row, column]), + draw: () => calls.push(["draw"]) + }, + activeDoc: () => doc, + hasOpenDocument: () => true, + execute: () => {}, + saveSelectionState: () => calls.push(["save"]), + renderChrome: () => calls.push(["render"]), + showError: (error) => { throw error; }, + promptNumber: async (options) => { + assert.equal(options.min, 1); + assert.equal(options.max, 4); + return 3; + }, + applyFreezeToDoc: () => {}, + rowsForContextOperation: () => [], + columnsFromSelection: () => [] + }); + + await controller.goToRow(); + assert.deepEqual(state.selection.focus, { row: 2, column: 0 }); + assert.deepEqual(calls, [["save"], ["scroll", 2, 0], ["draw"], ["render"]]); +}); + +test("Clone Row and Clone Column preserve the existing focus and viewport", () => { + const doc = TableDocument.fromText("skills.txt", "name\tid\tdesc\nbash\t1\tmelee\nzeal\t2\taura"); + const selection = new SelectionModel(); + selection.set(1, 1); + const executed = []; + const controller = createGridCommandController({ + state: { selection }, + grid: { + scrollCellIntoView: () => { throw new Error("Clone must not move the viewport."); }, + draw: () => {} + }, + activeDoc: () => doc, + hasOpenDocument: () => true, + execute: (command) => { + command.redo(doc); + executed.push(command.label); + }, + saveSelectionState: () => {}, + renderChrome: () => {}, + showError: (error) => { throw new Error(String(error)); }, + applyFreezeToDoc: () => {}, + rowsForContextOperation: () => [1], + columnsFromSelection: () => [1] + }); + + controller.cloneRows(); + assert.deepEqual(selection.focus, { row: 1, column: 1 }); + assert.equal(doc.getCell(3, 0), "bash"); + controller.cloneColumns(); + assert.deepEqual(selection.focus, { row: 1, column: 1 }); + assert.equal(doc.getCell(1, 3), "1"); + assert.deepEqual(executed, ["Clone 1 Row(s)", "Clone 1 Column(s)"]); +}); + +test("numeric prompts can enforce an upper bound", async () => { + const result = await promptNumber({ + title: "Go to Row", + message: "Row", + min: 1, + max: 3, + askText: async ({ validate }) => validate("4") + }); + assert.deepEqual(result, { error: "Enter a number 3 or lower." }); +}); diff --git a/tests/search-controller-regression.test.js b/tests/search-controller-regression.test.js index 494d9e3..de49dfd 100644 --- a/tests/search-controller-regression.test.js +++ b/tests/search-controller-regression.test.js @@ -48,6 +48,9 @@ function table(rows) { columnCount: Math.max(...rows.map((row) => row.length)), getCell(row, column) { return rows[row]?.[column] ?? ""; + }, + setCell(row, column, value) { + rows[row][column] = String(value); } }; } @@ -99,6 +102,10 @@ function searchHarness({ focus: () => {}, select: () => {} }); + const searchReplaceInput = eventTarget({ value: "replacement", focus: () => {}, select: () => {} }); + const searchReplaceRow = { classList: classList(["hidden"]) }; + const searchReplaceActions = { classList: classList(["hidden"]) }; + const searchTitle = { textContent: "Find" }; const selection = { focus: { ...focus }, set(row, column) { @@ -110,11 +117,16 @@ function searchHarness({ selection }; const scrolls = []; + const doc = table(rows); const controller = createSearchController({ state, els: { host: { focus: () => {} }, searchInput, + searchReplaceInput, + searchReplaceRow, + searchReplaceActions, + searchTitle, searchPanel: panel, searchStatus: { textContent: "" } }, @@ -123,10 +135,25 @@ function searchHarness({ scrollByWheel: () => {}, draw: () => {} }, - activeDoc: () => table(rows), - updateActiveProblemHighlight: () => {} + activeDoc: () => doc, + updateActiveProblemHighlight: () => {}, + applyEdits: (edits) => edits.forEach(({ row, column, value }) => doc.setCell(row, column, value)) }); - return { controller, handle, modal, panel, scopeInput, searchInput, state, scrolls }; + return { + controller, + handle, + modal, + panel, + scopeInput, + searchInput, + searchReplaceInput, + searchReplaceRow, + searchReplaceActions, + searchTitle, + state, + scrolls, + rows + }; } test("opening Find starts again at the active cell and subsequent searches advance and wrap", () => { @@ -238,3 +265,27 @@ test("search modal clamp keeps all edges within the configured margin", () => { viewportHeight: 600 }), { left: 8, top: 372 }); }); + +test("Find and Replace mode exposes replacement controls and applies edit batches", () => { + const harness = searchHarness({ + rows: [["name", "description"], ["bash", "bash bash"], ["zeal", "bash"]], + focus: { row: 1, column: 0 }, + query: "bash" + }); + harness.searchReplaceInput.value = "hit"; + + harness.controller.showReplace(); + assert.equal(harness.searchTitle.textContent, "Find and Replace"); + assert.equal(harness.searchReplaceRow.classList.contains("hidden"), false); + assert.equal(harness.searchReplaceActions.classList.contains("hidden"), false); + + assert.equal(harness.controller.replaceNext(), true); + assert.equal(harness.rows[1][0], "hit"); + assert.equal(harness.controller.replaceAll(), 3); + assert.deepEqual(harness.rows, [["name", "description"], ["hit", "hit hit"], ["zeal", "hit"]]); + + harness.controller.showSearch(); + assert.equal(harness.searchTitle.textContent, "Find"); + assert.equal(harness.searchReplaceRow.classList.contains("hidden"), true); + assert.equal(harness.searchReplaceActions.classList.contains("hidden"), true); +}); diff --git a/tests/table-document-state.test.js b/tests/table-document-state.test.js index 7939989..b44fcc4 100644 --- a/tests/table-document-state.test.js +++ b/tests/table-document-state.test.js @@ -22,6 +22,7 @@ import { import { addColumnsCommand, addRowsCommand, + cloneColumnsCommand, cloneRowsCommand, copyRange, copyRanges, @@ -230,23 +231,45 @@ test("insert and delete row are grouped undoable commands", () => { assert.equal(doc.getCell(1, 1), "2"); }); -test("clone rows inserts body-row copies below the selected range and skips the header row", () => { +test("clone rows appends body-row copies at the end and skips the header row", () => { const doc = TableDocument.fromText("x.txt", "a\tb\n1\t2\n3\t4\n5\t6"); const undo = new UndoManager(); - const command = cloneRowsCommand(doc, [0, 1, 2], 3); + const command = cloneRowsCommand(doc, [0, 1, 2]); command.redo(doc); undo.push(command); assert.equal(doc.dirty, true); assert.equal(doc.rowCount, 6); - assert.equal(doc.getCell(3, 0), "1"); - assert.equal(doc.getCell(4, 0), "3"); - assert.equal(doc.getCell(5, 0), "5"); + assert.equal(doc.getCell(3, 0), "5"); + assert.equal(doc.getCell(4, 0), "1"); + assert.equal(doc.getCell(5, 0), "3"); undo.undo(doc); assert.equal(doc.rowCount, 4); assert.equal(doc.getCell(3, 0), "5"); undo.redo(doc); - assert.equal(doc.getCell(3, 1), "2"); - assert.equal(doc.getCell(4, 1), "4"); + assert.equal(doc.getCell(4, 1), "2"); + assert.equal(doc.getCell(5, 1), "4"); +}); + +test("clone columns copies headers, body values, and widths as one undoable command", () => { + const doc = TableDocument.fromText("x.txt", "a\tb\tc\n1\t2\t3\n4\t5\t6"); + doc.columnWidths[0] = 170; + doc.columnWidths[2] = 230; + const undo = new UndoManager(); + const command = cloneColumnsCommand(doc, [0, 2], 3); + command.redo(doc); + undo.push(command); + assert.equal(doc.columnCount, 5); + assert.deepEqual(doc.rows, [ + ["a", "b", "c", "a", "c"], + ["1", "2", "3", "1", "3"], + ["4", "5", "6", "4", "6"] + ]); + assert.deepEqual(doc.columnWidths.slice(3), [170, 230]); + undo.undo(doc); + assert.equal(doc.columnCount, 3); + assert.deepEqual(doc.rows[1], ["1", "2", "3"]); + undo.redo(doc); + assert.deepEqual(doc.rows[2], ["4", "5", "6", "4", "6"]); }); test("add row and add column append grouped undoable changes", () => { @@ -775,6 +798,8 @@ test("only quick edit mode commits on arrow-key cell navigation", () => { assert.deepEqual(editorKeyAction({ key: "ArrowDown", editMode: "explicit" }), { action: "none" }); assert.deepEqual(editorKeyAction({ key: "Enter", shiftKey: true, editMode: "explicit" }), { action: "commit-move", rowDelta: -1, columnDelta: 0 }); assert.deepEqual(editorKeyAction({ key: "Tab", shiftKey: false, editMode: "explicit" }), { action: "commit-move", rowDelta: 0, columnDelta: 1 }); + assert.deepEqual(editorKeyAction({ key: "Tab", ctrlKey: true, editMode: "explicit" }), { action: "none" }); + assert.deepEqual(editorKeyAction({ key: "Tab", ctrlKey: true, shiftKey: true, editMode: "explicit" }), { action: "none" }); assert.deepEqual(editorKeyAction({ key: "Escape", editMode: "quick" }), { action: "cancel" }); assert.deepEqual(editorKeyAction({ key: "a", editMode: "quick" }), { action: "none" }); }); From c71fdad88288cfeddca287c083cf279c43746634 Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Sun, 19 Jul 2026 07:15:27 +0900 Subject: [PATCH 04/12] Fix JSON Ctrl-G go-to-line shortcut --- src/ui/codemirror-json-editor-entry.js | 2 ++ tests/issue-61-json-go-to-line.test.js | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 tests/issue-61-json-go-to-line.test.js diff --git a/src/ui/codemirror-json-editor-entry.js b/src/ui/codemirror-json-editor-entry.js index 46552fd..2d11cac 100644 --- a/src/ui/codemirror-json-editor-entry.js +++ b/src/ui/codemirror-json-editor-entry.js @@ -21,6 +21,7 @@ import { import { findNext, findPrevious, + gotoLine, highlightSelectionMatches, openSearchPanel, searchKeymap @@ -127,6 +128,7 @@ export function createJsonEditorState({ text = "", lineSeparator = "\n", onChang lintGutter(), EditorView.lineWrapping, keymap.of([ + { key: "Ctrl-g", run: gotoLine }, indentWithTab, ...defaultKeymap, ...historyKeymap, diff --git a/tests/issue-61-json-go-to-line.test.js b/tests/issue-61-json-go-to-line.test.js new file mode 100644 index 0000000..00699f8 --- /dev/null +++ b/tests/issue-61-json-go-to-line.test.js @@ -0,0 +1,24 @@ +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import test from "node:test"; + +test("JSON editor routes Ctrl-g to go-to-line before the search keymap", () => { + const source = readFileSync( + new URL("../src/ui/codemirror-json-editor-entry.js", import.meta.url), + "utf8" + ); + + assert.match( + source, + /import\s*\{[\s\S]*?\bgotoLine\b[\s\S]*?\}\s*from "@codemirror\/search";/ + ); + + const goToLineBinding = source.indexOf('{ key: "Ctrl-g", run: gotoLine }'); + const searchKeymap = source.indexOf("...searchKeymap"); + assert.notEqual(goToLineBinding, -1, "the JSON editor must bind Ctrl-g to gotoLine"); + assert.notEqual(searchKeymap, -1, "the search keymap must remain installed"); + assert.ok( + goToLineBinding < searchKeymap, + "the explicit Ctrl-g binding must precede searchKeymap's Mod-g find-next binding" + ); +}); From 4d41b897afb46225c879fe1883bcd17c4dc1a2da Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Sun, 19 Jul 2026 07:16:42 +0900 Subject: [PATCH 05/12] Fix JSON diagnostic navigation for CRLF documents --- src/ui/controllers/json-editor-controller.js | 5 ++- tests/issue-62-json-diagnostic-crlf.test.js | 34 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 tests/issue-62-json-diagnostic-crlf.test.js diff --git a/src/ui/controllers/json-editor-controller.js b/src/ui/controllers/json-editor-controller.js index 588b576..0ebed1c 100644 --- a/src/ui/controllers/json-editor-controller.js +++ b/src/ui/controllers/json-editor-controller.js @@ -75,7 +75,10 @@ export function createJsonEditorController({ character: diagnostic.endCharacter ?? diagnostic.startCharacter ?? diagnostic.columnIndex ?? 0 } }; - moduleApi.selectAndReveal(view, lspRangeToJsonOffsets(doc.text, range)); + moduleApi.selectAndReveal( + view, + lspRangeToJsonOffsets(view.state.doc.toString(), range) + ); return true; } diff --git a/tests/issue-62-json-diagnostic-crlf.test.js b/tests/issue-62-json-diagnostic-crlf.test.js new file mode 100644 index 0000000..e9e4a77 --- /dev/null +++ b/tests/issue-62-json-diagnostic-crlf.test.js @@ -0,0 +1,34 @@ +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import test from "node:test"; + +import { lspRangeToJsonOffsets } from "../src/core/json-document.js"; + +test("JSON diagnostic navigation uses CodeMirror offsets for CRLF documents", () => { + const rawText = "\u{feff}[\r\n {\"Key\":\"first\"},\r\n {\"Key\":\"??\"}\r\n]\r\n"; + const editorText = rawText.replaceAll("\r\n", "\n"); + const range = { + start: { line: 2, character: 10 }, + end: { line: 2, character: 12 } + }; + const expectedStart = editorText.indexOf("??"); + + assert.deepEqual(lspRangeToJsonOffsets(editorText, range), { + start: expectedStart, + end: expectedStart + 2 + }); + assert.deepEqual(lspRangeToJsonOffsets(rawText, range), { + start: expectedStart + 2, + end: expectedStart + 4 + }); + + const controllerSource = readFileSync( + new URL("../src/ui/controllers/json-editor-controller.js", import.meta.url), + "utf8" + ); + assert.match( + controllerSource, + /lspRangeToJsonOffsets\(\s*view\.state\.doc\.toString\(\),\s*range\s*\)/ + ); + assert.doesNotMatch(controllerSource, /lspRangeToJsonOffsets\(doc\.text, range\)/); +}); From 2b562009f032583e0a96c867c4b088d7805b0a0c Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Sun, 19 Jul 2026 12:39:37 +0900 Subject: [PATCH 06/12] fix: serialize native clipboard operations (#65) --- src-tauri/Cargo.lock | 17 +- src-tauri/Cargo.toml | 2 +- src-tauri/capabilities/default.json | 2 - src-tauri/src/clipboard.rs | 177 ++++++++++++++++++ src-tauri/src/lib.rs | 6 +- src/ui/app-runtime-utils.js | 4 +- src/ui/controllers/edit-command-controller.js | 26 ++- tests/clipboard-runtime.test.js | 105 +++++++++-- tests/platform-tauri-contract.test.js | 3 + 9 files changed, 303 insertions(+), 39 deletions(-) create mode 100644 src-tauri/src/clipboard.rs diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1af87df..7ab9762 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3405,21 +3405,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "tauri-plugin-clipboard-manager" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206dc20af4ed210748ba945c2774e60fd0acd52b9a73a028402caf809e9b6ecf" -dependencies = [ - "arboard", - "log", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "thiserror 2.0.18", -] - [[package]] name = "tauri-plugin-dialog" version = "2.7.1" @@ -3936,6 +3921,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" name = "txteditor" version = "0.4.7" dependencies = [ + "arboard", "globset", "notify", "serde", @@ -3943,7 +3929,6 @@ dependencies = [ "sha2", "tauri", "tauri-build", - "tauri-plugin-clipboard-manager", "tauri-plugin-dialog", "tokio", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 0e8331c..03b4f04 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,12 +18,12 @@ path = "src/main.rs" tauri-build = { version = "2", features = [] } [dependencies] +arboard = { version = "3.6.1", features = ["wayland-data-control"] } globset = "0.4.16" notify = "8.2.0" serde = { version = "1", features = ["derive"] } serde_json = "1" sha2 = "0.10.9" tauri = { version = "2", features = [] } -tauri-plugin-clipboard-manager = "2" tauri-plugin-dialog = "2" tokio = { version = "1", features = ["sync", "time"] } diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index 5a3d3a9..d03d169 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -5,8 +5,6 @@ "windows": ["main"], "permissions": [ "core:default", - "clipboard-manager:allow-read-text", - "clipboard-manager:allow-write-text", "dialog:default", "dialog:allow-open", "dialog:allow-save" diff --git a/src-tauri/src/clipboard.rs b/src-tauri/src/clipboard.rs new file mode 100644 index 0000000..70af964 --- /dev/null +++ b/src-tauri/src/clipboard.rs @@ -0,0 +1,177 @@ +use std::sync::{ + atomic::{AtomicBool, Ordering}, + mpsc::{self, Receiver, Sender}, + Arc, +}; +use std::time::Duration; + +use tokio::sync::oneshot; + +const CLIPBOARD_TIMEOUT: Duration = Duration::from_millis(1_000); + +type ClipboardResponse = oneshot::Receiver>; + +enum ClipboardRequest { + Read { + reply: oneshot::Sender>, + lease: ClipboardLease, + }, + Write { + text: String, + reply: oneshot::Sender>, + lease: ClipboardLease, + }, + Shutdown, +} + +struct ClipboardLease { + busy: Arc, +} + +impl ClipboardLease { + fn acquire(busy: &Arc) -> Result { + busy.compare_exchange(false, true, Ordering::AcqRel, Ordering::Acquire) + .map(|_| Self { + busy: Arc::clone(busy), + }) + .map_err(|_| "Clipboard is still busy with a previous native operation.".to_string()) + } +} + +impl Drop for ClipboardLease { + fn drop(&mut self) { + self.busy.store(false, Ordering::Release); + } +} + +pub(crate) struct ClipboardService { + sender: Sender, + busy: Arc, +} + +impl ClipboardService { + pub(crate) fn new() -> Self { + let (sender, receiver) = mpsc::channel(); + let busy = Arc::new(AtomicBool::new(false)); + if let Err(error) = std::thread::Builder::new() + .name("txteditor-clipboard".to_string()) + .spawn(move || clipboard_worker(receiver)) + { + eprintln!("Failed to start clipboard worker: {error}"); + } + Self { sender, busy } + } + + fn request_read(&self) -> Result, String> { + let lease = ClipboardLease::acquire(&self.busy)?; + let (reply, response) = oneshot::channel(); + self.sender + .send(ClipboardRequest::Read { reply, lease }) + .map_err(|_| "Clipboard worker is unavailable.".to_string())?; + Ok(response) + } + + fn request_write(&self, text: String) -> Result, String> { + let lease = ClipboardLease::acquire(&self.busy)?; + let (reply, response) = oneshot::channel(); + self.sender + .send(ClipboardRequest::Write { text, reply, lease }) + .map_err(|_| "Clipboard worker is unavailable.".to_string())?; + Ok(response) + } + + pub(crate) fn shutdown(&self) { + let _ = self.sender.send(ClipboardRequest::Shutdown); + } +} + +fn clipboard_worker(receiver: Receiver) { + let mut clipboard = None; + while let Ok(request) = receiver.recv() { + match request { + ClipboardRequest::Read { reply, lease } => { + let result = + with_clipboard(&mut clipboard, "read", |clipboard| clipboard.get_text()); + drop(lease); + let _ = reply.send(result); + } + ClipboardRequest::Write { text, reply, lease } => { + let result = with_clipboard(&mut clipboard, "write", |clipboard| { + clipboard.set_text(text) + }); + drop(lease); + let _ = reply.send(result); + } + ClipboardRequest::Shutdown => break, + } + } +} + +fn with_clipboard( + clipboard: &mut Option, + operation: &str, + action: impl FnOnce(&mut arboard::Clipboard) -> Result, +) -> Result { + if clipboard.is_none() { + *clipboard = Some( + arboard::Clipboard::new() + .map_err(|error| format!("Clipboard initialization failed: {error}"))?, + ); + } + action(clipboard.as_mut().expect("clipboard initialized above")) + .map_err(|error| format!("Clipboard {operation} failed: {error}")) +} + +async fn await_response(operation: &str, response: ClipboardResponse) -> Result { + match tokio::time::timeout(CLIPBOARD_TIMEOUT, response).await { + Ok(Ok(result)) => result, + Ok(Err(_)) => Err(format!("Clipboard {operation} worker stopped.")), + Err(_) => Err(format!( + "Clipboard {operation} timed out after {} ms.", + CLIPBOARD_TIMEOUT.as_millis() + )), + } +} + +#[tauri::command] +pub(crate) async fn read_clipboard_text( + service: tauri::State<'_, ClipboardService>, +) -> Result { + let response = service.request_read()?; + await_response("read", response).await +} + +#[tauri::command] +pub(crate) async fn write_clipboard_text( + text: String, + service: tauri::State<'_, ClipboardService>, +) -> Result<(), String> { + let response = service.request_write(text)?; + await_response("write", response).await +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn lease_serializes_native_calls() { + let busy = Arc::new(AtomicBool::new(false)); + let first = ClipboardLease::acquire(&busy).expect("first lease"); + assert!(ClipboardLease::acquire(&busy).is_err()); + drop(first); + assert!(ClipboardLease::acquire(&busy).is_ok()); + } + + #[test] + fn disconnected_worker_releases_lease() { + let (sender, receiver) = mpsc::channel(); + drop(receiver); + let service = ClipboardService { + sender, + busy: Arc::new(AtomicBool::new(false)), + }; + assert!(service.request_read().is_err()); + assert!(!service.busy.load(Ordering::Acquire)); + } +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 9b7d3e6..5032cfe 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,4 +1,5 @@ mod app_bootstrap; +mod clipboard; mod config; mod file_io; mod launch_paths; @@ -16,10 +17,12 @@ use tauri::Manager; pub fn run() { let app = tauri::Builder::default() .plugin(tauri_plugin_dialog::init()) - .plugin(tauri_plugin_clipboard_manager::init()) + .manage(clipboard::ClipboardService::new()) .manage(lsp_service::LspManager::new()) .setup(app_bootstrap::setup_app) .invoke_handler(tauri::generate_handler![ + clipboard::read_clipboard_text, + clipboard::write_clipboard_text, file_io::open_files_dialog, file_io::open_folder_dialog, file_io::save_file_dialog, @@ -48,6 +51,7 @@ pub fn run() { .expect("error while building txteditor"); app.run(|app_handle, event| { if matches!(event, tauri::RunEvent::Exit) { + app_handle.state::().shutdown(); app_handle.state::().shutdown(); } }); diff --git a/src/ui/app-runtime-utils.js b/src/ui/app-runtime-utils.js index e377174..0849168 100644 --- a/src/ui/app-runtime-utils.js +++ b/src/ui/app-runtime-utils.js @@ -40,7 +40,7 @@ export function createToastFeedback(els) { export async function writeClipboardText(text) { if (isTauriRuntime()) { const { invoke } = await tauriApi(); - await invoke("plugin:clipboard-manager|write_text", { text: String(text) }); + await invoke("write_clipboard_text", { text: String(text) }); return; } const clipboard = globalThis.navigator?.clipboard; @@ -53,7 +53,7 @@ export async function writeClipboardText(text) { export async function readClipboardText() { if (isTauriRuntime()) { const { invoke } = await tauriApi(); - return invoke("plugin:clipboard-manager|read_text"); + return invoke("read_clipboard_text"); } const clipboard = globalThis.navigator?.clipboard; if (!clipboard?.readText) { diff --git a/src/ui/controllers/edit-command-controller.js b/src/ui/controllers/edit-command-controller.js index 75e045d..a9a4dae 100644 --- a/src/ui/controllers/edit-command-controller.js +++ b/src/ui/controllers/edit-command-controller.js @@ -24,10 +24,9 @@ export function createEditCommandController({ promptNumber, showError }) { - async function copySelection() { - if (!hasOpenDocument()) return false; + async function copyRangesToClipboard(doc, ranges) { try { - await writeClipboardText(copyRanges(activeDoc(), state.selection.ranges)); + await writeClipboardText(copyRanges(doc, ranges)); return true; } catch (error) { showError(`Clipboard copy failed: ${error instanceof Error ? error.message : String(error)}`); @@ -35,16 +34,31 @@ export function createEditCommandController({ } } + async function copySelection() { + if (!hasOpenDocument()) return false; + const targetDoc = activeDoc(); + const targetRanges = state.selection.ranges.map((range) => ({ ...range })); + return copyRangesToClipboard(targetDoc, targetRanges); + } + async function cutSelection() { - if (!await copySelection()) return; - execute(clearRangesCommand(activeDoc(), state.selection.ranges, "Cut")); + if (!hasOpenDocument()) return; + const targetDoc = activeDoc(); + const targetRanges = state.selection.ranges.map((range) => ({ ...range })); + if (!await copyRangesToClipboard(targetDoc, targetRanges)) return; + if (activeDoc() !== targetDoc) return; + execute(clearRangesCommand(targetDoc, targetRanges, "Cut")); } async function pasteSelection() { if (!hasOpenDocument()) return; + const targetDoc = activeDoc(); + const targetRanges = state.selection.ranges.map((range) => ({ ...range })); + const targetFocus = { ...state.selection.focus }; try { const text = await readClipboardText(); - execute(pasteTextToRangesCommand(activeDoc(), state.selection.ranges, state.selection.focus, text)); + if (activeDoc() !== targetDoc) return; + execute(pasteTextToRangesCommand(targetDoc, targetRanges, targetFocus, text)); } catch (error) { showError(`Clipboard paste failed: ${error instanceof Error ? error.message : String(error)}`); } diff --git a/tests/clipboard-runtime.test.js b/tests/clipboard-runtime.test.js index 74cded2..5863d62 100644 --- a/tests/clipboard-runtime.test.js +++ b/tests/clipboard-runtime.test.js @@ -14,14 +14,14 @@ function replaceGlobal(name, value) { }; } -test("desktop clipboard uses the Tauri plugin instead of permission-gated Web Clipboard APIs", async () => { +test("desktop clipboard uses bounded native commands instead of permission-gated Web Clipboard APIs", async () => { const calls = []; const restoreWindow = replaceGlobal("window", { __TAURI__: { core: { invoke: async (command, args) => { calls.push({ command, args }); - return command.endsWith("read_text") ? "from desktop" : undefined; + return command === "read_clipboard_text" ? "from desktop" : undefined; } } } @@ -37,8 +37,8 @@ test("desktop clipboard uses the Tauri plugin instead of permission-gated Web Cl await writeClipboardText("selected cells"); assert.equal(await readClipboardText(), "from desktop"); assert.deepEqual(calls, [ - { command: "plugin:clipboard-manager|write_text", args: { text: "selected cells" } }, - { command: "plugin:clipboard-manager|read_text", args: undefined } + { command: "write_clipboard_text", args: { text: "selected cells" } }, + { command: "read_clipboard_text", args: undefined } ]); } finally { restoreNavigator(); @@ -66,15 +66,20 @@ test("browser clipboard retains the Web Clipboard fallback", async () => { } }); -test("desktop build registers clipboard text permissions and the plugin", () => { +test("desktop build registers a serialized native clipboard worker", () => { const cargo = readFileSync(new URL("../src-tauri/Cargo.toml", import.meta.url), "utf8"); const rust = readFileSync(new URL("../src-tauri/src/lib.rs", import.meta.url), "utf8"); + const clipboardRust = readFileSync(new URL("../src-tauri/src/clipboard.rs", import.meta.url), "utf8"); const capability = JSON.parse(readFileSync(new URL("../src-tauri/capabilities/default.json", import.meta.url), "utf8")); - assert.match(cargo, /tauri-plugin-clipboard-manager = "2"/); - assert.match(rust, /\.plugin\(tauri_plugin_clipboard_manager::init\(\)\)/); - assert.ok(capability.permissions.includes("clipboard-manager:allow-read-text")); - assert.ok(capability.permissions.includes("clipboard-manager:allow-write-text")); + assert.match(cargo, /arboard = \{ version = "3\.6\.1", features = \["wayland-data-control"\] \}/); + assert.doesNotMatch(cargo, /tauri-plugin-clipboard-manager/); + assert.match(rust, /manage\(clipboard::ClipboardService::new\(\)\)/); + assert.match(rust, /clipboard::read_clipboard_text/); + assert.match(rust, /clipboard::write_clipboard_text/); + assert.match(clipboardRust, /std::thread::Builder/); + assert.doesNotMatch(clipboardRust, /spawn_blocking/); + assert.ok(!capability.permissions.some((permission) => permission.startsWith("clipboard-manager:"))); }); function editableDocument() { @@ -101,8 +106,8 @@ test("copy, paste, and cut use the same command path for frozen and normal cells __TAURI__: { core: { invoke: async (command, args) => { - if (command.endsWith("write_text")) clipboardText = args.text; - if (command.endsWith("read_text")) return "pasted"; + if (command === "write_clipboard_text") clipboardText = args.text; + if (command === "read_clipboard_text") return "pasted"; return undefined; } } @@ -141,6 +146,84 @@ test("copy, paste, and cut use the same command path for frozen and normal cells } }); +test("a delayed clipboard read cannot paste into a different same-named tab", async () => { + let releaseRead; + const readPending = new Promise((resolve) => { releaseRead = resolve; }); + const restoreWindow = replaceGlobal("window", { + __TAURI__: { core: { invoke: async (command) => command === "read_clipboard_text" ? readPending : undefined } } + }); + const base = editableDocument(); + const excel = editableDocument(); + base.name = excel.name = "skills.txt"; + base.path = "E:/mod/base/skills.txt"; + excel.path = "E:/mod/excel/skills.txt"; + let active = base; + let executed = 0; + const range = { top: 1, left: 1, bottom: 1, right: 1 }; + const state = { selection: { ranges: [range], focus: { row: 1, column: 1 } } }; + const controller = createEditCommandController({ + state, + grid: { draw() {} }, + activeDoc: () => active, + hasOpenDocument: () => true, + execute(command) { executed += 1; command.redo(active); }, + saveSelectionState() {}, + promptNumber: async () => null, + showError(error) { throw new Error(String(error)); } + }); + + try { + const paste = controller.pasteSelection(); + active = excel; + releaseRead("must-not-cross-tabs"); + await paste; + assert.equal(executed, 0); + assert.equal(base.getCell(1, 1), "normal-value"); + assert.equal(excel.getCell(1, 1), "normal-value"); + } finally { + restoreWindow(); + } +}); + +test("a delayed clipboard write cannot cut a different same-named tab", async () => { + let releaseWrite; + const writePending = new Promise((resolve) => { releaseWrite = resolve; }); + const restoreWindow = replaceGlobal("window", { + __TAURI__: { core: { invoke: async (command) => command === "write_clipboard_text" ? writePending : undefined } } + }); + const base = editableDocument(); + const excel = editableDocument(); + base.name = excel.name = "skills.txt"; + base.path = "E:/mod/base/skills.txt"; + excel.path = "E:/mod/excel/skills.txt"; + let active = base; + let executed = 0; + const range = { top: 1, left: 1, bottom: 1, right: 1 }; + const state = { selection: { ranges: [range], focus: { row: 1, column: 1 } } }; + const controller = createEditCommandController({ + state, + grid: { draw() {} }, + activeDoc: () => active, + hasOpenDocument: () => true, + execute(command) { executed += 1; command.redo(active); }, + saveSelectionState() {}, + promptNumber: async () => null, + showError(error) { throw new Error(String(error)); } + }); + + try { + const cut = controller.cutSelection(); + active = excel; + releaseWrite(); + await cut; + assert.equal(executed, 0); + assert.equal(base.getCell(1, 1), "normal-value"); + assert.equal(excel.getCell(1, 1), "normal-value"); + } finally { + restoreWindow(); + } +}); + function tokenList() { const values = new Set(); return { diff --git a/tests/platform-tauri-contract.test.js b/tests/platform-tauri-contract.test.js index ce23fc3..baad65d 100644 --- a/tests/platform-tauri-contract.test.js +++ b/tests/platform-tauri-contract.test.js @@ -210,6 +210,7 @@ test("large file payloads can parse through a worker before document constructio test("Tauri command boundary preserves JS invoke names and Rust registrations", () => { const platformSources = [ + "../src/ui/app-runtime-utils.js", "../src/core/platform/config.js", "../src/core/platform/file-io.js", "../src/core/platform/lsp-client.js", @@ -241,10 +242,12 @@ test("Tauri command boundary preserves JS invoke names and Rust registrations", "open_files_dialog", "open_folder_dialog", "pick_file_path", + "read_clipboard_text", "read_text_files", "save_config", "save_file_dialog", "startup_open_paths", + "write_clipboard_text", "write_text_file_chunk_safe", "write_text_file_safe" ]); From a0f779e6b96a8461e4e354ff6d3c0f71499a306b Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Sun, 19 Jul 2026 14:17:18 +0900 Subject: [PATCH 07/12] fix: stabilize JSON editor panels (#66) --- src/ui/codemirror-json-editor-entry.js | 134 ++++++++++++++++++++- tests/issue-61-json-go-to-line.test.js | 10 +- tests/issue-66-json-panel-controls.test.js | 60 +++++++++ 3 files changed, 197 insertions(+), 7 deletions(-) create mode 100644 tests/issue-66-json-panel-controls.test.js diff --git a/src/ui/codemirror-json-editor-entry.js b/src/ui/codemirror-json-editor-entry.js index 2d11cac..dc593f1 100644 --- a/src/ui/codemirror-json-editor-entry.js +++ b/src/ui/codemirror-json-editor-entry.js @@ -2,6 +2,7 @@ import { EditorState, StateEffect, StateField } from "@codemirror/state"; import { Decoration, EditorView, + ViewPlugin, drawSelection, highlightActiveLine, highlightActiveLineGutter, @@ -19,6 +20,7 @@ import { undo } from "@codemirror/commands"; import { + closeSearchPanel, findNext, findPrevious, gotoLine, @@ -68,6 +70,86 @@ const jsonHighlightStyle = HighlightStyle.define([ { tag: tags.punctuation, color: "var(--json-punctuation)" } ]); +function jsonPanelFromEvent(view, target) { + const ElementCtor = view.win.Element; + if (!ElementCtor || !(target instanceof ElementCtor)) return null; + const panel = target.closest(".cm-panel"); + return panel && view.dom.contains(panel) ? panel : null; +} + +function isJsonSearchPanel(panel) { + return panel.classList.contains("cm-search"); +} + +function isJsonGotoLinePanel(panel) { + return panel.classList.contains("cm-dialog") + && Boolean(panel.querySelector("input[name='line']")); +} + +function isRepeatedJsonPanelShortcut(event, panel) { + const key = String(event.key ?? "").toLowerCase(); + if (isJsonSearchPanel(panel)) { + return key === "f" + && (event.ctrlKey || event.metaKey) + && !event.altKey + && !event.shiftKey; + } + return isJsonGotoLinePanel(panel) + && key === "g" + && event.ctrlKey + && !event.altKey + && !event.metaKey + && !event.shiftKey; +} + +function handleJsonPanelKeydown(view, event) { + const panel = jsonPanelFromEvent(view, event.target); + if (!panel || (!isJsonSearchPanel(panel) && !isJsonGotoLinePanel(panel))) return; + if (event.key !== "Escape" && !isRepeatedJsonPanelShortcut(event, panel)) return; + + if (isJsonSearchPanel(panel)) { + event.preventDefault(); + event.stopImmediatePropagation(); + closeSearchPanel(view); + view.focus(); + return; + } + + const closeButton = panel.querySelector(".cm-dialog-close"); + if (!closeButton) return; + event.preventDefault(); + event.stopImmediatePropagation(); + closeButton.click(); + view.focus(); +} + +const jsonPanelKeyboard = ViewPlugin.fromClass(class { + constructor(view) { + this.view = view; + this.handleKeydown = (event) => handleJsonPanelKeydown(view, event); + view.dom.addEventListener("keydown", this.handleKeydown, true); + } + + destroy() { + this.view.dom.removeEventListener("keydown", this.handleKeydown, true); + } +}); + +function focusOpenJsonGotoLine(view) { + const input = view.dom.querySelector(".cm-dialog input[name='line']"); + if (!input) return false; + input.focus(); + input.select(); + return true; +} + +function openJsonGotoLine(view) { + if (focusOpenJsonGotoLine(view)) return true; + const opened = gotoLine(view); + focusOpenJsonGotoLine(view); + return opened; +} + const txteditorTheme = EditorView.theme({ "&": { height: "100%", @@ -89,11 +171,53 @@ const txteditorTheme = EditorView.theme({ ".cm-selectionBackground, &.cm-focused .cm-selectionBackground, ::selection": { backgroundColor: "color-mix(in srgb, var(--accent) 28%, transparent) !important" }, - ".cm-panels": { backgroundColor: "var(--panel)", color: "var(--text)" }, - ".cm-panel input": { + ".cm-panels": { + backgroundColor: "var(--panel)", + color: "var(--text)", + fontFamily: '"Segoe UI", Arial, sans-serif', + fontSize: "13px" + }, + ".cm-panel.cm-search, .cm-panel.cm-dialog": { + padding: "6px 36px 6px 8px", + lineHeight: "1.5" + }, + ".cm-panel label": { + fontSize: "13px" + }, + ".cm-panel .cm-textfield": { + boxSizing: "border-box", + height: "28px", + padding: "0 8px", backgroundColor: "var(--input-bg, var(--surface))", color: "var(--text)", - border: "1px solid var(--border)" + border: "1px solid var(--button-border)", + borderRadius: "4px", + fontFamily: "inherit", + fontSize: "13px" + }, + ".cm-panel button": { + boxSizing: "border-box", + minHeight: "28px", + padding: "0 8px", + backgroundColor: "var(--button-bg)", + backgroundImage: "none", + color: "var(--text)", + border: "1px solid var(--button-border)", + borderRadius: "4px", + fontFamily: "inherit", + fontSize: "13px" + }, + ".cm-panel button:hover": { backgroundColor: "var(--hover)" }, + ".cm-panel button[name='close'], .cm-panel .cm-dialog-close": { + width: "28px", + minWidth: "28px", + padding: "0", + backgroundColor: "transparent", + borderColor: "transparent" + }, + ".cm-panel button[name='close']:hover, .cm-panel .cm-dialog-close:hover": { + backgroundColor: "var(--hover)", + borderColor: "var(--button-border)" }, ".cm-tooltip": { backgroundColor: "var(--panel)", color: "var(--text)", border: "1px solid var(--border)" }, ".cm-diagnostic-focus": { @@ -127,8 +251,10 @@ export function createJsonEditorState({ text = "", lineSeparator = "\n", onChang linter(jsonParseLinter()), lintGutter(), EditorView.lineWrapping, + jsonPanelKeyboard, keymap.of([ - { key: "Ctrl-g", run: gotoLine }, + { key: "Ctrl-g", run: openJsonGotoLine }, + { key: "Mod-Alt-g", run: openJsonGotoLine }, indentWithTab, ...defaultKeymap, ...historyKeymap, diff --git a/tests/issue-61-json-go-to-line.test.js b/tests/issue-61-json-go-to-line.test.js index 00699f8..96a3fff 100644 --- a/tests/issue-61-json-go-to-line.test.js +++ b/tests/issue-61-json-go-to-line.test.js @@ -2,7 +2,7 @@ import assert from "node:assert/strict"; import { readFileSync } from "node:fs"; import test from "node:test"; -test("JSON editor routes Ctrl-g to go-to-line before the search keymap", () => { +test("JSON editor routes Ctrl-g to the singleton go-to-line command before the search keymap", () => { const source = readFileSync( new URL("../src/ui/codemirror-json-editor-entry.js", import.meta.url), "utf8" @@ -12,10 +12,14 @@ test("JSON editor routes Ctrl-g to go-to-line before the search keymap", () => { source, /import\s*\{[\s\S]*?\bgotoLine\b[\s\S]*?\}\s*from "@codemirror\/search";/ ); + assert.match( + source, + /function openJsonGotoLine\(view\) \{[\s\S]*?gotoLine\(view\);[\s\S]*?\}/ + ); - const goToLineBinding = source.indexOf('{ key: "Ctrl-g", run: gotoLine }'); + const goToLineBinding = source.indexOf('{ key: "Ctrl-g", run: openJsonGotoLine }'); const searchKeymap = source.indexOf("...searchKeymap"); - assert.notEqual(goToLineBinding, -1, "the JSON editor must bind Ctrl-g to gotoLine"); + assert.notEqual(goToLineBinding, -1, "the JSON editor must bind Ctrl-g to the singleton wrapper"); assert.notEqual(searchKeymap, -1, "the search keymap must remain installed"); assert.ok( goToLineBinding < searchKeymap, diff --git a/tests/issue-66-json-panel-controls.test.js b/tests/issue-66-json-panel-controls.test.js new file mode 100644 index 0000000..986eab7 --- /dev/null +++ b/tests/issue-66-json-panel-controls.test.js @@ -0,0 +1,60 @@ +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import test from "node:test"; + +const source = readFileSync( + new URL("../src/ui/codemirror-json-editor-entry.js", import.meta.url), + "utf8" +); + +test("JSON search and go-to-line panels use TXTeditor UI sizing", () => { + assert.ok(source.includes("fontFamily: '\"Segoe UI\", Arial, sans-serif'")); + assert.match( + source, + /"\.cm-panels": \{[\s\S]*?fontSize: "13px"/ + ); + assert.match( + source, + /"\.cm-panel \.cm-textfield": \{[\s\S]*?height: "28px"/ + ); + assert.match( + source, + /"\.cm-panel label": \{[\s\S]*?fontSize: "13px"/ + ); + assert.match( + source, + /"\.cm-panel button": \{[\s\S]*?minHeight: "28px"/ + ); +}); + +test("JSON panel keyboard handling closes panels and restores editor focus", () => { + assert.match(source, /ViewPlugin\.fromClass/); + assert.match( + source, + /addEventListener\("keydown", this\.handleKeydown, true\)/ + ); + assert.match( + source, + /removeEventListener\("keydown", this\.handleKeydown, true\)/ + ); + assert.match( + source, + /event\.key !== "Escape"[\s\S]*?isRepeatedJsonPanelShortcut/ + ); + assert.match(source, /closeSearchPanel\(view\)/); + assert.match(source, /querySelector\("\.cm-dialog-close"\)/); + assert.match(source, /view\.focus\(\)/); +}); + +test("JSON go-to-line reuses an existing dialog before invoking CodeMirror", () => { + assert.match( + source, + /function focusOpenJsonGotoLine\(view\) \{[\s\S]*?\.cm-dialog input\[name='line'\][\s\S]*?input\.focus\(\);[\s\S]*?input\.select\(\);/ + ); + assert.match( + source, + /function openJsonGotoLine\(view\) \{\s*if \(focusOpenJsonGotoLine\(view\)\) return true;\s*const opened = gotoLine\(view\);/ + ); + assert.match(source, /\{ key: "Ctrl-g", run: openJsonGotoLine \}/); + assert.match(source, /\{ key: "Mod-Alt-g", run: openJsonGotoLine \}/); +}); From f5c173c9da03d054f955159399bc3aa2e103681f Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Mon, 20 Jul 2026 08:58:55 +0900 Subject: [PATCH 08/12] fix: align multi-cell paste with selected range (#68) --- src/core/operations.js | 16 +++++++ tests/table-document-state.test.js | 69 +++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 7 deletions(-) diff --git a/src/core/operations.js b/src/core/operations.js index bb1763a..17f9c8a 100644 --- a/src/core/operations.js +++ b/src/core/operations.js @@ -64,6 +64,22 @@ export function pasteTextToRangesCommand(doc, ranges, focus, text) { return makeCellCommand("Paste Selection", doc, cells.map(({ row, column }) => ({ row, column, value }))); } } + + const matrixWidth = rows.reduce((width, row) => Math.max(width, row.length), 0); + if (rows.length > 1 || matrixWidth > 1) { + const [range] = ranges; + const isSingleMultiCellRange = ranges.length === 1 + && (range.bottom > range.top || range.right > range.left); + if (isSingleMultiCellRange) { + const rangeHeight = range.bottom - range.top + 1; + const rangeWidth = range.right - range.left + 1; + if (rows.length > rangeHeight || matrixWidth > rangeWidth) { + return makeCellCommand("Paste Range", doc, []); + } + return pasteTextCommand(doc, { row: range.top, column: range.left }, text); + } + } + return pasteTextCommand(doc, focus, text); } diff --git a/tests/table-document-state.test.js b/tests/table-document-state.test.js index b44fcc4..58a96bd 100644 --- a/tests/table-document-state.test.js +++ b/tests/table-document-state.test.js @@ -494,29 +494,84 @@ test("single-cell paste fills a contiguous multi-cell selection as one undoable test("single-cell paste fills non-contiguous cells while matrix paste remains focus-based", () => { const doc = TableDocument.fromText("x.txt", "a\tb\tc\n1\t2\t3\n4\t5\t6"); const selected = [ - { top: 0, left: 2, bottom: 0, right: 2 }, + { top: 0, left: 1, bottom: 0, right: 1 }, { top: 2, left: 0, bottom: 2, right: 0 } ]; - const fill = pasteTextToRangesCommand(doc, selected, { row: 0, column: 2 }, "same"); + const fill = pasteTextToRangesCommand(doc, selected, { row: 0, column: 1 }, "same"); fill.redo(doc); - assert.equal(doc.getCell(0, 2), "same"); + assert.equal(doc.getCell(0, 1), "same"); assert.equal(doc.getCell(2, 0), "same"); assert.equal(doc.getCell(1, 1), "2"); const matrix = pasteTextToRangesCommand( doc, - [{ top: 0, left: 0, bottom: 2, right: 2 }], - { row: 1, column: 1 }, + selected, + { row: 0, column: 1 }, "x\ty" ); assert.equal(matrix.label, "Paste Range"); assert.equal(matrix.changes.length, 2); matrix.redo(doc); - assert.equal(doc.getCell(1, 1), "x"); - assert.equal(doc.getCell(1, 2), "y"); + assert.equal(doc.getCell(0, 1), "x"); + assert.equal(doc.getCell(0, 2), "y"); assert.equal(doc.getCell(0, 0), "a"); }); +test("matrix paste into a contiguous selection starts at top-left and remains one undo command", () => { + const doc = TableDocument.fromText("x.txt", "a\tb\tc\td\te\n1\t2\t3\t4\t5\n6\t7\t8\t9\t10\n11\t12\t13\t14\t15", { dirty: false }); + const undo = new UndoManager(); + const beforeRevision = tableFileState(doc).revision; + const command = pasteTextToRangesCommand( + doc, + [{ top: 1, left: 1, bottom: 3, right: 4 }], + { row: 3, column: 4 }, + "w\tx\ny\tz" + ); + + assert.equal(command.label, "Paste Range"); + assert.equal(command.changes.length, 4); + command.redo(doc); + undo.push(command); + + assert.equal(tableFileState(doc).revision, beforeRevision + 1); + assert.equal(undo.undoStack.length, 1); + assert.deepEqual(doc.rows, [ + ["a", "b", "c", "d", "e"], + ["1", "w", "x", "4", "5"], + ["6", "y", "z", "9", "10"], + ["11", "12", "13", "14", "15"] + ]); + + undo.undo(doc); + assert.deepEqual(doc.rows, [ + ["a", "b", "c", "d", "e"], + ["1", "2", "3", "4", "5"], + ["6", "7", "8", "9", "10"], + ["11", "12", "13", "14", "15"] + ]); +}); + +test("oversized matrix paste into a contiguous selection is a silent no-op", () => { + const doc = TableDocument.fromText("x.txt", "a\tb\tc\n1\t2\t3\n4\t5\t6", { dirty: false }); + const undo = new UndoManager(); + const beforeRows = doc.rows.map((row) => [...row]); + const beforeRevision = tableFileState(doc).revision; + const target = [{ top: 1, left: 0, bottom: 2, right: 1 }]; + + for (const text of ["w\tx\ty", "w\nx\ny"]) { + const command = pasteTextToRangesCommand(doc, target, { row: 2, column: 1 }, text); + assert.equal(command.isEmpty, true); + if (!command.isEmpty) { + command.redo(doc); + undo.push(command); + } + } + + assert.deepEqual(doc.rows, beforeRows); + assert.equal(tableFileState(doc).revision, beforeRevision); + assert.equal(undo.undoStack.length, 0); +}); + test("fill copies the top-left selected value over the selection", () => { const doc = TableDocument.fromText("x.txt", "a\tb\tc\n1\t2\t3\n4\t5\t6"); const command = fillSelectionCommand(doc, { top: 1, left: 0, bottom: 2, right: 2 }); From 54c7c9fc07de28602ce40a55ce2df586d4e64b22 Mon Sep 17 00:00:00 2001 From: yinyin333333 Date: Mon, 20 Jul 2026 11:23:08 +0900 Subject: [PATCH 09/12] feat: localize editor and legacy lint output (#69) --- index.html | 104 ++-- src-tauri/src/lsp_service.rs | 30 + src/app.js | 16 +- src/core/i18n.js | 467 +++++++++++++++ src/core/legacy-lint-i18n.js | 545 ++++++++++++++++++ src/core/lint-basic-rules.js | 123 ++-- src/core/lint-cube-rules.js | 47 +- src/core/lint-diagnostics.js | 10 +- src/core/lint-engine.js | 27 +- src/core/lint-item-rules.js | 70 ++- src/core/lint-level-rules.js | 11 +- src/core/lint-misc-rules.js | 20 +- src/core/lint-rule-registry.js | 20 +- src/core/lint-runner.js | 18 +- src/core/lint-treasure-rules.js | 32 +- src/core/platform/lsp-client.js | 4 +- src/ui/app-runtime-utils.js | 7 +- src/ui/app-settings-policy.js | 18 +- src/ui/app-startup-state.js | 3 + src/ui/codemirror-json-editor-entry.js | 70 ++- src/ui/command-registry.js | 103 +--- src/ui/controllers/command-controller.js | 9 +- .../controllers/command-surface-controller.js | 39 +- src/ui/controllers/document-controller.js | 19 +- src/ui/controllers/edit-command-controller.js | 25 +- src/ui/controllers/grid-command-controller.js | 9 +- src/ui/controllers/json-editor-controller.js | 5 + src/ui/controllers/legacy-lint-controller.js | 7 +- src/ui/controllers/locale-controller.js | 48 ++ src/ui/controllers/lsp-controller.js | 10 +- src/ui/controllers/search-controller.js | 13 +- src/ui/controllers/settings-controller.js | 158 +++-- src/ui/controllers/shell-controller.js | 15 +- .../shortcut-settings-controller.js | 44 +- src/ui/dock-layout-policy.js | 6 +- src/ui/document-lifecycle-policy.js | 3 +- src/ui/lint-controls-policy.js | 16 +- src/ui/problems-policy.js | 24 +- src/ui/prompt-dialog.js | 14 +- src/ui/search-policy.js | 7 +- src/ui/shortcut-policy.js | 50 +- tests/app-controller.test.js | 6 +- tests/app-settings.test.js | 39 ++ ...nostics-ui-optimization-regression.test.js | 2 +- tests/i18n-source-audit.test.js | 83 +++ tests/i18n.test.js | 143 +++++ tests/legacy-lint-i18n.test.js | 152 +++++ tests/lsp-lifecycle-regression.test.js | 2 +- tests/lsp-policy.test.js | 8 +- tests/platform-tauri-contract.test.js | 8 +- tests/toolbar-order.test.js | 6 +- 51 files changed, 2216 insertions(+), 499 deletions(-) create mode 100644 src/core/i18n.js create mode 100644 src/core/legacy-lint-i18n.js create mode 100644 src/ui/controllers/locale-controller.js create mode 100644 tests/i18n-source-audit.test.js create mode 100644 tests/i18n.test.js create mode 100644 tests/legacy-lint-i18n.test.js diff --git a/index.html b/index.html index 0e1b3b6..257f8d0 100644 --- a/index.html +++ b/index.html @@ -8,26 +8,26 @@
-
`).join(""); + const localeOptions = LOCALE_OPTIONS.map(([value, label]) => + `` + ).join(""); backdrop.innerHTML = `
-

Settings

+

${translate("toolbar.settings")}

+ + -
Lint Engine
-
- - +
${translate("settings.lintEngine")}
+
+ +
`; document.body.append(backdrop); @@ -402,6 +411,7 @@ export function createSettingsController({ const hoverInput = backdrop.querySelector("#settingsVectorLspHover"); const hoverHint = backdrop.querySelector("#settingsVectorLspHoverHint"); const fontInput = backdrop.querySelector("#settingsGridFont"); + const localeInput = backdrop.querySelector("#settingsLocale"); const lintEngineButtons = [...backdrop.querySelectorAll("[data-settings-lint-engine]")]; const themeButtons = [...backdrop.querySelectorAll("[data-settings-theme]")]; const dockButtons = [...backdrop.querySelectorAll("[data-settings-dock-panel]")]; @@ -413,10 +423,16 @@ export function createSettingsController({ hoverInput.disabled = isLegacyLintEngine(); hoverHint?.classList.toggle("hidden", !isLegacyLintEngine()); fontInput.value = state.gridFont; + localeInput.value = state.locale; for (const button of lintEngineButtons) button.classList.toggle("active", button.dataset.settingsLintEngine === state.lint.engine); for (const button of themeButtons) button.classList.toggle("active", button.dataset.settingsTheme === state.theme); for (const button of dockButtons) button.classList.toggle("active", dockForPanel(button.dataset.settingsDockPanel) === button.dataset.settingsDockEdge); }; + const refreshLocaleLabels = () => { + for (const element of backdrop.querySelectorAll("[data-settings-i18n]")) { + element.textContent = translate(element.dataset.settingsI18n); + } + }; colorizeInput.addEventListener("change", () => { setColorizeColumns(colorizeInput.checked); refresh(); }); mouseResizeInput.addEventListener("change", () => { setMouseResizeLocked(mouseResizeInput.checked); refresh(); }); workspaceSubfoldersInput.addEventListener("change", () => { @@ -431,6 +447,12 @@ export function createSettingsController({ }); hoverInput.addEventListener("change", () => { setVectorLspHover(hoverInput.checked); refresh(); }); fontInput.addEventListener("change", () => { changeGridFont(fontInput.value); refresh(); }); + localeInput.addEventListener("change", () => { + setLocale(localeInput.value).then(() => { + refresh(); + refreshLocaleLabels(); + }).catch(showError); + }); for (const button of lintEngineButtons) { button.addEventListener("click", () => { setLintEngine(button.dataset.settingsLintEngine); refresh(); }); } @@ -448,25 +470,33 @@ export function createSettingsController({ if (closed) return; closed = true; unbindEscape?.(); + document.removeEventListener("txteditor-locale-changed", refreshForLocale); backdrop.remove(); els.host.focus(); }; + const refreshForLocale = () => { + if (closed) return; + close(); + showAppSettings(); + }; + document.addEventListener("txteditor-locale-changed", refreshForLocale); unbindEscape = bindEscapeToClose(close); backdrop.addEventListener("click", (event) => { if (event.target === backdrop || event.target.closest("[data-settings-close]")) close(); }); } - async function showSettings() { + async function showSettings(draftConfig = null) { if (isLegacyLintEngine()) { state.lint.legacy.rulesOpen = true; renderChrome(); return; } - const config = await getConfig().catch((error) => { + const config = draftConfig ?? await getConfig().catch((error) => { reportBackgroundFailure("Configuration load", error, "settings"); return {}; }); + const translate = (key, params = {}) => t(key, params, state.locale); const mode = config.lintMode ?? "basic"; const schemaVersion = config.schemaVersion ?? "3.2"; const VERSIONS = ["3.2", "3.1", "2.4", "1.13"]; @@ -475,7 +505,7 @@ export function createSettingsController({ ).join(""); const referenceVersion = config.referenceVersion ?? ""; const referenceVersionOptions = [ - ["", "Use schema/profile version"], + ["", translate("settings.useSchemaProfileVersion")], ["3.2", "3.2"], ["3.1", "3.1"], ["2.4", "2.4"], @@ -489,89 +519,89 @@ export function createSettingsController({ backdrop.className = "modal-backdrop"; backdrop.innerHTML = `
-

Lint Options

+

${translate("lint.optionsTitle")}

- - + +
- +
- +
- ${isTauriRuntime() ? `` : ""} + placeholder="${translate("settings.pluginFolderPlaceholder")}" /> + ${isTauriRuntime() ? `` : ""}
- +
- ${isTauriRuntime() ? `` : ""} + placeholder="${translate("settings.schemaFolderPlaceholder")}" /> + ${isTauriRuntime() ? `` : ""}
- +
- ${isTauriRuntime() ? `` : ""} + placeholder="${translate("settings.vectorLspPathPlaceholder")}" /> + ${isTauriRuntime() ? `` : ""}
- + -
One version is used for the whole lint session. Advanced mode requires an explicit version; leave this disabled only when no baseline fallback is wanted.
+
${translate("settings.referenceVersionHint")}
-
Checks only JSON files present in this mod. Layout JSON is used only as Key Usage evidence.
+
${translate("settings.jsonDiagnosticsHint")}
- +
- +
- +
- +
-
With ${jsonRules.keyUsage.idStart}, ID ${jsonRules.keyUsage.idStart} is excluded and larger IDs are checked.
+
${translate("settings.jsonKeyUsageHint", { id: jsonRules.keyUsage.idStart })}
- - - ${state.lsp.started ? `` : ""} + + + ${state.lsp.started ? `` : ""}
`; document.body.append(backdrop); @@ -647,14 +677,41 @@ export function createSettingsController({ let closed = false; let saving = false; let unbindEscape = null; + let refreshForLocale = null; const finish = () => { if (closed) return; closed = true; unbindEscape?.(); + document.removeEventListener("txteditor-locale-changed", refreshForLocale); backdrop.remove(); els.host.focus(); resolve(); }; + refreshForLocale = () => { + if (closed) return; + const draft = { + ...config, + lintMode: backdrop.querySelector(".settings-tab.active")?.dataset.settingsTab ?? mode, + schemaVersion: versionSelect?.value || schemaVersion, + referenceVersion: referenceVersionSelect?.value || undefined, + pluginPath: pluginInput?.value ?? config.pluginPath, + schemaPath: schemaInput?.value ?? config.schemaPath, + vectorLspPath: lspInput?.value ?? config.vectorLspPath, + debugLogging: backdrop.querySelector("#settingsDebugLogging")?.checked ?? config.debugLogging, + jsonDiagnostics: jsonDiagnosticsEl?.checked ?? config.jsonDiagnostics, + jsonDiagnosticRules: { + duplicateIds: { action: normalizeJsonRuleAction(jsonDuplicateIdsActionEl?.value) }, + stringFormat: { action: normalizeJsonRuleAction(jsonStringFormatActionEl?.value) }, + keyUsage: { + action: normalizeJsonRuleAction(jsonKeyUsageActionEl?.value, "ignore"), + idStart: parseJsonKeyUsageIdStart(jsonKeyUsageIdStartEl?.value) ?? jsonRules.keyUsage.idStart + } + } + }; + finish(); + void showSettings(draft); + }; + document.addEventListener("txteditor-locale-changed", refreshForLocale); unbindEscape = bindEscapeToClose(finish); backdrop.addEventListener("click", async (event) => { const choice = event.target.closest("[data-settings-choice]")?.dataset.settingsChoice; @@ -670,7 +727,7 @@ export function createSettingsController({ const parsedJsonKeyUsageIdStart = parseJsonKeyUsageIdStart(jsonKeyUsageIdStartEl?.value); const jsonKeyUsageNeedsThreshold = jsonDiagnosticsEnabled && jsonKeyUsageAction !== "ignore"; if (jsonKeyUsageNeedsThreshold && parsedJsonKeyUsageIdStart === null) { - showError("Key Usage ID threshold must be a finite number."); + showError(tText("error.keyUsageThreshold", {}, state.locale)); jsonKeyUsageIdStartEl?.focus(); saving = false; if (saveButton) saveButton.disabled = false; @@ -699,7 +756,7 @@ export function createSettingsController({ try { await saveConfig(updated); } catch (err) { - showError(`Failed to save lint options: ${err}`); + showError(tText("error.lintOptionsSave", { error: err }, state.locale)); saving = false; if (saveButton) saveButton.disabled = false; return; @@ -784,7 +841,7 @@ export function createSettingsController({ return; } els.lintRulesPanel.classList.remove("hidden"); - els.lintRulesPanel.innerHTML = lintRuleGroupsForProfile(state.lint.legacy.settings.profile).map((group) => ` + els.lintRulesPanel.innerHTML = lintRuleGroupsForProfile(state.lint.legacy.settings.profile, state.locale).map((group) => `

${escapeHtml(group.group)}

${group.rules.map((entry) => { @@ -820,6 +877,7 @@ export function createSettingsController({ setLegacyLintReferenceVersion, setLegacyLintRuleEnabled, setLintEngine, + setLocale, setTheme, setVectorLspHover, showAppSettings, diff --git a/src/ui/controllers/shell-controller.js b/src/ui/controllers/shell-controller.js index 9bfa29a..7c20dc4 100644 --- a/src/ui/controllers/shell-controller.js +++ b/src/ui/controllers/shell-controller.js @@ -1,6 +1,7 @@ import { isJsonDocument, isTableDocument } from "../../core/document-file-state.js"; import { cyclicDocumentIndex } from "../document-lifecycle-policy.js"; import { renderWorkspaceFileList } from "../workspace-file-list-policy.js"; +import { tText } from "../../core/i18n.js"; export function createShellController({ state, @@ -44,15 +45,15 @@ export function createShellController({ const count = lintNotificationCount(); if (count) { button.dataset.badge = String(count); - button.title = `Explorer (${count} problems)`; + button.title = `${tText("activity.explorer")} (${count} ${tText("activity.problems").toLowerCase()})`; } else { delete button.dataset.badge; - button.title = "Explorer"; + button.title = tText("activity.explorer"); } } for (const button of documentRef.querySelectorAll("[data-command='show-problems']")) { button.textContent = "P"; - button.title = state.lint.diagnostics.length ? `Problems (${state.lint.diagnostics.length})` : "Problems"; + button.title = state.lint.diagnostics.length ? `${tText("activity.problems")} (${state.lint.diagnostics.length})` : tText("activity.problems"); } if (els.lintSummary) els.lintSummary.textContent = lintSummaryText(); if (fileBadges) updateFileProblemBadges(); @@ -121,10 +122,10 @@ export function createShellController({ renderLintControls(); for (const button of documentRef.querySelectorAll("[data-command='toggle-lint']")) { button.classList.toggle("active", state.lint.enabled); - button.textContent = state.lint.enabled ? "Lint: On" : "Lint: Off"; + button.textContent = state.lint.enabled ? tText("lint.on") : tText("lint.offSummary"); } for (const button of documentRef.querySelectorAll("[data-command='toggle-theme']")) { - button.textContent = state.theme === "dark" ? "Light Mode" : "Dark Mode"; + button.textContent = state.theme === "dark" ? tText("theme.lightMode") : tText("theme.darkMode"); button.classList.remove("active"); } syncProblemsHeaderLayout(); @@ -133,8 +134,8 @@ export function createShellController({ const severity = docDiagnosticSeverity(doc); const titleClass = severity ? `tab-title tab-title-${severity}` : "tab-title"; const kindClass = isJsonDocument(doc) ? "tab-json" : "tab-table"; - const dirty = doc.dirty ? '●' : ""; - return ``; + const dirty = doc.dirty ? `●` : ""; + return ``; }) .join(""); const workspaceFiles = renderWorkspaceFileList({ diff --git a/src/ui/controllers/shortcut-settings-controller.js b/src/ui/controllers/shortcut-settings-controller.js index 1d41319..1356e06 100644 --- a/src/ui/controllers/shortcut-settings-controller.js +++ b/src/ui/controllers/shortcut-settings-controller.js @@ -8,6 +8,7 @@ import { shortcutDisplayForAction, validateShortcutChord } from "../shortcut-policy.js"; +import { tText } from "../../core/i18n.js"; export function createShortcutSettingsController({ state, @@ -28,14 +29,14 @@ export function createShortcutSettingsController({ backdrop.className = "modal-backdrop"; backdrop.innerHTML = ` `; document.body.append(backdrop); @@ -58,18 +59,18 @@ export function createShortcutSettingsController({ displaced.push({ definition, removed, unassigned }); rowMessages.set( definition.action, - `${removed.join(" / ")} was reassigned to ${target.label}.${unassigned ? " This command is now unassigned." : ""}` + tText("shortcut.reassigned", { keys: removed.join(" / "), target: target.label, suffix: unassigned ? tText("shortcut.nowUnassigned") : "" }) ); } draft[action] = assigned; if (displaced.length) { const previousAssignments = displaced - .map(({ definition, unassigned }) => `${definition.label}${unassigned ? " (now unassigned)" : ""}`) + .map(({ definition, unassigned }) => `${definition.label}${unassigned ? tText("shortcut.nowUnassignedLabel") : ""}`) .join(", "); - rowMessages.set(action, `${assigned.join(" / ")} was previously assigned to ${previousAssignments}.`); + rowMessages.set(action, tText("shortcut.previouslyAssigned", { keys: assigned.join(" / "), targets: previousAssignments })); } else if (restoringDefault) { - rowMessages.set(action, "Restored to default. Save to apply."); + rowMessages.set(action, tText("shortcut.restored")); } }; @@ -77,18 +78,18 @@ export function createShortcutSettingsController({ const groups = [...new Set(SHORTCUT_DEFINITIONS.map(({ group }) => group))]; list.innerHTML = groups.map((group) => `
-

${escapeHtml(group)}

+

${escapeHtml(tText(group))}

${SHORTCUT_DEFINITIONS.filter((definition) => definition.group === group).map((definition) => { const recording = recordingAction === definition.action; - const display = shortcutDisplayForAction(definition.action, draft) || "Unassigned"; + const display = shortcutDisplayForAction(definition.action, draft) || tText("shortcut.unassigned"); const message = rowMessages.get(definition.action) ?? ""; return `
${escapeHtml(definition.label)} - + ${message ? `
${escapeHtml(message)}
` : ""}
`; }).join("")} @@ -99,7 +100,7 @@ export function createShortcutSettingsController({ button.addEventListener("click", () => { recordingAction = button.dataset.shortcutRecord; rowMessages.clear(); - rowMessages.set(recordingAction, "Press the new shortcut. Escape cancels recording."); + rowMessages.set(recordingAction, tText("shortcut.pressNew")); renderRows(); list.querySelector(`[data-shortcut-record='${recordingAction}']`)?.focus(); }); @@ -114,22 +115,32 @@ export function createShortcutSettingsController({ } }; + const refreshForLocale = () => { + if (closed) return; + rowMessages.clear(); + for (const element of backdrop.querySelectorAll("[data-shortcut-i18n]")) { + element.textContent = tText(element.dataset.shortcutI18n); + } + renderRows(); + }; + const finish = (save = false) => { if (closed) return; if (save) { const conflict = shortcutConflicts(draft)[0]; if (conflict) { for (const action of conflict.actions) { - rowMessages.set(action, `${conflict.chord} is still assigned to ${conflict.labels.join(" and ")}.`); + rowMessages.set(action, tText("shortcut.conflict", { chord: conflict.chord, labels: conflict.labels.join(" and ") })); } renderRows(); return; } state.shortcuts = saveShortcutBindings(draft, storage); - showToast("Keyboard shortcuts saved."); + showToast(tText("shortcut.saved")); } closed = true; document.removeEventListener("keydown", onKeydown, true); + document.removeEventListener("txteditor-locale-changed", refreshForLocale); backdrop.remove(); els.host.focus(); }; @@ -170,6 +181,7 @@ export function createShortcutSettingsController({ }; document.addEventListener("keydown", onKeydown, true); + document.addEventListener("txteditor-locale-changed", refreshForLocale); backdrop.addEventListener("click", (event) => { if (event.target === backdrop) return finish(false); const choice = event.target.closest("[data-shortcut-choice]")?.dataset.shortcutChoice; diff --git a/src/ui/dock-layout-policy.js b/src/ui/dock-layout-policy.js index b52bba7..0617c29 100644 --- a/src/ui/dock-layout-policy.js +++ b/src/ui/dock-layout-policy.js @@ -1,3 +1,5 @@ +import { tText } from "../core/i18n.js"; + export const MIN_DOCK_WIDTH = 180; export const MIN_DOCK_HEIGHT = 150; export const MIN_EDITOR_WIDTH = 320; @@ -61,10 +63,10 @@ export function panelsForDockEdge({ layout, edge, visiblePanels = new Set(DOCK_P export function dockSettingsControls({ layout = DEFAULT_DOCK_LAYOUT } = {}) { return DOCK_PANELS.map((panel) => ({ panel, - label: panel === "explorer" ? "Explorer Dock" : "Problems Dock", + label: tText(panel === "explorer" ? "dock.explorer" : "dock.problems"), options: DOCK_EDGES.map((edge) => ({ edge, - label: `${edge[0].toUpperCase()}${edge.slice(1)}`, + label: tText(`dock.${edge}`), active: dockPanelEdge(layout, panel) === edge })) })); diff --git a/src/ui/document-lifecycle-policy.js b/src/ui/document-lifecycle-policy.js index c7b3f20..1dc68a0 100644 --- a/src/ui/document-lifecycle-policy.js +++ b/src/ui/document-lifecycle-policy.js @@ -1,4 +1,5 @@ import { normalizePath } from "../core/lint-paths.js"; +import { tText } from "../core/i18n.js"; export function documentOpenPlan(docs, doc) { const target = doc?.path ? normalizePath(doc.path) : ""; @@ -27,5 +28,5 @@ export function cyclicDocumentIndex({ activeIndex, documentCount, delta = 1 }) { } export function closeDialogMessage(doc) { - return `${doc.name} has unsaved changes.`; + return tText("dialog.fileUnsaved", { file: doc.name }); } diff --git a/src/ui/lint-controls-policy.js b/src/ui/lint-controls-policy.js index 41d9054..ea7dc31 100644 --- a/src/ui/lint-controls-policy.js +++ b/src/ui/lint-controls-policy.js @@ -1,7 +1,9 @@ +import { tText } from "../core/i18n.js"; + export function lintToggleControl(lintEnabled = false) { return { id: "toggle-lint", - label: lintEnabled ? "Lint: On" : "Lint: Off", + label: lintEnabled ? tText("lint.on") : tText("lint.offSummary"), active: Boolean(lintEnabled) }; } @@ -22,7 +24,7 @@ export function lintControlsModel({ profileSelect: { id: "lintProfileSelect", className: "profile-select", - title: "D2R lint profile", + title: tText("lint.profileTitle"), options: profiles.map((profile) => ({ value: profile, label: profile, @@ -32,16 +34,16 @@ export function lintControlsModel({ referenceSelect: { id: "lintReferenceVersionSelect", className: "profile-select", - title: "Bundled reference data version", + title: tText("lint.referenceTitle"), options: ["", "3.2", "3.1", "2.4", "1.13c"].map((version) => ({ value: version, - label: version || "Profile", + label: version || tText("lint.profile"), selected: version === activeReferenceVersion })) }, rulesButton: { id: "toggle-lint-rules", - label: "Rules", + label: tText("lint.rulesButton"), active: Boolean(rulesOpen) }, settingsButton: null, @@ -56,8 +58,8 @@ export function lintControlsModel({ rulesButton: null, settingsButton: { id: "open-settings", - label: "Lint Options", - title: "Lint options" + label: tText("command.open-settings"), + title: tText("lint.optionsTitle") }, hideRulesPanel: true }; diff --git a/src/ui/problems-policy.js b/src/ui/problems-policy.js index 22cf854..7cf1c68 100644 --- a/src/ui/problems-policy.js +++ b/src/ui/problems-policy.js @@ -1,3 +1,5 @@ +import { t, tText } from "../core/i18n.js"; + export function lintPanelActive({ problemsVisible = false, lintEnabled = false } = {}) { return Boolean(problemsVisible && lintEnabled); } @@ -124,15 +126,15 @@ export function problemsPanelHtml({ collapsedFiles = [], escapeHtml = escapeHtmlValue } = {}) { - if (!lintEnabled) return `
Lint is off.
`; - if (vectorEngine && !lspStarted) return `
Open a folder to enable linting.
`; - if (!diagnostics.length) return `
No problems.
`; + if (!lintEnabled) return `
${t("lint.off")}
`; + if (vectorEngine && !lspStarted) return `
${t("lint.openFolder")}
`; + if (!diagnostics.length) return `
${t("lint.none")}
`; const collapsed = collapsedFiles instanceof Set ? collapsedFiles : new Set(collapsedFiles); return groupDiagnosticsByFile(diagnostics).map(([fileName, fileDiagnostics]) => `
${escapeHtml(fileName)} (${fileDiagnostics.length}) ${fileDiagnostics.map((diagnostic) => ` - - + +
`; document.body.append(backdrop); @@ -63,10 +65,10 @@ export function promptNumber({ title, message, defaultValue = "", min = null, ma validate(value) { const text = value.trim(); const number = allowFloat ? Number(text) : Number.parseInt(text, 10); - if (text === "" || !Number.isFinite(number)) return { error: "Enter a valid number." }; - if (!allowFloat && String(number) !== text) return { error: "Enter a whole number." }; - if (min !== null && number < min) return { error: `Enter a number ${min} or higher.` }; - if (max !== null && number > max) return { error: `Enter a number ${max} or lower.` }; + if (text === "" || !Number.isFinite(number)) return { error: tText("prompt.validNumber") }; + if (!allowFloat && String(number) !== text) return { error: tText("prompt.wholeNumber") }; + if (min !== null && number < min) return { error: tText("prompt.numberAtLeast", { min }) }; + if (max !== null && number > max) return { error: tText("prompt.numberAtMost", { max }) }; return { value: number }; } }); diff --git a/src/ui/search-policy.js b/src/ui/search-policy.js index e24438d..a298092 100644 --- a/src/ui/search-policy.js +++ b/src/ui/search-policy.js @@ -4,6 +4,7 @@ import { SEARCH_SCOPE_ROW_TITLES, normalizeSearchScope } from "../core/search.js"; +import { tText } from "../core/i18n.js"; export function initialSearchState() { return { lastQuery: "", lastScope: SEARCH_SCOPE_ALL }; @@ -56,12 +57,12 @@ export function searchScrollOptionsForScope(scope) { export function searchStatusText(scope, found, target) { const normalized = normalizeSearchScope(scope); if (normalized === SEARCH_SCOPE_COLUMN_TITLES) { - return `Column C${target.column + 1} (header R${found.row + 1}:C${found.column + 1})`; + return tText("search.columnStatus", { column: target.column + 1, headerRow: found.row + 1, headerColumn: found.column + 1 }); } if (normalized === SEARCH_SCOPE_ROW_TITLES) { - return `Row R${target.row + 1} (title R${found.row + 1}:C${found.column + 1})`; + return tText("search.rowStatus", { row: target.row + 1, titleRow: found.row + 1, titleColumn: found.column + 1 }); } - return `R${target.row + 1}:C${target.column + 1}`; + return tText("search.cellStatus", { row: target.row + 1, column: target.column + 1 }); } export function shouldSubmitSearchKey(key) { diff --git a/src/ui/shortcut-policy.js b/src/ui/shortcut-policy.js index af28173..2c37955 100644 --- a/src/ui/shortcut-policy.js +++ b/src/ui/shortcut-policy.js @@ -1,37 +1,8 @@ export const SHORTCUT_STORAGE_KEY = "txteditor.shortcuts.v1"; +import { tText } from "../core/i18n.js"; export const SHORTCUT_DEFINITIONS = Object.freeze([ - shortcut("open-file", "Open File", ["Ctrl+O"]), - shortcut("save-file", "Save", ["Ctrl+S"], { allowWhileEditing: true }), - shortcut("save-as", "Save As", ["Ctrl+Shift+S"], { allowWhileEditing: true }), - shortcut("search", "Find/Search", ["Ctrl+F"]), - shortcut("find-next", "Find Next", ["F3"], { allowWhileEditing: true }), - shortcut("find-previous", "Find Previous", ["Shift+F3"], { allowWhileEditing: true }), - shortcut("replace", "Find and Replace", ["Ctrl+Shift+H"], { allowWhileEditing: true }), - shortcut("go-to-row", "Go to Row", ["Ctrl+G"], { allowWhileEditing: true }), - shortcut("undo", "Undo", ["Ctrl+Z"]), - shortcut("redo", "Redo", ["Ctrl+Y", "Ctrl+Shift+Z"]), - shortcut("copy", "Copy", ["Ctrl+C"]), - shortcut("cut", "Cut", ["Ctrl+X"]), - shortcut("paste", "Paste", ["Ctrl+V"]), - shortcut("select-all", "Select All", ["Ctrl+A"]), - shortcut("clear-selection", "Clear Cell(s)", ["Delete"]), - shortcut("show-palette", "Command Palette", ["Ctrl+P", "Ctrl+Shift+P"]), - shortcut("close-tab", "Close Current Tab", ["Ctrl+W"], { allowWhileEditing: true }), - shortcut("next-tab", "Next Tab", ["Ctrl+Tab"], { allowWhileEditing: true }), - shortcut("previous-tab", "Previous Tab", ["Ctrl+Shift+Tab"], { allowWhileEditing: true }), - shortcut("toggle-sidebar", "Toggle Explorer", ["Ctrl+B"]), - shortcut("toggle-problems", "Toggle Problems", ["Ctrl+L"], { allowWhileEditing: true }), - shortcut("reset-row-heights", "Reset Row Heights", ["Ctrl+H"], { allowWhileEditing: true }), - shortcut("zoom-in", "Zoom In", ["Ctrl+Plus", "Ctrl+="]), - shortcut("zoom-out", "Zoom Out", ["Ctrl+Minus"]), - shortcut("zoom-reset", "Reset Zoom", ["Ctrl+0"]), - shortcut("scroll-page-up", "Scroll One Page Up", ["PageUp"], { context: "grid", group: "Grid scrolling" }), - shortcut("scroll-page-down", "Scroll One Page Down", ["PageDown"], { context: "grid", group: "Grid scrolling" }), - shortcut("scroll-top", "Scroll To Top", ["Home"], { context: "grid", group: "Grid scrolling" }), - shortcut("scroll-bottom", "Scroll To Bottom", ["End"], { context: "grid", group: "Grid scrolling" }), - shortcut("scroll-left", "Scroll To Left Edge", ["Shift+Home"], { context: "grid", group: "Grid scrolling" }), - shortcut("scroll-right", "Scroll To Right Edge", ["Shift+End"], { context: "grid", group: "Grid scrolling" }) + shortcut("open-file", "command.open-file", ["Ctrl+O"]), shortcut("save-file", "command.save-file", ["Ctrl+S"], { allowWhileEditing: true }), shortcut("save-as", "command.save-as", ["Ctrl+Shift+S"], { allowWhileEditing: true }), shortcut("search", "command.search", ["Ctrl+F"]), shortcut("find-next", "command.find-next", ["F3"], { allowWhileEditing: true }), shortcut("find-previous", "command.find-previous", ["Shift+F3"], { allowWhileEditing: true }), shortcut("replace", "command.replace", ["Ctrl+Shift+H"], { allowWhileEditing: true }), shortcut("go-to-row", "command.go-to-row", ["Ctrl+G"], { allowWhileEditing: true }), shortcut("undo", "command.undo", ["Ctrl+Z"]), shortcut("redo", "command.redo", ["Ctrl+Y", "Ctrl+Shift+Z"]), shortcut("copy", "command.copy", ["Ctrl+C"]), shortcut("cut", "command.cut", ["Ctrl+X"]), shortcut("paste", "command.paste", ["Ctrl+V"]), shortcut("select-all", "command.select-all", ["Ctrl+A"]), shortcut("clear-selection", "command.clear-selection", ["Delete"]), shortcut("show-palette", "shortcut.commandPalette", ["Ctrl+P", "Ctrl+Shift+P"]), shortcut("close-tab", "shortcut.closeCurrentTab", ["Ctrl+W"], { allowWhileEditing: true }), shortcut("next-tab", "command.next-tab", ["Ctrl+Tab"], { allowWhileEditing: true }), shortcut("previous-tab", "command.previous-tab", ["Ctrl+Shift+Tab"], { allowWhileEditing: true }), shortcut("toggle-sidebar", "command.toggle-sidebar", ["Ctrl+B"]), shortcut("toggle-problems", "shortcut.toggleProblems", ["Ctrl+L"], { allowWhileEditing: true }), shortcut("reset-row-heights", "command.reset-row-heights", ["Ctrl+H"], { allowWhileEditing: true }), shortcut("zoom-in", "command.zoom-in", ["Ctrl+Plus", "Ctrl+="]), shortcut("zoom-out", "command.zoom-out", ["Ctrl+Minus"]), shortcut("zoom-reset", "command.zoom-reset", ["Ctrl+0"]), shortcut("scroll-page-up", "shortcut.scrollPageUp", ["PageUp"], { context: "grid", group: "shortcut.groupGrid" }), shortcut("scroll-page-down", "shortcut.scrollPageDown", ["PageDown"], { context: "grid", group: "shortcut.groupGrid" }), shortcut("scroll-top", "shortcut.scrollTop", ["Home"], { context: "grid", group: "shortcut.groupGrid" }), shortcut("scroll-bottom", "shortcut.scrollBottom", ["End"], { context: "grid", group: "shortcut.groupGrid" }), shortcut("scroll-left", "shortcut.scrollLeft", ["Shift+Home"], { context: "grid", group: "shortcut.groupGrid" }), shortcut("scroll-right", "shortcut.scrollRight", ["Shift+End"], { context: "grid", group: "shortcut.groupGrid" }) ]); const DEFINITION_BY_ACTION = new Map(SHORTCUT_DEFINITIONS.map((definition) => [definition.action, definition])); @@ -39,14 +10,15 @@ const MODIFIER_KEYS = new Set(["Alt", "AltGraph", "Control", "Meta", "OS", "Shif const FIXED_NAVIGATION_KEYS = new Set(["ArrowDown", "ArrowLeft", "ArrowRight", "ArrowUp", "Enter", "Escape", "F2", "Tab"]); const MODIFIER_ORDER = ["Ctrl", "Alt", "Shift", "Meta"]; -function shortcut(action, label, defaults, { +function shortcut(action, labelKey, defaults, { allowWhileEditing = false, context = "global", - group = "Commands" + group = "shortcut.groupCommands" } = {}) { return Object.freeze({ action, - label, + labelKey, + get label() { return tText(labelKey); }, defaults: Object.freeze([...defaults]), allowWhileEditing, context, @@ -137,14 +109,14 @@ export function normalizeShortcutChord(value) { export function validateShortcutChord(value) { const chord = normalizeShortcutChord(value); - if (!chord) return { valid: false, message: "Press a non-modifier key." }; + if (!chord) return { valid: false, message: tText("shortcut.validationNonModifier") }; const { key, modifiers } = shortcutChordParts(chord); const modifiedTab = key === "Tab" && modifiers.some((modifier) => modifier === "Ctrl" || modifier === "Alt" || modifier === "Meta"); if (FIXED_NAVIGATION_KEYS.has(key) && !modifiedTab) { - return { valid: false, message: `${key} is reserved for grid editing and navigation.` }; + return { valid: false, message: tText("shortcut.validationReserved", { key }) }; } if (isPrintableShortcutKey(key) && !modifiers.some((modifier) => modifier === "Ctrl" || modifier === "Alt" || modifier === "Meta")) { - return { valid: false, message: "Use Ctrl, Alt, or Meta with letters, numbers, and symbols." }; + return { valid: false, message: tText("shortcut.validationModifier") }; } return { valid: true, message: "", chord }; } @@ -195,6 +167,10 @@ export function shortcutDefinition(action) { return DEFINITION_BY_ACTION.get(action) ?? null; } +export function shortcutLabelForAction(action) { + return DEFINITION_BY_ACTION.get(action)?.label ?? ""; +} + function normalizeModifier(value) { const key = String(value ?? "").trim().toLowerCase(); if (key === "ctrl" || key === "control") return "Ctrl"; diff --git a/tests/app-controller.test.js b/tests/app-controller.test.js index ea2167b..7f82db1 100644 --- a/tests/app-controller.test.js +++ b/tests/app-controller.test.js @@ -830,7 +830,7 @@ test("context menu command item registries preserve expected command groups", () assert.deepEqual(fillCommandItems().map((item) => item.id), ["fill", "increment-fill"]); assert.deepEqual(mathCommandItems().map((item) => item.id), ["math-add", "math-subtract", "math-multiply", "math-divide"]); const commandSurfaceController = readFileSync(new URL("../src/ui/controllers/command-surface-controller.js", import.meta.url), "utf8"); - assert.match(commandSurfaceController, /label: "Fill"[\s\S]*label: "Math"[\s\S]*id: "go-to-definition"/); + assert.match(commandSurfaceController, /tText\("menu\.fill"\)[\s\S]*tText\("menu\.math"\)[\s\S]*id: "go-to-definition"/); }); test("Resize To Fit keeps the existing all-column command behavior", () => { @@ -841,8 +841,8 @@ test("Resize To Fit keeps the existing all-column command behavior", () => { test("Open File and Open Folder sidebar buttons are constrained to one line", () => { const html = readFileSync(new URL("../index.html", import.meta.url), "utf8"); const css = readFileSync(new URL("../src/styles.css", import.meta.url), "utf8"); - assert.match(html, /'; - const settings = ''; + const shortcuts = ''; + const settings = ''; const shortcutsIndex = html.indexOf(shortcuts); const settingsIndex = html.indexOf(settings); assert.notEqual(shortcutsIndex, -1); assert.notEqual(settingsIndex, -1); assert.ok(shortcutsIndex < settingsIndex); - assert.match(html.slice(shortcutsIndex, settingsIndex + settings.length), /Shortcuts<\/button>\s* + diff --git a/src/app.js b/src/app.js index 8fd0702..e16cbd0 100644 --- a/src/app.js +++ b/src/app.js @@ -300,7 +300,7 @@ documentController = createDocumentController({ handleLspUpdateError, reportLspCloseFailure, lspRebindSavedDoc: (doc, previousUri) => lspController.rebindSavedDoc(doc, previousUri), - lspStartWorkspace, + lspStartWorkspace, lspStopSession: (reason) => lspController.stopSession(reason), ensureDocumentSession: lspController.ensureStandaloneSession, scheduleHoverPrewarm, resetUndoManagerForDocument, @@ -310,7 +310,8 @@ documentController = createDocumentController({ cancelLegacyLintJobs, isVectorLintEngine, isLegacyLintEngine, - updateGridDiagnostics, + setLintDiagnostics, updateGridDiagnostics, + resetWorkspaceView: () => shellController?.resetWorkspaceView(), scrollProblemsToActiveFile }); const searchController = createSearchController({ @@ -358,7 +359,7 @@ const commandController = createCommandController({ showError, handlers: { openFile: documentController.openFile, - openFolder: documentController.openFolder, + openFolder: documentController.openFolder, closeAll: documentController.closeAll, saveFile: documentController.saveFile, saveAs: documentController.saveAs, undo, diff --git a/src/core/i18n.js b/src/core/i18n.js index 0e04a3e..cce380c 100644 --- a/src/core/i18n.js +++ b/src/core/i18n.js @@ -37,6 +37,7 @@ const CATALOG_ROWS = { "toolbar.open": ["Open", "開啟", "Öffnen", "Abrir", "Ouvrir", "Apri", "열기", "Otwórz", "Abrir", "開く", "Abrir", "Открыть", "打开"], "toolbar.openFile": ["Open File", "開啟檔案", "Datei öffnen", "Abrir archivo", "Ouvrir un fichier", "Apri file", "파일 열기", "Otwórz plik", "Abrir archivo", "ファイルを開く", "Abrir arquivo", "Открыть файл", "打开文件"], "toolbar.openFolder": ["Open Folder", "開啟資料夾", "Ordner öffnen", "Abrir carpeta", "Ouvrir un dossier", "Apri cartella", "폴더 열기", "Otwórz folder", "Abrir carpeta", "フォルダーを開く", "Abrir pasta", "Открыть папку", "打开文件夹"], + "toolbar.closeAll": ["Close All", "全部關閉", "Alle schließen", "Cerrar todo", "Tout fermer", "Chiudi tutto", "모두 닫기", "Zamknij wszystko", "Cerrar todo", "すべて閉じる", "Fechar tudo", "Закрыть всё", "全部关闭"], "toolbar.save": ["Save", "儲存", "Speichern", "Guardar", "Enregistrer", "Salva", "저장", "Zapisz", "Guardar", "保存", "Salvar", "Сохранить", "保存"], "toolbar.saveAs": ["Save As", "另存新檔", "Speichern unter", "Guardar como", "Enregistrer sous", "Salva con nome", "다른 이름으로 저장", "Zapisz jako", "Guardar como", "名前を付けて保存", "Salvar como", "Сохранить как", "另存为"], "toolbar.undo": ["Undo", "復原", "Rückgängig", "Deshacer", "Annuler", "Annulla", "실행 취소", "Cofnij", "Deshacer", "元に戻す", "Desfazer", "Отменить", "撤销"], diff --git a/src/styles.css b/src/styles.css index 586f292..9bf883e 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1006,7 +1006,7 @@ button.active { .empty-state { position: absolute; inset: 0; - z-index: 3; + z-index: 6; display: flex; align-items: center; justify-content: center; diff --git a/src/ui/command-registry.js b/src/ui/command-registry.js index 1899082..7881ca0 100644 --- a/src/ui/command-registry.js +++ b/src/ui/command-registry.js @@ -1,7 +1,7 @@ import { tText } from "../core/i18n.js"; export const COMMAND_LABELS_BASE = [ - ["open-file", "command.open-file"], ["open-folder", "command.open-folder"], ["save-file", "command.save-file"], ["save-as", "command.save-as"], + ["open-file", "command.open-file"], ["open-folder", "command.open-folder"], ["close-all", "toolbar.closeAll"], ["save-file", "command.save-file"], ["save-as", "command.save-as"], ["search", "command.search"], ["find-next", "command.find-next"], ["find-previous", "command.find-previous"], ["replace", "command.replace"], ["go-to-row", "command.go-to-row"], ["next-tab", "command.next-tab"], ["previous-tab", "command.previous-tab"], ["undo", "command.undo"], ["redo", "command.redo"], ["copy", "command.copy"], ["paste", "command.paste"], ["cut", "command.cut"], ["clear-selection", "command.clear-selection"], ["select-all", "command.select-all"], @@ -22,6 +22,7 @@ export const DEVELOPMENT_COMMAND_LABELS = [ export const COMMANDS_AVAILABLE_WITHOUT_DOCUMENT = new Set([ "open-file", "open-folder", + "close-all", "open-settings", "open-app-settings", "open-shortcut-settings", @@ -43,6 +44,7 @@ export const COMMANDS_AVAILABLE_WITHOUT_DOCUMENT = new Set([ const COMMAND_ACTIONS = new Map([ ["open-file", { type: "handler", name: "openFile" }], ["open-folder", { type: "handler", name: "openFolder" }], + ["close-all", { type: "handler", name: "closeAll" }], ["save-file", { type: "handler", name: "saveFile" }], ["save-as", { type: "handler", name: "saveAs" }], ["load-fixture-20k", { type: "fixture", size: 20000 }], @@ -158,7 +160,7 @@ export function mathCommandItems() { } const JSON_DOCUMENT_COMMANDS = new Set([ - "open-file", "open-folder", "save-file", "save-as", "search", "find-next", "find-previous", "replace", + "open-file", "open-folder", "close-all", "save-file", "save-as", "search", "find-next", "find-previous", "replace", "next-tab", "previous-tab", "undo", "redo", "select-all", "toggle-sidebar", "toggle-theme", "open-app-settings", "open-shortcut-settings", "open-settings", diff --git a/src/ui/controllers/command-controller.js b/src/ui/controllers/command-controller.js index 700b71c..ef86115 100644 --- a/src/ui/controllers/command-controller.js +++ b/src/ui/controllers/command-controller.js @@ -35,6 +35,7 @@ export function createCommandController({ const commands = createCommandRunners(commandLabels(), runCommand); function runCommand(id) { + if (id === "close-all" && !state.workspace && !state.docs.length) return; if (!hasOpenDocument() && !canRunCommandWithoutDocument(id)) return showError(tText("error.openDocument")); if (hasOpenDocument() && !canRunCommandForDocument(id, activeDocumentKind())) { return showError(tText("error.tableOnly")); diff --git a/src/ui/controllers/document-controller.js b/src/ui/controllers/document-controller.js index a785a7f..3041f53 100644 --- a/src/ui/controllers/document-controller.js +++ b/src/ui/controllers/document-controller.js @@ -64,6 +64,7 @@ export function createDocumentController({ reportLspCloseFailure, lspRebindSavedDoc = async () => {}, lspStartWorkspace, + lspStopSession = async () => 0, ensureDocumentSession = async () => {}, scheduleHoverPrewarm, resetUndoManagerForDocument, @@ -73,7 +74,9 @@ export function createDocumentController({ cancelLegacyLintJobs, isVectorLintEngine, isLegacyLintEngine, + setLintDiagnostics = () => {}, updateGridDiagnostics, + resetWorkspaceView = () => {}, scrollProblemsToActiveFile }) { let pendingCloseResolve = null; @@ -310,6 +313,62 @@ export function createDocumentController({ } } + async function closeAll() { + if (!state.workspace?.path && !state.docs.length) return false; + + if (state.docs.length) { + commitActiveEditor(); + saveSelectionState(); + } + const saveDocs = []; + + for (const doc of state.docs.filter((candidate) => candidate.dirty)) { + const choice = await askCloseChoice(doc); + if (choice === "cancel") return false; + if (choice === "save") saveDocs.push(doc); + } + + for (const doc of saveDocs) { + try { + const saved = await queueSave(doc, () => saveFileNow(doc)); + if (!saved || doc.dirty) return false; + } catch (error) { + showError(error); + return false; + } + } + + cancelLegacyLintJobs({ clearDiagnostics: false }); + resetLegacyWorkspaceIndex(); + + let stopPromise; + try { + stopPromise = Promise.resolve(lspStopSession("all-documents-closed")); + } catch (error) { + stopPromise = Promise.reject(error); + } + + setLintDiagnostics([]); + state.lint.status = ""; + state.workspace = null; + resetWorkspaceView(); + state.docs.splice(0, state.docs.length); + state.active = -1; + await activateDocument(emptyDoc, { focus: false }); + + updateGridDiagnostics(); + renderChrome(); + + try { + await stopPromise; + } catch (error) { + showError(error); + } + + focusActiveEditor(); + return true; + } + async function saveFile() { try { if (!hasOpenDocument()) return showError(tText("error.noOpenFile")), false; @@ -617,6 +676,7 @@ export function createDocumentController({ return { addDocument, askCloseChoice, + closeAll, closeTab, handleCloseDialogClick, handleExternalChangeDialogClick, diff --git a/src/ui/controllers/shell-controller.js b/src/ui/controllers/shell-controller.js index 7c20dc4..93a3780 100644 --- a/src/ui/controllers/shell-controller.js +++ b/src/ui/controllers/shell-controller.js @@ -107,6 +107,9 @@ export function createShellController({ for (const button of documentRef.querySelectorAll("[data-command='show-problems']")) { button.classList.toggle("active", state.problemsVisible); } + for (const button of documentRef.querySelectorAll("[data-command='close-all']")) { + button.disabled = !state.workspace && !state.docs.length; + } const tableDocumentOpen = documentOpen && isTableDocument(activeDoc()); for (const button of documentRef.querySelectorAll("[data-command='toggle-freeze-row']")) { button.disabled = !tableDocumentOpen; @@ -260,7 +263,9 @@ export function createShellController({ els.explorerFilter.value = ""; renderExplorerSearchResults([]); if (result.index != null) return selectTab(result.index); - openDroppedNativePaths([result.path], { requireCurrentJsonMode: true }).catch(showError); + openDroppedNativePaths([result.path], { + requireCurrentJsonMode: true + }).catch(showError); } function explorerSearchResults() { @@ -291,10 +296,18 @@ export function createShellController({ return String(value || "").trim().toLowerCase(); } + function resetWorkspaceView() { + collapsedFileGroups.clear(); + explorerSearchActiveIndex = 0; + if (els.explorerFilter) els.explorerFilter.value = ""; + renderExplorerSearchResults([]); + } + return { collapsedFileGroups, renderDiagnosticsChrome, renderChrome, + resetWorkspaceView, selectTab, switchTab }; diff --git a/tests/app-controller.test.js b/tests/app-controller.test.js index 7f82db1..77be914 100644 --- a/tests/app-controller.test.js +++ b/tests/app-controller.test.js @@ -207,8 +207,8 @@ test("command registry preserves public command labels and availability policy", const developmentIds = developmentLabels.map(([id]) => id); assert.deepEqual( - ["open-file", "open-folder", "save-file", "toggle-lint", "show-problems"].map((id) => productionIds.includes(id)), - [true, true, true, true, true] + ["open-file", "open-folder", "close-all", "save-file", "toggle-lint", "show-problems"].map((id) => productionIds.includes(id)), + [true, true, true, true, true, true] ); assert.equal(new Set(productionIds).size, productionIds.length); assert.equal(productionIds.includes("load-fixture-20k"), false); @@ -222,10 +222,12 @@ test("command registry preserves public command labels and availability policy", assert.deepEqual(calls, ["open-file", "show-problems"]); assert.equal(canRunCommandWithoutDocument("open-file"), true); + assert.equal(canRunCommandWithoutDocument("close-all"), true); assert.equal(canRunCommandWithoutDocument("show-problems"), true); assert.equal(canRunCommandWithoutDocument("save-file"), false); assert.equal(canRunCommandWithoutDocument("go-to-definition"), false); assert.deepEqual(commandActionForId("open-file"), { type: "handler", name: "openFile" }); + assert.deepEqual(commandActionForId("close-all"), { type: "handler", name: "closeAll" }); assert.deepEqual(commandActionForId("load-fixture-20k"), { type: "fixture", size: 20000 }); assert.deepEqual(commandActionForId("insert-row"), { type: "handler", name: "insertRows" }); assert.deepEqual(commandActionForId("insert-column"), { type: "handler", name: "insertColumns" }); @@ -732,6 +734,100 @@ test("closing the active tab commits editor changes before checking dirty state" assert.equal(state.docs.length, 1); }); +test("Close All removes workspace and standalone tabs after stopping Vector-LSP", async () => { + const workspaceDoc = TableDocument.fromText("skills.txt", "skill\nworkspace", { + path: "E:\\Mods\\Example\\TXT\\skills.txt" + }); + const standaloneDoc = TableDocument.fromText("notes.txt", "id\nstandalone", { + path: "E:\\Notes\\notes.txt" + }); + const events = []; + const { controller, state } = testDocumentController([], {}, { + workspace: { path: "E:\\Mods\\Example\\TXT", files: [] }, + lintEngine: "vector-lsp", + isVectorLintEngine: () => true, + isLegacyLintEngine: () => false, + lspOpenDoc: async () => {}, + lspStopSession: async (reason) => events.push(["stop", reason]), + resetWorkspaceView: () => events.push(["reset-view"]) + }); + + await controller.addDocument(workspaceDoc); + await controller.addDocument(standaloneDoc); + state.active = 0; + state.lint.diagnostics = [{ id: "workspace-diagnostic" }]; + + assert.equal(await controller.closeAll(), true); + assert.equal(state.workspace, null); + assert.deepEqual(state.docs, []); + assert.equal(state.active, -1); + assert.deepEqual(state.lint.diagnostics, []); + assert.deepEqual(events, [ + ["stop", "all-documents-closed"], + ["reset-view"] + ]); +}); + +test("cancelling Close All preserves the workspace and documents without stopping LSP", async () => { + const workspaceDoc = TableDocument.fromText("skills.txt", "skill\nchanged", { + path: "E:\\Mods\\Example\\TXT\\skills.txt", + dirty: true + }); + const stops = []; + const workspace = { path: "E:\\Mods\\Example\\TXT", files: [] }; + const { controller, state } = testDocumentController([], {}, { + workspace, + lspStopSession: async (reason) => stops.push(reason) + }); + await controller.addDocument(workspaceDoc); + + const closing = controller.closeAll(); + await waitFor(() => state.docs.length === 1); + controller.handleCloseDialogClick(closeChoiceEvent("cancel")); + + assert.equal(await closing, false); + assert.equal(state.workspace, workspace); + assert.deepEqual(state.docs, [workspaceDoc]); + assert.deepEqual(stops, []); +}); + +test("Close All applies discard and save choices before removing every tab", async () => { + const discarded = TableDocument.fromText("discard.txt", "id\ndiscard", { + path: "E:\\Mods\\Example\\TXT\\discard.txt", + dirty: true + }); + const saved = TableDocument.fromText("save.txt", "id\nsave", { + path: "E:\\Mods\\Example\\TXT\\save.txt", + dirty: true + }); + const writes = []; + saved.handle = { + async createWritable() { + return { + write: async (text) => writes.push(text), + close: async () => {} + }; + } + }; + const { controller, state } = testDocumentController([], {}, { + workspace: { path: "E:\\Mods\\Example\\TXT", files: [] } + }); + await controller.addDocument(discarded); + await controller.addDocument(saved); + + const closing = controller.closeAll(); + await waitFor(() => state.docs.length === 2); + controller.handleCloseDialogClick(closeChoiceEvent("discard")); + await waitFor(() => state.docs.length === 2); + controller.handleCloseDialogClick(closeChoiceEvent("save")); + + assert.equal(await closing, true); + assert.deepEqual(writes, ["id\nsave"]); + assert.deepEqual(state.docs, []); + assert.equal(state.active, -1); + assert.equal(state.workspace, null); +}); + test("closing another tab commits the active editor before switching documents", async () => { const activeDoc = TableDocument.fromText("active.txt", "id\nactive", { dirty: false }); const closingDoc = TableDocument.fromText("closing.txt", "id\nclosing", { dirty: true }); @@ -838,15 +934,17 @@ test("Resize To Fit keeps the existing all-column command behavior", () => { assert.match(gridCommandController, /useSelection\s*\?\s*columnsFromSelection\(\)\s*:\s*indexRange\(0,\s*doc\.columnCount - 1\)/); }); -test("Open File and Open Folder sidebar buttons are constrained to one line", () => { +test("file actions use localized labels and Close All appears in the main toolbar", () => { const html = readFileSync(new URL("../index.html", import.meta.url), "utf8"); const css = readFileSync(new URL("../src/styles.css", import.meta.url), "utf8"); assert.match(html, /