A3: derive the pinned command and catalog key lists in tests

Each command module keeps its own COMMAND_IDS next to its commands; the
engine listing test checks their union against the registry, so a missing
or extra command still fails without one shared list. The menu and palette
tests derive their expectation from the listing and check grouping and
ordering rules; the catalog's runtime keys are scanned from the sources.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
danny 2026-10-30 18:38:41 +01:00
parent da58c83158
commit 95fd9b926f
28 changed files with 329 additions and 262 deletions

View file

@ -53,3 +53,8 @@ impl Command for Quit {
Ok(Outcome::effect(Effect::Quit)) Ok(Outcome::effect(Effect::Quit))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["app.about", "app.quit"];

View file

@ -258,3 +258,9 @@ impl Command for List {
Ok(Outcome::value(Value::Array(list))) Ok(Outcome::value(Value::Array(list)))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] =
&["buffer.close", "buffer.edit", "buffer.get", "buffer.list"];

View file

@ -201,3 +201,8 @@ impl Command for SaveAll {
)) ))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["file.open", "file.save", "file.saveAll"];

View file

@ -955,6 +955,21 @@ impl Command for CreateBranch {
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"git.branches",
"git.checkout",
"git.commit",
"git.createBranch",
"git.lastMessage",
"git.show",
"git.stage",
"git.status",
"git.unstage",
];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

View file

@ -114,3 +114,8 @@ impl Command for Blame {
) )
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["git.blame"];

View file

@ -449,6 +449,11 @@ impl Command for LineChanges {
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["git.lineChanges"];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

View file

@ -221,3 +221,8 @@ impl Command for ShowAt {
) )
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["git.log", "git.showAt", "git.showCommit"];

View file

@ -208,3 +208,13 @@ impl Command for MarkResolved {
) )
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"git.conflictVersions",
"git.markResolved",
"git.merge",
"git.mergeAbort",
];

View file

@ -699,3 +699,18 @@ impl Command for RemoteRemove {
start(state, command, Op::Remove(p.name)) start(state, command, Op::Remove(p.name))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"git.cancel",
"git.clone",
"git.fetch",
"git.pull",
"git.push",
"git.remoteAdd",
"git.remoteRemove",
"git.remoteSetUrl",
"git.remotes",
];

View file

@ -219,3 +219,13 @@ impl Command for StashDrop {
) )
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"git.stash",
"git.stashApply",
"git.stashDrop",
"git.stashList",
];

View file

@ -516,3 +516,8 @@ fn symbol_item(hit: &SymbolHit<'_>, container: bool) -> Value {
} }
item item
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["goto.class", "goto.file", "goto.symbol", "index.status"];

View file

@ -841,6 +841,11 @@ fn cap(text: &str, max: usize) -> String {
text.get(..end).unwrap_or("").to_string() text.get(..end).unwrap_or("").to_string()
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["lsp.completion", "lsp.hover", "lsp.signatureHelp"];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use serde_json::json; use serde_json::json;

View file

@ -135,3 +135,9 @@ impl Command for Log {
Ok(Outcome::value(json!({ "lines": state.lsp.log() }))) Ok(Outcome::value(json!({ "lines": state.lsp.log() })))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] =
&["diagnostics.list", "lsp.log", "lsp.restart", "lsp.status"];

View file

@ -780,6 +780,16 @@ fn notify_summary(state: &mut State, new_name: &str, applied: &edit::Applied) {
); );
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"lsp.definition",
"lsp.prepareRename",
"lsp.references",
"lsp.rename",
];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

View file

