Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/ui/public/r/composer-query.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
],
Expand Down
5 changes: 3 additions & 2 deletions apps/ui/registry/default/lib/composer-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/src/lib/composer-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Loading