Skip to content

Recognize C# record as a type in CreateCSharpManifestResourceName #13870

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

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −1
Draft

Recognize C# record as a type in CreateCSharpManifestResourceName #13870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
246d3eb
Initial plan
Copilot May 26, 2026
bf5b987
Recognize C# `record` as a type in CreateCSharpManifestResourceName
Copilot May 26, 2026
b751e91
Rename test method to RecordTypeResolution per code review
Copilot May 26, 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
1 change: 1 addition & 0 deletions src/Shared/LanguageParser/CSharptokenEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ internal override bool FindNextToken()
"is", "lock", "long", "namespace", "new",
"object", "operator", "out", "override", "params",
"private", "protected", "public", "readonly",
"record",
"ref", "return", "sbyte", "sealed", "short",
"sizeof", "stackalloc", "static", "string",
"struct", "switch", "this", "throw", "try",
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks.UnitTests/CSharpParserUtilitites_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,18 @@ public void Regress_Mutation_SingleLineCommentsShouldBeIgnored(string fileConten
AssertParse(fileContents, "n2.c");
}

[Theory]
[InlineData("namespace MyNamespace { record MyRecord(string Name); }", "MyNamespace.MyRecord")]
[InlineData("namespace MyNamespace; record MyRecord(string Name);", "MyNamespace.MyRecord")]
[InlineData("record MyRecord(string Name);", "MyRecord")]
[InlineData("namespace MyNamespace { public sealed record MyRecord { } }", "MyNamespace.MyRecord")]
[InlineData("namespace MyNamespace { public record class MyRecord { } }", "MyNamespace.MyRecord")]
[InlineData("namespace MyNamespace { record MyRecord(string Name); public static class Extensions { } }", "MyNamespace.MyRecord")]
public void RecordTypeResolution(string fileContents, string expected)
{
AssertParse(fileContents, expected);
}

/*
* Method: AssertParse
*
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/CSharpParserUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private static ExtractedClassName Extract(CSharpTokenizer tokens)
result.IsInsideConditionalBlock = true;
}
}
else if (t.InnerText == "class")
else if (t.InnerText == "class" || t.InnerText == "record")
Copy link
Copy Markdown
Member

@JanProvaznik JanProvaznik May 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm I am a bit concerned what happens when people use record struct and record class, how is this tokenized in roslyn? 🤔 . But this PR improves on the current state where we don't recognize records at all...

Copy link
Copy Markdown

@RonHeck RonHeck May 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the end, also "enum", "structs" and interfaces are not recognized when it comes to resource name generation. Not sure if this method is the right place to find the type name regarding all possible types or if it will break other code.

{
state.ResolvingClass = true;
if (state.InsideConditionalDirective)
Expand Down