From 6f959fc3cc7c7305f4cac2dee151da3a7c2aa91f Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Wed, 18 Nov 2026 20:58:18 -0800 Subject: [PATCH] =?UTF-8?q?Read=20"clear=20=E2=80=A6=20except"=20from=20th?= =?UTF-8?q?e=20map=20only=20when=20it=20clears=20every=20other=20layer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "clear all flights except ships from the map" no longer offers to turn Ships on. Co-authored-by: Manjunath Paparaju --- src/ui/omnibarIntent.js | 2 +- src/ui/omnibarRows.test.mjs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ui/omnibarIntent.js b/src/ui/omnibarIntent.js index 9692cec338..e081d5aa29 100644 --- a/src/ui/omnibarIntent.js +++ b/src/ui/omnibarIntent.js @@ -313,7 +313,7 @@ export function normalizeLine(text, { isRequest = isPlainRequest } = {}) { // "clear" takes the whole map: "clear flights" would read as a place. const lower = bare.toLowerCase(); return CLEAR_ALL.test(lower) || - /^clear (?:everything|all|every)\b.*\b(?:except|but|other than|apart from|besides|save for)\b/.test( + /^clear (?:everything|all(?: the)?(?: other)?(?: layers?)?|every layer) (?:except|but|other than|apart from|besides|save for)\b/.test( lower, ) ? bare diff --git a/src/ui/omnibarRows.test.mjs b/src/ui/omnibarRows.test.mjs index ab786aaa1b..247b177578 100644 --- a/src/ui/omnibarRows.test.mjs +++ b/src/ui/omnibarRows.test.mjs @@ -821,6 +821,7 @@ test('"except" leaves Satellites to switch off with Space Missions off', () => { for (const text of [ 'clear flights from the map', 'clear all flights from the map', + 'clear all flights except ships from the map', ]) assert.ok( !omnibar