-
-
Notifications
You must be signed in to change notification settings - Fork 84
Strong api string localizers generator using incremental generator #994
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.
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
Merged
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
743e88d
StrongApiStringLocalizersGenerator as an incremental generator
jirikanda 92b0ceb
StrongApiStringLocalizersGenerator does not use ResourceServiceCollec…
jirikanda e2f6cf4
StrongApiStringLocalizersGenerator generates neutral values to code d…
jirikanda 578ccc7
Fix StrongApiStringLocalizersGenerator unit test name
jirikanda 0ccc523
Code polishing
jirikanda 4a245c3
Removed SourceGeneratorAdapter
jirikanda 88bfb21
Align Microsoft.Extensions.Localization versions
jirikanda 18ccb5e
StrongApiStringLocalizersGenerator - OS independent tests
jirikanda a63b956
StrongApiStringLocalizersGenerator - memory optimization
jirikanda 736aa65
StrongApiStringLocalizersGenerator - works without csproj change, rem…
jirikanda File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,4 +28,7 @@ | |
| </Compile> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <AdditionalFiles Include="**\*.resx" /> | ||
| </ItemGroup> | ||
| </Project> | ||
6 changes: 0 additions & 6 deletions
6
BlazorAppTest/Resources/ResourcesServiceCollectionInstaller.cs
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
Havit.SourceGenerators.StrongApiStringLocalizers.Tests/Global.resx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <root> | ||
| <!-- | ||
| Microsoft ResX Schema | ||
|
|
||
| Version 2.0 | ||
|
|
||
| The primary goals of this format is to allow a simple XML format | ||
| that is mostly human readable. The generation and parsing of the | ||
| various data types are done through the TypeConverter classes | ||
| associated with the data types. | ||
|
|
||
| Example: | ||
|
|
||
| ... ado.net/XML headers & schema ... | ||
| <resheader name="resmimetype">text/microsoft-resx</resheader> | ||
| <resheader name="version">2.0</resheader> | ||
| <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> | ||
| <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> | ||
| <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> | ||
| <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> | ||
| <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> | ||
| <value>[base64 mime encoded serialized .NET Framework object]</value> | ||
| </data> | ||
| <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||
| <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> | ||
| <comment>This is a comment</comment> | ||
| </data> | ||
|
|
||
| There are any number of "resheader" rows that contain simple | ||
| name/value pairs. | ||
|
|
||
| Each data row contains a name, and value. The row also contains a | ||
| type or mimetype. Type corresponds to a .NET class that support | ||
| text/value conversion through the TypeConverter architecture. | ||
| Classes that don't support this are serialized and stored with the | ||
| mimetype set. | ||
|
|
||
| The mimetype is used for serialized objects, and tells the | ||
| ResXResourceReader how to depersist the object. This is currently not | ||
| extensible. For a given mimetype the value must be set accordingly: | ||
|
|
||
| Note - application/x-microsoft.net.object.binary.base64 is the format | ||
| that the ResXResourceWriter will generate, however the reader can | ||
| read any of the formats listed below. | ||
|
|
||
| mimetype: application/x-microsoft.net.object.binary.base64 | ||
| value : The object must be serialized with | ||
| : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter | ||
| : and then encoded with base64 encoding. | ||
|
|
||
| mimetype: application/x-microsoft.net.object.soap.base64 | ||
| value : The object must be serialized with | ||
| : System.Runtime.Serialization.Formatters.Soap.SoapFormatter | ||
| : and then encoded with base64 encoding. | ||
|
|
||
| mimetype: application/x-microsoft.net.object.bytearray.base64 | ||
| value : The object must be serialized into a byte array | ||
| : using a System.ComponentModel.TypeConverter | ||
| : and then encoded with base64 encoding. | ||
| --> | ||
| <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> | ||
| <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> | ||
| <xsd:element name="root" msdata:IsDataSet="true"> | ||
| <xsd:complexType> | ||
| <xsd:choice maxOccurs="unbounded"> | ||
| <xsd:element name="metadata"> | ||
| <xsd:complexType> | ||
| <xsd:sequence> | ||
| <xsd:element name="value" type="xsd:string" minOccurs="0" /> | ||
| </xsd:sequence> | ||
| <xsd:attribute name="name" use="required" type="xsd:string" /> | ||
| <xsd:attribute name="type" type="xsd:string" /> | ||
| <xsd:attribute name="mimetype" type="xsd:string" /> | ||
| <xsd:attribute ref="xml:space" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| <xsd:element name="assembly"> | ||
| <xsd:complexType> | ||
| <xsd:attribute name="alias" type="xsd:string" /> | ||
| <xsd:attribute name="name" type="xsd:string" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| <xsd:element name="data"> | ||
| <xsd:complexType> | ||
| <xsd:sequence> | ||
| <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | ||
| <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> | ||
| </xsd:sequence> | ||
| <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> | ||
| <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> | ||
| <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> | ||
| <xsd:attribute ref="xml:space" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| <xsd:element name="resheader"> | ||
| <xsd:complexType> | ||
| <xsd:sequence> | ||
| <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | ||
| </xsd:sequence> | ||
| <xsd:attribute name="name" type="xsd:string" use="required" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| </xsd:choice> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| </xsd:schema> | ||
| <resheader name="resmimetype"> | ||
| <value>text/microsoft-resx</value> | ||
| </resheader> | ||
| <resheader name="version"> | ||
| <value>2.0</value> | ||
| </resheader> | ||
| <resheader name="reader"> | ||
| <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||
| </resheader> | ||
| <resheader name="writer"> | ||
| <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||
| </resheader> | ||
| <data name="CzechAndHtml" xml:space="preserve"> | ||
| <value>Čeština je <b>skvělá</b>!</value> | ||
| </data> | ||
| <data name="HelloWorld" xml:space="preserve"> | ||
| <value>Hello world!!!</value> | ||
| <comment>Hello world resource comment.</comment> | ||
| </data> | ||
| </root> |
36 changes: 36 additions & 0 deletions
36
...ngApiStringLocalizers.Tests/Havit.SourceGenerators.StrongApiStringLocalizers.Tests.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>net9.0</TargetFrameworks> | ||
| <IsPackable>false</IsPackable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <EnableMSTestRunner>true</EnableMSTestRunner> | ||
| <OutputType>Exe</OutputType> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Remove="Global.resx" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="Global.resx"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" /> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" /> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" /> | ||
| <PackageReference Include="MSTest" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Havit.SourceGenerators.StrongApiStringLocalizers\Havit.SourceGenerators.StrongApiStringLocalizers.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
124 changes: 124 additions & 0 deletions
124
...urceGenerators.StrongApiStringLocalizers.Tests/StrongApiStringLocalizersGeneratorTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| using System.Collections.Immutable; | ||
| using Microsoft.CodeAnalysis.Testing; | ||
| using Microsoft.CodeAnalysis.Text; | ||
| using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel; | ||
|
|
||
| namespace Havit.SourceGenerators.StrongApiStringLocalizers.Tests; | ||
|
|
||
| [TestClass] | ||
| public class StrongApiStringLocalizersGeneratorTests | ||
| { | ||
| [TestMethod] | ||
| public async Task StrongApiStringLocalizersGenerator_Test() | ||
| { | ||
| // Arrange | ||
|
|
||
| using var globalResxStream = File.OpenRead("Global.resx"); | ||
|
|
||
| string projectDir = Environment.CurrentDirectory; | ||
|
|
||
| var test = new Microsoft.CodeAnalysis.CSharp.Testing.CSharpSourceGeneratorTest<StrongApiStringLocalizersGenerator, Microsoft.CodeAnalysis.Testing.DefaultVerifier> | ||
| { | ||
| TestState = | ||
| { | ||
| AnalyzerConfigFiles = | ||
| { | ||
| ($"/.editorconfig", $@""" | ||
| is_global=true | ||
| build_property.RootNamespace = MyApp.Resources | ||
| build_property.ProjectDir = {projectDir} | ||
| """) | ||
| } | ||
| }, | ||
| ReferenceAssemblies = ReferenceAssemblies.Net | ||
| .Net90 | ||
| .AddPackages(ImmutableArray.Create( | ||
| new PackageIdentity("Microsoft.Extensions.Localization", "9.0.1"))) // we are using IStringLocalizer from this package in the generated code | ||
| }; | ||
|
|
||
| // resource file | ||
| test.TestState.AdditionalFiles.Add((Path.Combine(projectDir, "MyResources", "Global.resx"), SourceText.From(globalResxStream))); | ||
|
|
||
| // EXPECTED OUTPUT | ||
|
|
||
| test.TestState.GeneratedSources.Add((typeof(StrongApiStringLocalizersGenerator), "MyApp.Resources.MyResources.IGlobalLocalizer.g.cs", @"// <auto-generated /> | ||
|
|
||
| namespace MyApp.Resources.MyResources; | ||
|
|
||
| using System.CodeDom.Compiler; | ||
| using Microsoft.Extensions.Localization; | ||
|
|
||
| [GeneratedCode(""Havit.SourceGenerators.StrongApiStringLocalizers.StrongApiStringLocalizersGenerator"", ""2.0.0.0"")] | ||
| public interface IGlobalLocalizer : IStringLocalizer | ||
| { | ||
| /// <summary> | ||
| /// Čeština je <b>skvělá</b>! | ||
| /// </summary> | ||
| LocalizedString CzechAndHtml { get; } | ||
|
|
||
| /// <summary> | ||
| /// Hello world resource comment. | ||
| /// </summary> | ||
| LocalizedString HelloWorld { get; } | ||
|
|
||
| } | ||
| ")); | ||
|
|
||
| // TestProject - defined by the TestState implementation | ||
| test.TestState.GeneratedSources.Add((typeof(StrongApiStringLocalizersGenerator), $"MyApp.Resources.MyResources.GlobalLocalizer.g.cs", @"// <auto-generated /> | ||
|
|
||
| namespace MyApp.Resources.MyResources; | ||
|
|
||
| using System.CodeDom.Compiler; | ||
| using System.Collections.Generic; | ||
| using Microsoft.Extensions.Localization; | ||
|
|
||
| [GeneratedCode(""Havit.SourceGenerators.StrongApiStringLocalizers.StrongApiStringLocalizersGenerator"", ""2.0.0.0"")] | ||
| public class GlobalLocalizer : IGlobalLocalizer | ||
| { | ||
| private readonly IStringLocalizer _localizer; | ||
|
|
||
| public GlobalLocalizer(IStringLocalizerFactory stringLocalizerFactory) | ||
| { | ||
| _localizer = stringLocalizerFactory.Create(""MyResources.Global"", ""TestProject""); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Čeština je <b>skvělá</b>! | ||
| /// </summary> | ||
| public LocalizedString CzechAndHtml => _localizer[""CzechAndHtml""]; | ||
|
|
||
| /// <summary> | ||
| /// Hello world resource comment. | ||
| /// </summary> | ||
| public LocalizedString HelloWorld => _localizer[""HelloWorld""]; | ||
|
|
||
| LocalizedString IStringLocalizer.this[string name] => _localizer[name]; | ||
| LocalizedString IStringLocalizer.this[string name, params object[] arguments] => _localizer[name, arguments]; | ||
| IEnumerable<LocalizedString> IStringLocalizer.GetAllStrings(bool includeParentCultures) => _localizer.GetAllStrings(includeParentCultures); | ||
| } | ||
| ")); | ||
|
|
||
| test.TestState.GeneratedSources.Add((typeof(StrongApiStringLocalizersGenerator), "MyApp.Resources.ServiceCollectionExtensions.g.cs", @"// <auto-generated /> | ||
|
|
||
| namespace MyApp.Resources; | ||
|
|
||
| using System.CodeDom.Compiler; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Localization; | ||
|
|
||
| [GeneratedCode(""Havit.SourceGenerators.StrongApiStringLocalizers.StrongApiStringLocalizersGenerator"", ""2.0.0.0"")] | ||
| public static class ServiceCollectionExtensions | ||
| { | ||
| public static IServiceCollection AddGeneratedResourceWrappers(this IServiceCollection services) | ||
| { | ||
| services.AddTransient<MyApp.Resources.MyResources.IGlobalLocalizer, MyApp.Resources.MyResources.GlobalLocalizer>(); | ||
| return services; | ||
| } | ||
| } | ||
| ")); | ||
|
|
||
| // Act + Assert | ||
| await test.RunAsync(); | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
Havit.SourceGenerators.StrongApiStringLocalizers/AnalyzerReleases.Shipped.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ; Shipped analyzer releases | ||
| ; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md | ||
|
|
9 changes: 9 additions & 0 deletions
9
Havit.SourceGenerators.StrongApiStringLocalizers/AnalyzerReleases.Unshipped.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| ; Unshipped analyzer release | ||
| ; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md | ||
|
|
||
| ### New Rules | ||
|
|
||
| Rule ID | Category | Severity | Notes | ||
| --------|----------|----------|-------------------- | ||
| HLG1001 | Usage | Warning | No resx file found | ||
| HLG1002 | Usage | Warning | Cannot parse RESX file |
14 changes: 0 additions & 14 deletions
14
Havit.SourceGenerators.StrongApiStringLocalizers/BuilderExtensions.cs
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.