Skip to content

Small refactoring in analyzer. #36736

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
cincuranet merged 1 commit into from
Sep 10, 2025
Merged

Small refactoring in analyzer. #36736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
201 changes: 0 additions & 201 deletions src/EFCore.Analyzers/NullableAttributes.cs
View file
Open in desktop

This file was deleted.

44 changes: 13 additions & 31 deletions src/EFCore.Analyzers/StringsUsageInRawQueriesDiagnosticAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Immutable;
using System.Diagnostics.CodeAnalysis;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Diagnostics;
Expand Down Expand Up @@ -173,23 +172,22 @@ internal static string GetReplacementMethodName(string oldName)
}

private static DiagnosticDescriptor? AnalyzeInvocation(IInvocationOperation invocation)
{
// ...an interpolated string
if (invocation.Arguments[1].Value is IInterpolatedStringOperation interpolatedString
&& AnalyzeInterpolatedString(interpolatedString))
=> invocation.Arguments[1].Value switch
{
return InterpolatedStringDescriptor;
}
// ...an interpolated string
IInterpolatedStringOperation interpolatedString when AnalyzeInterpolatedString(interpolatedString)
=> InterpolatedStringDescriptor,

// ...a string concatenation
if (TryGetStringConcatenation(invocation.Arguments[1].Value, out var concatenation)
&& AnalyzeConcatenation(concatenation))
{
return StringConcatenationDescriptor;
}
// ...a string concatenation
IBinaryOperation
{
OperatorKind: BinaryOperatorKind.Add,
Type.SpecialType: SpecialType.System_String,
} concatenation when AnalyzeConcatenation(concatenation)
=> StringConcatenationDescriptor,

return null;
}
_ => null,
};

private static bool AnalyzeInterpolatedString(IInterpolatedStringOperation interpolatedString)
{
Expand All @@ -215,22 +213,6 @@ private static bool AnalyzeInterpolatedString(IInterpolatedStringOperation inter
return false;
}

private static bool TryGetStringConcatenation(IOperation operation, [NotNullWhen(true)] out IBinaryOperation? concatenation)
{
if (operation is IBinaryOperation
{
OperatorKind: BinaryOperatorKind.Add,
Type.SpecialType: SpecialType.System_String,
} binaryOperation)
{
concatenation = binaryOperation;
return true;
}

concatenation = default;
return false;
}

private static bool AnalyzeConcatenation(IBinaryOperation operation)
{
var left = operation.LeftOperand;
Expand Down
2 changes: 1 addition & 1 deletion ...gInterpolationnRawQueriesAnalyzerTests.cs → ...InterpolationInRawQueriesAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Microsoft.EntityFrameworkCore;

using Verify = CSharpCodeFixVerifier<StringsUsageInRawQueriesDiagnosticAnalyzer, InterpolatedStringUsageInRawQueriesCodeFixProvider>;

public class StringInterpolationnRawQueriesAnalyzerTests
public class StringInterpolationInRawQueriesAnalyzerTests
{
public static readonly TheoryData<string> DoNotReportData =
[
Expand Down
Loading