Add ClassName property to ResxSourceGenerator

dotnet · Mar 6, 2024 · 7aba2ca · 7aba2ca
1 parent 4af0601
commit 7aba2ca
Show file tree

Hide file tree

Showing 9 changed files with 239 additions and 1 deletion.
diff --git a/...urceGenerator.UnitTests/Resources/SingleString_ClassNameCSharpAsync/Resources.Designer.cs b/...urceGenerator.UnitTests/Resources/SingleString_ClassNameCSharpAsync/Resources.Designer.cs
diff --git a/...eGenerator.UnitTests/Resources/SingleString_ClassNameCSharpAsync_NS/Resources.Designer.cs b/...eGenerator.UnitTests/Resources/SingleString_ClassNameCSharpAsync_NS/Resources.Designer.cs
diff --git a/...rator.UnitTests/Resources/SingleString_ClassNameCSharpAsync_NS1.NS2/Resources.Designer.cs b/...rator.UnitTests/Resources/SingleString_ClassNameCSharpAsync_NS1.NS2/Resources.Designer.cs
diff --git a/...enerator.UnitTests/Resources/SingleString_ClassNameVisualBasicAsync/Resources.Designer.vb b/...enerator.UnitTests/Resources/SingleString_ClassNameVisualBasicAsync/Resources.Designer.vb
diff --git a/...rator.UnitTests/Resources/SingleString_ClassNameVisualBasicAsync_NS/Resources.Designer.vb b/...rator.UnitTests/Resources/SingleString_ClassNameVisualBasicAsync_NS/Resources.Designer.vb
diff --git a/....UnitTests/Resources/SingleString_ClassNameVisualBasicAsync_NS1.NS2/Resources.Designer.vb b/....UnitTests/Resources/SingleString_ClassNameVisualBasicAsync_NS1.NS2/Resources.Designer.vb
diff --git a/...ourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/ResxGeneratorTests.cs b/...ourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/ResxGeneratorTests.cs
@@ -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)

diff --git a/...s.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/AbstractResxGenerator.cs b/...s.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/AbstractResxGenerator.cs
@@ -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))
                     {
@@ -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,

diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs b/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
@@ -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" />