Skip to content

Logging Generator: messaging fix #54080

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
maryamariyan merged 2 commits into from
Jun 14, 2021
Merged

Logging Generator: messaging fix #54080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f07be
Update test with new expected message
jeffl8n Jun 11, 2021
587e538
Fix Logging Generator Message
jeffl8n Jun 11, 2021
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
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public IReadOnlyList<LoggerClass> GetLogClasses(IEnumerable<ClassDeclarationSynt

if (!found)
{
Diag(DiagnosticDescriptors.TemplateHasNoCorrespondingArgument, ma.GetLocation(), t);
Diag(DiagnosticDescriptors.TemplateHasNoCorrespondingArgument, ma.GetLocation(), t.Key);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<value>Argument is not referenced from the logging message</value>
</data>
<data name="TemplateHasNoCorrespondingArgumentMessage" xml:space="preserve">
<value>Template {0} is not provided as argument to the logging method</value>
<value>Template '{0}' is not provided as argument to the logging method</value>
</data>
<data name="TemplateHasNoCorrespondingArgumentTitle" xml:space="preserve">
<value>Logging template has no corresponding method argument</value>
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions ...libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
4 changes: 2 additions & 2 deletions ...libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentMessage">
<source>Template {0} is not provided as argument to the logging method</source>
<target state="new">Template {0} is not provided as argument to the logging method</target>
<source>Template '{0}' is not provided as argument to the logging method</source>
<target state="new">Template '{0}' is not provided as argument to the logging method</target>
<note />
</trans-unit>
<trans-unit id="TemplateHasNoCorrespondingArgumentTitle">
Expand Down
1 change: 1 addition & 0 deletions .../tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ partial class C

Assert.Single(diagnostics);
Assert.Equal(DiagnosticDescriptors.TemplateHasNoCorrespondingArgument.Id, diagnostics[0].Id);
Assert.Contains("Template 'foo' is not provided as argument to the logging method", diagnostics[0].GetMessage(), StringComparison.InvariantCulture);
}

[Fact]
Expand Down