Skip to content

Have 'use explicit type' add usings as necessary to minimally qualify the type #79574

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
merged 2 commits into from
Jul 24, 2025
Merged

Have 'use explicit type' add usings as necessary to minimally qualify the type #79574

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
8b94212
Have 'use explicit type' add usings as necessary to minimally qualify…
CyrusNajmabadi Jul 24, 2025
a8cc9e2
Update test
CyrusNajmabadi Jul 24, 2025
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
8 changes: 5 additions & 3 deletions src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Microsoft.CodeAnalysis.LanguageService;
using Microsoft.CodeAnalysis.PooledObjects;
using Microsoft.CodeAnalysis.Shared.Extensions;
using Microsoft.CodeAnalysis.Simplification;
using Roslyn.Utilities;

namespace Microsoft.CodeAnalysis.CSharp.TypeStyle;
Expand Down Expand Up @@ -224,13 +225,14 @@ private static ExpressionSyntax GenerateTupleDeclaration(
.WithTrailingTrivia(parensDesignation.GetTrailingTrivia());
}

private static SyntaxNode GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSymbol newTypeSymbol)
private static TypeSyntax GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSymbol newTypeSymbol)
{
// We're going to be passed through the simplifier. Tell it to not just convert this back to var (as
// that would defeat the purpose of this refactoring entirely).
var newTypeSyntax = newTypeSymbol
.GenerateTypeSyntax(allowVar: false)
.WithTriviaFrom(typeSyntax);
.GenerateTypeSyntax(allowVar: false)
.WithAdditionalAnnotations(Simplifier.AddImportsAnnotation)
.WithTriviaFrom(typeSyntax);

return newTypeSyntax;
}
Expand Down
8 changes: 6 additions & 2 deletions src/Analyzers/CSharp/Tests/UseImplicitOrExplicitType/UseExplicitTypeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2657,7 +2657,9 @@ void M()
}
""", new TestParameters(options: ExplicitTypeEverywhere()));

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/23907")]
[Fact]
[WorkItem("https://github.com/dotnet/roslyn/issues/23907")]
[WorkItem("https://github.com/dotnet/roslyn/issues/24034")]
public async Task WithNormalFuncSynthesizedLambdaType()
{
var before = """
Expand All @@ -2670,11 +2672,13 @@ void Method()
}
""";
var after = """
using System;

class Program
{
void Method()
{
System.Func<int, string> x = (int i) => i.ToString();
Func<int, string> x = (int i) => i.ToString();
}
}
""";
Expand Down
Loading