@ -80,3 +80,33 @@ pub fn register_builtins(registry: &mut Registry) -> Result<(), EngineError> {
git_stash::register(registry)?; git_stash::register(registry)?;
Ok(()) Ok(())
} }
/// The id lists of every module that registers built-in commands, one entry
/// per module. Each module keeps its own list next to its commands, so new
/// commands in different modules never touch the same lines.
#[cfg(test)]
pub(crate) const BUILTIN_COMMAND_IDS: &[&[&str]] = &[
app::COMMAND_IDS,
buffer::COMMAND_IDS,
file::COMMAND_IDS,
git::COMMAND_IDS,
git_blame::COMMAND_IDS,
git_lines::COMMAND_IDS,
git_log::COMMAND_IDS,
git_merge::COMMAND_IDS,
git_remote::COMMAND_IDS,
git_stash::COMMAND_IDS,
goto::COMMAND_IDS,
lsp_assist::COMMAND_IDS,
lsp_diagnostics::COMMAND_IDS,
lsp_nav::COMMAND_IDS,
project::COMMAND_IDS,
recovery::COMMAND_IDS,
search::COMMAND_IDS,
settings::COMMAND_IDS,
syntax::COMMAND_IDS,
terminal::COMMAND_IDS,
theme::COMMAND_IDS,
toolchain::COMMAND_IDS,
ui::COMMAND_IDS,
];

View file

@ -230,3 +230,13 @@ impl Command for Children {
}))) })))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"project.children",
"project.close",
"project.open",
"project.openDialog",
];

View file

@ -204,3 +204,8 @@ impl Command for Discard {
Ok(Outcome::value(json!({ "discarded": discarded }))) Ok(Outcome::value(json!({ "discarded": discarded })))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["recovery.discard", "recovery.list", "recovery.restore"];

View file

@ -302,3 +302,8 @@ impl From<lutra_search::Match> for SearchMatch {
} }
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["search.cancel", "search.find"];

View file

@ -167,3 +167,13 @@ fn finish(
.ok_or_else(|| EngineError::Internal(format!("setting vanished: {key}")))?; .ok_or_else(|| EngineError::Internal(format!("setting vanished: {key}")))?;
Ok(Outcome::value(json!({ "value": value }))) Ok(Outcome::value(json!({ "value": value })))
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"settings.get",
"settings.list",
"settings.reset",
"settings.set",
];

View file

