C1: alpha dry run fixes (Ctrl+C in terminal, ignored colour, find singular)
- Terminal: undo an inherited "ignore Ctrl+C" flag before starting a ConPTY shell (lutra_proc::enable_ctrl_c). Lutra started by the lutra CLI (CREATE_NEW_PROCESS_GROUP) passed it to every shell, so Ctrl+C stopped nothing. Test reruns itself with that flag. - Engine: an edited .gitignore/.ignore reports TreeChanged for its folder, so the tree greys newly ignored files (Add to .gitignore). - Find: "1 match", "1 file" instead of "1 files". - docs/alpha-checklist.md: steps corrected after the Windows dry run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
30de747ad6
commit
e228d11ef9
11 changed files with 173 additions and 20 deletions
|
|
@ -33,9 +33,22 @@ const list = ref<HTMLElement | null>(null);
|
|||
/** Rows moved by Page Up and Page Down. */
|
||||
const PAGE = 10;
|
||||
|
||||
/**
|
||||
* The match and file counts in words, singular for one.
|
||||
*
|
||||
* @param matches - number of matches.
|
||||
* @param files - number of files.
|
||||
*/
|
||||
function countWords(matches: number, files: number): { matches: string; files: string } {
|
||||
return {
|
||||
matches: matches === 1 ? t("find.count.matches.one") : t("find.count.matches.other", { count: String(matches) }),
|
||||
files: files === 1 ? t("find.count.files.one") : t("find.count.files.other", { count: String(files) }),
|
||||
};
|
||||
}
|
||||
|
||||
/** The status line under the fields. */
|
||||
const status = computed(() => {
|
||||
const counts = { matches: String(find.matchCount), files: String(find.files.length) };
|
||||
const counts = countWords(find.matchCount, find.files.length);
|
||||
if (find.running) {
|
||||
return t("find.status.running", counts);
|
||||
}
|
||||
|
|
@ -43,7 +56,7 @@ const status = computed(() => {
|
|||
if (!done) {
|
||||
return find.error === null ? t("find.status.idle") : "";
|
||||
}
|
||||
const totals = { matches: String(done.matches), files: String(done.files), ms: String(done.elapsedMs) };
|
||||
const totals = { ...countWords(done.matches, done.files), ms: String(done.elapsedMs) };
|
||||
if (done.cancelled) {
|
||||
return t("find.status.cancelled", totals);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,6 +115,10 @@
|
|||
"editor.tabs.label": "Editor tabs",
|
||||
"editor.tabs.unsaved": "unsaved changes",
|
||||
"find.action.search": "Search",
|
||||
"find.count.files.one": "1 file",
|
||||
"find.count.files.other": "{count} files",
|
||||
"find.count.matches.one": "1 match",
|
||||
"find.count.matches.other": "{count} matches",
|
||||
"find.exclude.label": "Exclude files",
|
||||
"find.exclude.placeholder": "Exclude, e.g. *.min.js, var/**",
|
||||
"find.include.label": "Include files",
|
||||
|
|
@ -125,11 +129,11 @@
|
|||
"find.query.label": "Text to find",
|
||||
"find.query.placeholder": "Find in files",
|
||||
"find.results.label": "Search results",
|
||||
"find.status.cancelled": "Cancelled · {matches} matches in {files} files",
|
||||
"find.status.done": "{matches} matches in {files} files · {ms} ms",
|
||||
"find.status.cancelled": "Cancelled · {matches} in {files}",
|
||||
"find.status.done": "{matches} in {files} · {ms} ms",
|
||||
"find.status.idle": "Type a text and press Enter",
|
||||
"find.status.none": "No matches",
|
||||
"find.status.running": "Searching… {matches} matches in {files} files",
|
||||
"find.status.running": "Searching… {matches} in {files}",
|
||||
"find.status.truncated": "Stopped at {matches} matches; narrow the query or the files to see the rest",
|
||||
"find.toolWindow.title": "Find",
|
||||
"goto.empty.noMatches": "Nothing matches",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue