Skip to content

Src gen: use GetBestTypeByMetadataName instead of GetTypeByMetadataName #59092

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
steveharter merged 11 commits into from
Sep 29, 2021
+165 −29
Merged

Src gen: use GetBestTypeByMetadataName instead of GetTypeByMetadataName #59092

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
28db0c6
Use GetBestTypeByMetadataName instead of GetTypeByMetadataName
steveharter Sep 14, 2021
25dcab8
Fix merge issue
steveharter Sep 14, 2021
ff67850
Add unit test to Logging generator
steveharter Sep 15, 2021
a3e6eb1
Misc test cleanup
steveharter Sep 16, 2021
9c89de0
Attempt to address wasm test failure
steveharter Sep 16, 2021
46b3905
temp: remove ref to new code
steveharter Sep 18, 2021
051ed1b
temp: remove ref to new code (attempt 2)
steveharter Sep 20, 2021
4d6c7a3
Add back intended code
steveharter Sep 20, 2021
7a4eee9
Add test.proj ProjectExclusions
steveharter Sep 21, 2021
8e2ca47
Fix test exclusion path
steveharter Sep 23, 2021
e1ac8d8
Disambiguate Runtime-provided from Roslyn-provided helpers
steveharter Sep 27, 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
Prev Previous commit
Next Next commit
Attempt to address wasm test failure
  • Loading branch information
@steveharter
steveharter committed Sep 27, 2021
commit 9c89de0e98ac10ec6fcc2ccdd0985e45ca71d165
8 changes: 4 additions & 4 deletions 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 @@ -66,28 +66,28 @@ internal static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
/// </summary>
public IReadOnlyList<LoggerClass> GetLogClasses(IEnumerable<ClassDeclarationSyntax> classes)
{
INamedTypeSymbol loggerMessageAttribute = _compilation.GetBestTypeByMetadataName(LoggerMessageAttribute);
INamedTypeSymbol loggerMessageAttribute = _compilation.GetTypeByMetadataName(LoggerMessageAttribute);
if (loggerMessageAttribute == null)
{
// nothing to do if this type isn't available
return Array.Empty<LoggerClass>();
}

INamedTypeSymbol loggerSymbol = _compilation.GetBestTypeByMetadataName("Microsoft.Extensions.Logging.ILogger");
INamedTypeSymbol loggerSymbol = _compilation.GetTypeByMetadataName("Microsoft.Extensions.Logging.ILogger");
if (loggerSymbol == null)
{
// nothing to do if this type isn't available
return Array.Empty<LoggerClass>();
}

INamedTypeSymbol logLevelSymbol = _compilation.GetBestTypeByMetadataName("Microsoft.Extensions.Logging.LogLevel");
INamedTypeSymbol logLevelSymbol = _compilation.GetTypeByMetadataName("Microsoft.Extensions.Logging.LogLevel");
if (logLevelSymbol == null)
{
// nothing to do if this type isn't available
return Array.Empty<LoggerClass>();
}

INamedTypeSymbol exceptionSymbol = _compilation.GetBestTypeByMetadataName("System.Exception");
INamedTypeSymbol exceptionSymbol = _compilation.GetTypeByMetadataName("System.Exception");
if (exceptionSymbol == null)
{
Diag(DiagnosticDescriptors.MissingRequiredType, null, "System.Exception");
Expand Down
9 changes: 3 additions & 6 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 @@ -680,17 +680,14 @@ static partial class C
Assert.Empty(diagnostics); // should fail quietly on broken code
}

[Fact]
public void MultipleTypeDefinitions()
//[Fact]
//[ActiveIssue("todo", TestPlatforms.Browser)]
internal void MultipleTypeDefinitions()
{
// Adding a dependency to an assembly that has internal definitions of public types
// should not result in a collision and break generation.
// Verify usage of the extension GetBestTypeByMetadataName(this Compilation) instead of Compilation.GetTypeByMetadataName().
var referencedSource = @"
namespace System
{
internal class Exception { }
}
namespace Microsoft.Extensions.Logging
{
internal class LoggerMessageAttribute { }
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/generators/EventSourceGenerator.Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ public Parser(Compilation compilation, Action<Diagnostic> reportDiagnostic, Canc

public EventSourceClass[] GetEventSourceClasses(List<ClassDeclarationSyntax> classDeclarations)
{
INamedTypeSymbol? autogenerateAttribute = _compilation.GetBestTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAutoGenerateAttribute");
INamedTypeSymbol? autogenerateAttribute = _compilation.GetTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAutoGenerateAttribute");
if (autogenerateAttribute is null)
{
// No EventSourceAutoGenerateAttribute
return Array.Empty<EventSourceClass>();
}

INamedTypeSymbol? eventSourceAttribute = _compilation.GetBestTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAttribute");
INamedTypeSymbol? eventSourceAttribute = _compilation.GetTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAttribute");
if (eventSourceAttribute is null)
{
// No EventSourceAttribute
Expand Down