From 2fe22202b293a417188250c599763fac597a5c49 Mon Sep 17 00:00:00 2001 From: pasqualevitiello Date: Wed, 18 Nov 2026 13:41:43 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix(composer):=20allow=20`+`=20in=20the=20q?= =?UTF-8?q?uery=20so=20`:+1`=20suggests=20=F0=9F=91=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add `+` to the characters a Composer query may contain, both before the caret and in the suffix that completes the word at the caret. The pattern is shared by every trigger, so `@a+b` now stays an open mention query too. Co-Authored-By: Claude Opus 5.5 --- apps/ui/public/r/composer-query.json | 2 +- .../ui/registry/default/lib/composer-query.ts | 5 +-- packages/ui/src/lib/composer-query.ts | 5 +-- packages/ui/test/lib/composer-query.test.ts | 31 +++++++++++++++++++ 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 packages/ui/test/lib/composer-query.test.ts diff --git a/apps/ui/public/r/composer-query.json b/apps/ui/public/r/composer-query.json index 394a952ab..b3d92e7db 100644 --- a/apps/ui/public/r/composer-query.json +++ b/apps/ui/public/r/composer-query.json @@ -4,7 +4,7 @@ "files": [ { "path": "registry/default/lib/composer-query.ts", - "content": "export function getComposerQuery(\n text: string,\n caret: number,\n triggers: readonly string[],\n): { character: string; text: string; start: number; end: number } | null {\n let start = -1;\n let character = \"\";\n for (const trigger of triggers) {\n if (!trigger || trigger.length > caret) continue;\n const index = text.lastIndexOf(trigger, caret - trigger.length);\n if (index > start) {\n start = index;\n character = trigger;\n }\n }\n if (start < 0 || (start > 0 && !/\\s/u.test(text.charAt(start - 1))))\n return null;\n\n const beforeCaret = text.slice(start + character.length, caret);\n if (/^\\s/u.test(beforeCaret)) return null;\n if (!/^[\\p{L}\\p{M}\\p{N}\\p{Zs}_.’'-]*$/u.test(beforeCaret)) return null;\n\n // Complete the word at the caret without consuming subsequent prose.\n const suffix = /^[\\p{L}\\p{M}\\p{N}_.’'-]*/u.exec(text.slice(caret))?.[0] ?? \"\";\n return {\n character,\n text: (beforeCaret + suffix).replace(/\\p{Zs}+/gu, \" \").trim(),\n start,\n end: caret + suffix.length,\n };\n}\n", + "content": "export function getComposerQuery(\n text: string,\n caret: number,\n triggers: readonly string[],\n): { character: string; text: string; start: number; end: number } | null {\n let start = -1;\n let character = \"\";\n for (const trigger of triggers) {\n if (!trigger || trigger.length > caret) continue;\n const index = text.lastIndexOf(trigger, caret - trigger.length);\n if (index > start) {\n start = index;\n character = trigger;\n }\n }\n if (start < 0 || (start > 0 && !/\\s/u.test(text.charAt(start - 1))))\n return null;\n\n const beforeCaret = text.slice(start + character.length, caret);\n if (/^\\s/u.test(beforeCaret)) return null;\n if (!/^[\\p{L}\\p{M}\\p{N}\\p{Zs}_.’'+-]*$/u.test(beforeCaret)) return null;\n\n // Complete the word at the caret without consuming subsequent prose.\n const suffix =\n /^[\\p{L}\\p{M}\\p{N}_.’'+-]*/u.exec(text.slice(caret))?.[0] ?? \"\";\n return {\n character,\n text: (beforeCaret + suffix).replace(/\\p{Zs}+/gu, \" \").trim(),\n start,\n end: caret + suffix.length,\n };\n}\n", "type": "registry:lib" } ], diff --git a/apps/ui/registry/default/lib/composer-query.ts b/apps/ui/registry/default/lib/composer-query.ts index f79da794a..b81f2f414 100644 --- a/apps/ui/registry/default/lib/composer-query.ts +++ b/apps/ui/registry/default/lib/composer-query.ts @@ -18,10 +18,11 @@ export function getComposerQuery( const beforeCaret = text.slice(start + character.length, caret); if (/^\s/u.test(beforeCaret)) return null; - if (!/^[\p{L}\p{M}\p{N}\p{Zs}_.’'-]*$/u.test(beforeCaret)) return null; + if (!/^[\p{L}\p{M}\p{N}\p{Zs}_.’'+-]*$/u.test(beforeCaret)) return null; // Complete the word at the caret without consuming subsequent prose. - const suffix = /^[\p{L}\p{M}\p{N}_.’'-]*/u.exec(text.slice(caret))?.[0] ?? ""; + const suffix = + /^[\p{L}\p{M}\p{N}_.’'+-]*/u.exec(text.slice(caret))?.[0] ?? ""; return { character, text: (beforeCaret + suffix).replace(/\p{Zs}+/gu, " ").trim(), diff --git a/packages/ui/src/lib/composer-query.ts b/packages/ui/src/lib/composer-query.ts index f79da794a..b81f2f414 100644 --- a/packages/ui/src/lib/composer-query.ts +++ b/packages/ui/src/lib/composer-query.ts @@ -18,10 +18,11 @@ export function getComposerQuery( const beforeCaret = text.slice(start + character.length, caret); if (/^\s/u.test(beforeCaret)) return null; - if (!/^[\p{L}\p{M}\p{N}\p{Zs}_.’'-]*$/u.test(beforeCaret)) return null; + if (!/^[\p{L}\p{M}\p{N}\p{Zs}_.’'+-]*$/u.test(beforeCaret)) return null; // Complete the word at the caret without consuming subsequent prose. - const suffix = /^[\p{L}\p{M}\p{N}_.’'-]*/u.exec(text.slice(caret))?.[0] ?? ""; + const suffix = + /^[\p{L}\p{M}\p{N}_.’'+-]*/u.exec(text.slice(caret))?.[0] ?? ""; return { character, text: (beforeCaret + suffix).replace(/\p{Zs}+/gu, " ").trim(), diff --git a/packages/ui/test/lib/composer-query.test.ts b/packages/ui/test/lib/composer-query.test.ts new file mode 100644 index 000000000..218a58fa9 --- /dev/null +++ b/packages/ui/test/lib/composer-query.test.ts @@ -0,0 +1,31 @@ +import { describe, expect, test } from "bun:test"; +import { getComposerQuery } from "../../src/lib/composer-query"; + +describe("getComposerQuery", () => { + test("keeps `+` in an emoji query with the caret at the end", () => { + expect(getComposerQuery(":+1", 3, [":"])).toEqual({ + character: ":", + text: "+1", + start: 0, + end: 3, + }); + }); + + test("completes `+1` when the caret sits after `:+`", () => { + expect(getComposerQuery(":+1", 2, [":"])).toEqual({ + character: ":", + text: "+1", + start: 0, + end: 3, + }); + }); + + test("keeps a mention open across `+`, since every trigger shares the pattern", () => { + expect(getComposerQuery("@a+b", 4, ["@"])).toEqual({ + character: "@", + text: "a+b", + start: 0, + end: 4, + }); + }); +}); From a51c7323797ebffabe8e5c4d5757948587327c79 Mon Sep 17 00:00:00 2001 From: pasqualevitiello Date: Wed, 18 Nov 2026 13:52:14 +0100 Subject: [PATCH 2/2] test(composer): remove query tests from this change --- packages/ui/test/lib/composer-query.test.ts | 31 --------------------- 1 file changed, 31 deletions(-) delete mode 100644 packages/ui/test/lib/composer-query.test.ts diff --git a/packages/ui/test/lib/composer-query.test.ts b/packages/ui/test/lib/composer-query.test.ts deleted file mode 100644 index 218a58fa9..000000000 --- a/packages/ui/test/lib/composer-query.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { getComposerQuery } from "../../src/lib/composer-query"; - -describe("getComposerQuery", () => { - test("keeps `+` in an emoji query with the caret at the end", () => { - expect(getComposerQuery(":+1", 3, [":"])).toEqual({ - character: ":", - text: "+1", - start: 0, - end: 3, - }); - }); - - test("completes `+1` when the caret sits after `:+`", () => { - expect(getComposerQuery(":+1", 2, [":"])).toEqual({ - character: ":", - text: "+1", - start: 0, - end: 3, - }); - }); - - test("keeps a mention open across `+`, since every trigger shares the pattern", () => { - expect(getComposerQuery("@a+b", 4, ["@"])).toEqual({ - character: "@", - text: "a+b", - start: 0, - end: 4, - }); - }); -});