Skip to content

fix(web): keep pasted decorators as text #8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 5 commits into from
Oct 19, 2026
Merged

fix(web): keep pasted decorators as text #8415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c7c0e3
fix(web): keep pasted decorators as text
Gigioxx Aug 27, 2026
588079b
test(shared): retain explicit decorator-shaped file mentions
juliusmarminge Sep 5, 2026
4fec03d
fix(shared): keep Unicode decorator calls as plain text
juliusmarminge Sep 5, 2026
4ce7eca
Merge remote-tracking branch 'origin/main' into t3code/investigate-is…
juliusmarminge Oct 19, 2026
c3a13f2
test(shared): keep decorator regression coverage focused
juliusmarminge Oct 19, 2026
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
26 changes: 24 additions & 2 deletions packages/shared/src/composerInlineTokens.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,30 @@ describe("collectComposerInlineTokens", () => {
expect(collectComposerInlineTokens("入力 @expo/ui　を追加")).toEqual([]);
});

it("keeps bare non-scoped file paths as mentions", () => {
expect(collectComposerInlineTokens("Inspect @README.md next")).toEqual([
it.each(["@namespace.foo(bar)", "@écrire(option)", "@e\u0301crire(option)"])(
"keeps decorator call %s as plain text",
(reference) => {
expect(collectComposerInlineTokens(`${reference}\nclass Example {}`)).toEqual([]);
},
);

it.each(['@"foo(bar)"', "[foo(bar)](foo%28bar%29)"])(
"keeps an explicit decorator-shaped file reference as a mention: %s",
(reference) => {
expect(collectComposerInlineTokens(`${reference} `)).toEqual([
{
type: "mention",
value: "foo(bar)",
source: reference,
start: 0,
end: reference.length,
},
]);
},
);

it("keeps bare file mentions before whitespace-separated parentheses", () => {
expect(collectComposerInlineTokens("Inspect @README.md (notes)")).toEqual([
{
type: "mention",
value: "README.md",
Expand Down
7 changes: 6 additions & 1 deletion packages/shared/src/composerInlineTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const URI_SCHEME_REGEX = /^[A-Za-z][A-Za-z0-9+.-]*:/;
const WINDOWS_DRIVE_PATH_REGEX = /^[A-Za-z]:[\\/]/;
const SCOPED_PACKAGE_REFERENCE_REGEX =
/^[a-z0-9][a-z0-9._-]*\/[a-z0-9][a-z0-9._-]*(?:\/[^\s@"]+)*$/;
const DECORATOR_CALL_REFERENCE_REGEX = /^[\p{ID_Start}_$][\p{ID_Continue}.$\u200c\u200d]*\(/u;

function collectMentionTokens(text: string): ComposerInlineToken[] {
const matches: ComposerInlineToken[] = [];
Expand Down Expand Up @@ -75,7 +76,11 @@ function collectMentionTokens(text: string): ComposerInlineToken[] {
const prefix = match[1] ?? "";
const quotedPath = match[2];
const path = quotedPath !== undefined ? quotedPath.replace(/\\(.)/g, "$1") : (match[3] ?? "");
if (!path || (quotedPath === undefined && SCOPED_PACKAGE_REFERENCE_REGEX.test(path))) {
if (
!path ||
(quotedPath === undefined &&
(SCOPED_PACKAGE_REFERENCE_REGEX.test(path) || DECORATOR_CALL_REFERENCE_REGEX.test(path)))
) {
continue;
}
const start = (match.index ?? 0) + prefix.length;
Expand Down
Loading