Skip to content
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

Jump to bottom

Add ClassName property to ResxSourceGenerator #7226

Merged
merged 1 commit into from
May 22, 2024
Merged

Add ClassName property to ResxSourceGenerator #7226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions ...urceGenerator.UnitTests/Resources/SingleString_ClassNameCSharpAsync/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions ...eGenerator.UnitTests/Resources/SingleString_ClassNameCSharpAsync_NS/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions ...rator.UnitTests/Resources/SingleString_ClassNameCSharpAsync_NS1.NS2/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions ...enerator.UnitTests/Resources/SingleString_ClassNameVisualBasicAsync/Resources.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions ...rator.UnitTests/Resources/SingleString_ClassNameVisualBasicAsync_NS/Resources.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions ....UnitTests/Resources/SingleString_ClassNameVisualBasicAsync_NS1.NS2/Resources.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions ...ourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/ResxGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,68 @@ public async Task SingleString_RelativeDirVisualBasicAsync(string relativeDir)
}.AddGeneratedSources().RunAsync();
}

[Theory]
[InlineData("")]
[InlineData("NS")]
[InlineData("NS1.NS2")]
public async Task SingleString_ClassNameCSharpAsync(string className)
{
var code = ResxHeader
+ @" <data name=""Name"" xml:space=""preserve"">
<value>value</value>
<comment>comment</comment>
</data>"
+ ResxFooter;

await new VerifyCS.Test(identifier: className)
{
TestState =
{
AdditionalFiles = { ("/0/Resources.resx", code) },
AnalyzerConfigFiles =
{
("/.globalconfig", $@"
is_global = true

[/0/Resources.resx]
build_metadata.AdditionalFiles.ClassName = {className}
"),
},
},
}.AddGeneratedSources().RunAsync();
}

[Theory]
[InlineData("")]
[InlineData("NS")]
[InlineData("NS1.NS2")]
public async Task SingleString_ClassNameVisualBasicAsync(string className)
{
var code = ResxHeader
+ @" <data name=""Name"" xml:space=""preserve"">
<value>value</value>
<comment>comment</comment>
</data>"
+ ResxFooter;

await new VerifyVB.Test(identifier: className)
{
TestState =
{
AdditionalFiles = { ("/0/Resources.resx", code) },
AnalyzerConfigFiles =
{
("/.globalconfig", $@"
is_global = true

[/0/Resources.resx]
build_metadata.AdditionalFiles.ClassName = {className}
"),
},
},
}.AddGeneratedSources().RunAsync();
}

[Theory]
[CombinatorialData]
public async Task SingleString_OmitGetResourceStringCSharpAsync(bool omitGetResourceString)
Expand Down
4 changes: 3 additions & 1 deletion ...s.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/AbstractResxGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
resourceName = relativeDir.Replace(Path.DirectorySeparatorChar, '.').Replace(Path.AltDirectorySeparatorChar, '.') + resourceName;
}

options.TryGetValue("build_metadata.AdditionalFiles.ClassName", out var resourceClassName);

if (!options.TryGetValue("build_metadata.AdditionalFiles.OmitGetResourceString", out var omitGetResourceStringText)
|| !bool.TryParse(omitGetResourceStringText, out var omitGetResourceString))
{
Expand Down Expand Up @@ -120,7 +122,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
ResourceFile: resourceFile,
ResourceName: string.Join(".", rootNamespace, resourceName),
ResourceHintName: resourceHintName,
ResourceClassName: null,
ResourceClassName: resourceClassName,
OmitGetResourceString: omitGetResourceString,
AsConstants: asConstants,
IncludeDefaultValues: includeDefaultValues,
Expand Down
1 change: 1 addition & 0 deletions src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ string getCompilerVisibleProperties()
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="WithCulture" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="GenerateSource" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="RelativeDir" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="ClassName" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="OmitGetResourceString" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="AsConstants" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="IncludeDefaultValues" />
Expand Down