diff --git a/README.md b/README.md index 55c1fd9..29a9ef6 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 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,36 +8,63 @@ 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 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. +- 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. +- 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. -## Lint Profiles +## JSON Editing -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 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. -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 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. + +## Linting -## Lint Engines +Lint results appear in the live Problems panel. Selecting a diagnostic opens the matching table cell or JSON range. -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, JSON lint support, 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, 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. -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. +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. + +### JSON Lint + +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 @@ -74,7 +101,10 @@ 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 +- `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 @@ -86,15 +116,17 @@ 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+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 - `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 diff --git a/index.html b/index.html index 56e4841..8865a8d 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 +429,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 +441,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 +465,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 +488,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 +523,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 +537,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 +695,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 +745,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 +774,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 +859,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 +895,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 10d1771..93a3780 100644 --- a/src/ui/controllers/shell-controller.js +++ b/src/ui/controllers/shell-controller.js @@ -1,5 +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, @@ -25,6 +27,7 @@ export function createShellController({ syncProblemsHeaderLayout, scheduleHoverPrewarm, ensureDocumentSession = async () => {}, + commitActiveEditor = () => {}, saveSelectionState = () => {}, recordUiPerf, perfNow, @@ -42,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(); @@ -104,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; @@ -119,10 +125,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(); @@ -131,8 +137,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({ @@ -176,6 +182,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 +206,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"; @@ -245,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() { @@ -276,9 +296,19 @@ 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 + renderChrome, + resetWorkspaceView, + selectTab, + switchTab }; } 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 c0a7989..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) : ""; @@ -20,6 +21,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.`; + return tText("dialog.fileUnsaved", { file: doc.name }); } 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/hover-policy.js b/src/ui/hover-policy.js index b17c3b8..7693005 100644 --- a/src/ui/hover-policy.js +++ b/src/ui/hover-policy.js @@ -105,18 +105,22 @@ export function vectorTooltipSections({ value = "", hoverText = "", diagnostics export function diagnosticTooltipText(diagnostic = {}) { const message = String(diagnostic.message ?? ""); const guidance = diagnosticUserGuidance(diagnostic); + const guidanceHeading = stringField(diagnostic.data?.localizedGuidanceHeading) || "What to do"; const trimmedMessage = message.trim(); const trimmedGuidance = guidance.trim(); const alreadyIncluded = trimmedGuidance && (trimmedMessage === trimmedGuidance || trimmedMessage.endsWith(trimmedGuidance)); return trimmedGuidance && !alreadyIncluded - ? `${message}\n\nWhat to do:\n${guidance}` + ? `${message}\n\n${guidanceHeading}:\n${guidance}` : message; } export function diagnosticUserGuidance(diagnostic = {}) { const data = diagnostic.data; if (!data || typeof data !== "object") return ""; + const localizedGuidance = stringField(data.localizedGuidance); + if (localizedGuidance) return localizedGuidance; + if (data.localizedMessage === true) return ""; const insertText = stringField(data.insertText) || stringField(data.expected); if (data.kind === "missing-token" && insertText) return `Insert '${insertText}' at the marked position.`; if (data.kind === "unexpected-character") { 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); @@ -54,7 +56,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, @@ -63,9 +65,10 @@ export function promptNumber({ title, message, defaultValue = "", min = null, al 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 (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 429fe1d..2c37955 100644 --- a/src/ui/shortcut-policy.js +++ b/src/ui/shortcut-policy.js @@ -1,31 +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("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("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])); @@ -33,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, @@ -131,13 +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); - if (FIXED_NAVIGATION_KEYS.has(key)) { - return { valid: false, message: `${key} is reserved for grid editing and navigation.` }; + const modifiedTab = key === "Tab" && modifiers.some((modifier) => modifier === "Ctrl" || modifier === "Alt" || modifier === "Meta"); + if (FIXED_NAVIGATION_KEYS.has(key) && !modifiedTab) { + 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 }; } @@ -148,10 +127,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; } @@ -187,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"; @@ -236,3 +220,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..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 }); @@ -826,11 +922,11 @@ 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"); - 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", () => { @@ -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, /'; - 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*