Take "from the map" off after "clear" only for the whole map

"clear flights from the map" no longer offers to turn Flights on.

Co-authored-by: Manjunath Paparaju <[email protected]>
This commit is contained in:
Sameh KhamisandManjunath Paparaju committed 2026-11-18 20:07:18 -08:00
1 parent 3d31126c72
commit 3a5b10a1f6
3 files changed
+16 -5

No files matched your search

+4 -3
View File
@@ -302,10 +302,11 @@ export function normalizeLine(text, { isRequest = isPlainRequest } = {}) {
const read = polite !== line && polite && isRequest(polite) ? polite : line;
// "remove flights from the map", "clear everything except ships from the
// map": the map is where every layer is taken from. Not the verb's own
// "off" ("turn off the screen" is no layer switch), and not after "show"
// ("show me the view from the map" is a question).
// "off" ("turn off the screen" is no layer switch), not after "show"
// ("show me the view from the map" is a question), and after "clear"
// only for the whole map.
return read.replace(
/^((?:turn|switch) off|hide|remove|disable|clear)\s+(\S.*?)\s+(?:from|off) (?:the )?(?:map|globe|screen|view)$/i,
/^((?:turn|switch) off|hide|remove|disable|clear(?= (?:everything|all|every)\b))\s+(\S.*?)\s+(?:from|off) (?:the )?(?:map|globe|screen|view)$/i,
'$1 $2',
);
}
+9
View File
@@ -816,6 +816,15 @@ test('"except" leaves Satellites to switch off with Space Missions off', () => {
['layer(satellites,off)'],
text,
);
// "clear" takes the ending off only for the whole map: "clear flights
// from the map" never offers to turn Flights on.
assert.ok(
!omnibar
.rows('clear flights from the map', { places: [] })
.rows.some((row) =>
(row.steps || []).some((step) => step.kind === 'layer' && step.enabled),
),
);
// After "show" the ending is part of what is asked.
assert.equal(
omnibar.rows('show me the view from the map', { places: [] }).defaultIndex,