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(),