@ -581,6 +581,11 @@ impl Command for OutlineCommand {
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["syntax.outline"];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

View file

@ -400,6 +400,16 @@ pub fn pump(state: &mut State) {
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &[
"terminal.close",
"terminal.create",
"terminal.input",
"terminal.resize",
];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use serde_json::json; use serde_json::json;

View file

@ -100,3 +100,8 @@ impl Command for SystemPreference {
Ok(Outcome::value(Value::Object(fields))) Ok(Outcome::value(Value::Object(fields)))
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["theme.list", "theme.systemPreference"];

View file

@ -639,6 +639,11 @@ impl Command for DownloadPhpactor {
} }
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["toolchain.downloadPhpactor", "toolchain.status"];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::io::{Read, Write}; use std::io::{Read, Write};

View file

@ -182,6 +182,11 @@ pub fn dispatch(state: &mut State, id: &str, params: Value) -> Option<Outcome> {
Some(Outcome::value(Value::Null)) Some(Outcome::value(Value::Null))
} }
/// The ids of the commands this module registers, checked against the
/// registry by the engine's listing test. Add a new command's id here.
#[cfg(test)]
pub(crate) const COMMAND_IDS: &[&str] = &["ui.registerCommands"];
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::valid_id; use super::valid_id;

View file

@ -467,91 +467,23 @@ mod tests {
let mut engine = Engine::new().unwrap(); let mut engine = Engine::new().unwrap();
engine.register(Box::new(Disabled)).unwrap(); engine.register(Box::new(Disabled)).unwrap();
let list = engine.list_commands(); let list = engine.list_commands();
let ids: Vec<_> = list.iter().map(|c| c.id.as_str()).collect(); let ids: Vec<&str> = list.iter().map(|c| c.id.as_str()).collect();
assert_eq!( let mut sorted = ids.clone();
ids, sorted.sort_unstable();
vec![ assert_eq!(ids, sorted, "the listing is sorted by id");
"app.about", let mut expected: Vec<&str> = cmd::BUILTIN_COMMAND_IDS
"app.quit", .iter()
"buffer.close", .flat_map(|ids| ids.iter().copied())
"buffer.edit", .chain(["test.disabled"])
"buffer.get", .collect();
"buffer.list", expected.sort_unstable();
"diagnostics.list", let missing: Vec<_> = expected.iter().filter(|id| !ids.contains(id)).collect();
"file.open", let extra: Vec<_> = ids.iter().filter(|id| !expected.contains(id)).collect();
"file.save", assert!(
"file.saveAll", missing.is_empty() && extra.is_empty(),
"git.blame", "registered but not in a module's COMMAND_IDS: {extra:?}; listed in COMMAND_IDS but not registered: {missing:?}"
"git.branches",
"git.cancel",
"git.checkout",
"git.clone",
"git.commit",
"git.conflictVersions",
"git.createBranch",
"git.fetch",
"git.lastMessage",
"git.lineChanges",
"git.log",
"git.markResolved",
"git.merge",
"git.mergeAbort",
"git.pull",
"git.push",
"git.remoteAdd",
"git.remoteRemove",
"git.remoteSetUrl",
"git.remotes",
"git.show",
"git.showAt",
"git.showCommit",
"git.stage",
"git.stash",
"git.stashApply",
"git.stashDrop",
"git.stashList",
"git.status",
"git.unstage",
"goto.class",
"goto.file",
"goto.symbol",
"index.status",
"lsp.completion",
"lsp.definition",
"lsp.hover",
"lsp.log",
"lsp.prepareRename",
"lsp.references",
"lsp.rename",
"lsp.restart",
"lsp.signatureHelp",
"lsp.status",
"project.children",
"project.close",
"project.open",
"project.openDialog",
"recovery.discard",
"recovery.list",
"recovery.restore",
"search.cancel",
"search.find",
"settings.get",
"settings.list",
"settings.reset",
"settings.set",
"syntax.outline",
"terminal.close",
"terminal.create",
"terminal.input",
"terminal.resize",
"test.disabled",
"theme.list",
"theme.systemPreference",
"toolchain.downloadPhpactor",
"toolchain.status",
"ui.registerCommands",
]
); );
assert_eq!(ids, expected, "no id is listed twice");
let by_id = |id: &str| list.iter().find(|c| c.id == id).unwrap(); let by_id = |id: &str| list.iter().find(|c| c.id == id).unwrap();
let quit = by_id("app.quit"); let quit = by_id("app.quit");
assert_eq!(quit.default_shortcut.as_deref(), Some("Mod+Q")); assert_eq!(quit.default_shortcut.as_deref(), Some("Mod+Q"));

View file

@ -38,108 +38,85 @@ const usedKeys = sourceFiles(SRC).flatMap((file) =>
})), })),
); );
/** Root of the repository. */
const REPO = join(SRC, "..", "..");
/**
* Lists the Rust files below a directory, leaving out `tests` directories
* and build output.
*
* @param dir - the directory.
*/
function rustFiles(dir: string): string[] {
return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
const path = join(dir, entry.name);
if (entry.isDirectory()) {
return ["tests", "target", "node_modules"].includes(entry.name) ? [] : rustFiles(path);
}
return entry.name.endsWith(".rs") ? [path] : [];
});
}
/**
* The shipped part of a Rust file: everything before its unit test module.
*
* @param file - the path.
*/
function shippedRust(file: string): string {
return readFileSync(file, "utf8").replace(/\r\n/g, "\n").split("\n#[cfg(test)]\nmod tests")[0] ?? "";
}
/**
* Turns a settings enum value into its key segment (`lutra-dark` →
* `lutraDark`).
*
* @param value - the value as the engine stores it.
*/
function camel(value: string): string {
return value.replace(/-([a-z0-9])/g, (_, c: string) => c.toUpperCase());
}
/** /**
* Keys the source never passes to `t` literally because they arrive at * Keys the source never passes to `t` literally because they arrive at
* runtime: theme labels from `theme.list`, the settings' `labelKey`, * runtime, derived from the source so new ones need no list here:
* `descriptionKey`, section names and enum value names from *
* `settings.list`, the `messageKey` of * - any `notification.*` literal: the `messageKey` of `notification`
* `notification` events (engine and desktop host), the keys the * events (engine and desktop host) and of the toasts the frontend raises;
* notifications store passes through a constant, and the Changes * - Rust `*_key: "…"` fields: theme labels and the settings' `labelKey`
* window's commit toasts (M4.2), the branch toasts (M4.5), the merge * and `descriptionKey`;
* toasts (M4.8) and the remote toasts (M4.10), passed as * - per settings definition, its section name (`settings.section.<s>`) and
* `messageKey`. * each enum value (`settings.<key>.value.<value>`).
*/ */
const RUNTIME_KEYS = new Set([ const RUNTIME_KEYS = (() => {
"notification.command.failed", const keys = new Set<string>();
"notification.lsp.failed", const add = (text: string, pattern: RegExp): void => {
"notification.lsp.message", for (const m of text.matchAll(pattern)) {
"notification.lsp.renamed", keys.add(m[1] ?? "");
"notification.project.notLocal", }
"notification.project.openFailed", };
"notification.project.unsavedChanges", for (const file of sourceFiles(SRC)) {
"notification.recovery.corrupt", add(readFileSync(file, "utf8"), /["'`](notification\.[A-Za-z0-9.]+)["'`]/g);
"notification.recovery.unavailable", }
"notification.recovery.writeFailed", for (const file of [...rustFiles(join(REPO, "crates")), ...rustFiles(join(REPO, "apps"))]) {
"notification.save.failed", const text = shippedRust(file);
"notification.vcs.branchCreated", add(text, /"(notification\.[A-Za-z0-9.]+)"/g);
"notification.vcs.checkedOut", add(text, /\b[a-z]+_key:\s*"([a-z][A-Za-z0-9.]*)"/g);
"notification.vcs.checkoutFailed", for (const def of text.matchAll(/\bDef\s*\{([\s\S]*?)\n\s*\},?\n/g)) {
"notification.vcs.checkoutNotSaved", const body = def[1] ?? "";
"notification.vcs.historyNoFile", const key = /\bkey:\s*"([^"]+)"/.exec(body)?.[1];
"notification.vcs.commitNotSaved", const section = /\bsection:\s*"([^"]+)"/.exec(body)?.[1];
"notification.vcs.committed", if (section !== undefined) {
"notification.vcs.mergeAborted", keys.add(`settings.section.${section}`);
"notification.vcs.mergeConflicts", }
"notification.vcs.mergeFailed", const values = /Kind::Enum\(&\[([^\]]*)\]\)/.exec(body)?.[1] ?? "";
"notification.vcs.mergeNotSaved", for (const value of values.matchAll(/"([^"]+)"/g)) {
"notification.vcs.mergeUpToDate", keys.add(`settings.${key ?? ""}.value.${camel(value[1] ?? "")}`);
"notification.vcs.merged", }
"notification.vcs.newBranchFailed", }
"notification.vcs.cloned", }
"notification.vcs.fetchFailed", keys.delete("");
"notification.vcs.fetched", return keys;
"notification.vcs.pullFailed", })();
"notification.vcs.pullNotSaved",
"notification.vcs.pulled",
"notification.vcs.pushFailed",
"notification.vcs.pushed",
"notification.vcs.pushedUpstream",
"notification.vcs.remoteCancelled",
"notification.vcs.resolved",
"notification.vcs.stashApplied",
"notification.vcs.stashDropped",
"notification.vcs.stashPopped",
"notification.vcs.stashed",
"notification.settings.corrupt",
"notification.settings.corruptNotMoved",
"notification.settings.unavailable",
"notification.toolchain.downloadDone",
"notification.toolchain.downloadFailed",
"notification.toolchain.downloadStarted",
"notification.toolchain.phpMissing",
"notification.vfs.pumpFailed",
"notification.watch.failed",
"settings.appearance.theme.description",
"settings.appearance.theme.label",
"settings.appearance.theme.value.lutraDark",
"settings.appearance.theme.value.lutraLight",
"settings.appearance.theme.value.system",
"settings.editor.autosave.idleSeconds.description",
"settings.editor.autosave.idleSeconds.label",
"settings.editor.autosave.onBlur.description",
"settings.editor.autosave.onBlur.label",
"settings.editor.autosave.onTabSwitch.description",
"settings.editor.autosave.onTabSwitch.label",
"settings.editor.completion.autoPopup.description",
"settings.editor.completion.autoPopup.label",
"settings.editor.completion.delayMs.description",
"settings.editor.completion.delayMs.label",
"settings.editor.fontSize.description",
"settings.editor.fontSize.label",
"settings.editor.hover.delayMs.description",
"settings.editor.hover.delayMs.label",
"settings.git.executable.description",
"settings.git.executable.label",
"settings.git.pull.mode.description",
"settings.git.pull.mode.label",
"settings.git.pull.mode.value.merge",
"settings.git.pull.mode.value.rebase",
"settings.php.executable.description",
"settings.php.executable.label",
"settings.phpactor.autoDownload.description",
"settings.phpactor.autoDownload.label",
"settings.phpactor.path.description",
"settings.phpactor.path.label",
"settings.section.appearance",
"settings.section.editor",
"settings.section.git",
"settings.section.php",
"settings.ui.language.description",
"settings.ui.language.label",
"settings.ui.language.value.en",
"theme.lutraDark",
"theme.lutraLight",
]);
afterEach(() => { afterEach(() => {
vi.restoreAllMocks(); vi.restoreAllMocks();
@ -206,6 +183,19 @@ describe("en.json", () => {
expect(missing).toEqual([]); expect(missing).toEqual([]);
}); });
it("finds the runtime keys of every source", () => {
for (const key of [
"notification.vcs.committed",
"notification.project.unsavedChanges",
"settings.editor.fontSize.label",
"settings.section.git",
"settings.appearance.theme.value.lutraDark",
"theme.lutraLight",
]) {
expect(RUNTIME_KEYS.has(key), key).toBe(true);
}
});
it("has every runtime key", () => { it("has every runtime key", () => {
expect([...RUNTIME_KEYS].filter((key) => !hasMessage(key))).toEqual([]); expect([...RUNTIME_KEYS].filter((key) => !hasMessage(key))).toEqual([]);
}); });

View file

@ -255,49 +255,32 @@ describe("AppMenu", () => {
expect(menu.find("[data-test=menu-button]").attributes("aria-expanded")).toBe("true"); expect(menu.find("[data-test=menu-button]").attributes("aria-expanded")).toBe("true");
const headings = [...document.querySelectorAll("[data-test=menu-group]")].map((g) => g.querySelector(".app-menu__heading")?.textContent.trim()); const headings = [...document.querySelectorAll("[data-test=menu-group]")].map((g) => g.querySelector(".app-menu__heading")?.textContent.trim());
expect(headings).toEqual(["File", "Edit", "View", "Go", "Git", "Help"]); expect(headings).toEqual(["File", "Edit", "View", "Go", "Git", "Help"]);
expect(itemIds()).toEqual([ const listed = listing() as { id: string; menuPath: string | null }[];
const withPath = listed.filter((c) => c.menuPath !== null);
expect([...itemIds()].sort()).toEqual(withPath.map((c) => c.id).sort());
const groups = [...document.querySelectorAll("[data-test=menu-group]")].map((g) => ({
heading: g.querySelector(".app-menu__heading")?.textContent.trim() ?? "",
ids: [...g.querySelectorAll<HTMLElement>("[data-test=menu-item]")].map((el) => el.dataset.command ?? ""),
labels: [...g.querySelectorAll<HTMLElement>("[data-test=menu-item]")].map((el) => el.querySelector(".app-menu__label")?.textContent.trim() ?? ""),
}));
for (const group of groups) {
for (const id of group.ids) {
expect(withPath.find((c) => c.id === id)?.menuPath?.split("/")[0], id).toBe(group.heading);
}
}
expect(groups.find((g) => g.heading === "File")?.ids).toEqual([
"project.openDialog", "project.openDialog",
"file.save", "file.save",
"file.saveAll", "file.saveAll",
"buffer.close", "buffer.close",
"project.close", "project.close",
"app.quit", "app.quit",
"editor.complete",
"editor.parameterInfo",
"editor.quickDocumentation",
"palette.open",
"view.toggleProjectTree",
"view.toggleStructure",
"find.open",
"terminal.open",
"problems.open",
"settings.open",
"goto.fileOpen",
"goto.classOpen",
"goto.symbolOpen",
"vcs.abortMerge",
"vcs.toggleBlame",
"vcs.branches",
"vcs.openChanges",
"vcs.clone",
"vcs.commit",
"vcs.fetch",
"vcs.showLog",
"vcs.manageRemotes",
"vcs.merge",
"vcs.newBranch",
"vcs.nextChange",
"vcs.previousChange",
"vcs.pull",
"vcs.push",
"vcs.refresh",
"vcs.resolveConflicts",
"vcs.showDiff",
"vcs.showHistory",
"vcs.stash",
"vcs.showStashes",
"app.about",
]); ]);
expect(groups.find((g) => g.heading === "Go")?.ids).toEqual(["goto.fileOpen", "goto.classOpen", "goto.symbolOpen"]);
const git = groups.find((g) => g.heading === "Git")?.labels ?? [];
expect(git.length).toBeGreaterThan(1);
expect(git).toEqual([...git].sort((x, y) => x.localeCompare(y)));
expect(itemIds().at(-1)).toBe("app.about");
const close = document.querySelector("[data-command='buffer.close']"); const close = document.querySelector("[data-command='buffer.close']");
expect(close?.textContent).toContain("Close Tab"); expect(close?.textContent).toContain("Close Tab");
expect(close?.querySelector("[data-test=menu-shortcut]")?.textContent).toBe("Ctrl+W"); expect(close?.querySelector("[data-test=menu-shortcut]")?.textContent).toBe("Ctrl+W");

View file

@ -257,49 +257,14 @@ describe("CommandPalette", () => {
await press(PALETTE_KEY); await press(PALETTE_KEY);
expect(wrapper.find("[data-test=palette]").exists()).toBe(true); expect(wrapper.find("[data-test=palette]").exists()).toBe(true);
expect(document.activeElement).toBe(wrapper.find("[data-test=palette-input]").element); expect(document.activeElement).toBe(wrapper.find("[data-test=palette-input]").element);
expect(rows(wrapper)).toEqual([ const offered = (listing() as { id: string; menuPath: string | null; defaultShortcut: string | null; ui: boolean }[])
"vcs.abortMerge", .filter((c) => c.ui || c.menuPath !== null || c.defaultShortcut !== null)
"vcs.toggleBlame", .map((c) => c.id);
"vcs.branches", expect(offered).toContain("palette.open");
"vcs.openChanges", expect(offered).not.toContain("buffer.edit");
"vcs.checkout", expect([...rows(wrapper)].sort()).toEqual([...offered].sort());
"vcs.clone", const labels = wrapper.findAll("[data-test=palette-row] .palette__label").map((label) => label.text());
"project.close", expect(labels).toEqual([...labels].sort((x, y) => x.localeCompare(y)));
"palette.open",
"vcs.commit",
"editor.complete",
"vcs.fetch",
"find.open",
"goto.classOpen",
"goto.fileOpen",
"goto.symbolOpen",
"vcs.showLog",
"vcs.manageRemotes",
"vcs.merge",
"vcs.newBranch",
"vcs.nextChange",
"project.openDialog",
"menu.open",
"editor.parameterInfo",
"vcs.previousChange",
"problems.open",
"vcs.pull",
"vcs.push",
"editor.quickDocumentation",
"app.quit",
"vcs.refresh",
"vcs.resolveConflicts",
"editor.reveal",
"settings.open",
"vcs.showCommit",
"vcs.showDiff",
"vcs.showHistory",
"view.toggleProjectTree",
"view.toggleStructure",
"vcs.stash",
"vcs.showStashes",
"terminal.open",
]);
const quit = wrapper.find("[data-command='app.quit']"); const quit = wrapper.find("[data-command='app.quit']");
expect(quit.find("[data-test=palette-shortcut]").text()).toBe("Ctrl+Q"); expect(quit.find("[data-test=palette-shortcut]").text()).toBe("Ctrl+Q");
expect(quit.text()).toContain("Quit"); expect(quit.text()).toContain("Quit");