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