Fix analyzer RCS1077 - Handle IQueryable<T> (#1544)

josefpihrt · web-flow · commit fca5b4e8faed · 2024-09-27T17:33:49.000+02:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix analyzer [RCS1202](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1202) ([PR](https://github.com/dotnet/roslynator/pull/1542))
 - Fix analyzer [RCS1246](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1246) ([PR](https://github.com/dotnet/roslynator/pull/1543))
 - Fix analyzer [RCS1140](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1140) ([PR](https://github.com/dotnet/roslynator/pull/1524))
+- Fix analyzer [RCS1077](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1077) ([PR](https://github.com/dotnet/roslynator/pull/1544))
 
 ## [4.12.6] - 2024-09-23
 
diff --git a/src/Analyzers/CSharp/Analysis/OptimizeLinqMethodCallAnalysis.cs b/src/Analyzers/CSharp/Analysis/OptimizeLinqMethodCallAnalysis.cs
@@ -718,6 +718,14 @@ public static void AnalyzeOrderByIdentity(SyntaxNodeAnalysisContext context, in
         if (lambdaExpression.Body is not IdentifierNameSyntax identifier || identifier.Identifier.Text != lambdaExpression.Parameter.Identifier.Text)
             return;
 
+        if (context.SemanticModel
+            .GetTypeSymbol(invocationInfo.Expression, context.CancellationToken)?
+            .OriginalDefinition
+            .HasMetadataName(MetadataNames.System_Linq_IQueryable_T) == true)
+        {
+            return;
+        }
+
         TextSpan span = TextSpan.FromBounds(invocationInfo.Name.SpanStart, invocationExpression.Span.End);
         Report(context, invocationExpression, span, checkDirectives: true);
     }
diff --git a/src/Tests/Analyzers.Tests/RCS1077OptimizeLinqMethodCallTests.cs b/src/Tests/Analyzers.Tests/RCS1077OptimizeLinqMethodCallTests.cs
@@ -1560,6 +1560,23 @@ void M()
         list.FirstOrDefault(predicate);
     }
 }
+");
+    }
+
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.OptimizeLinqMethodCall)]
+    public async Task TestNoDiagnostic_OrderByToOrder_IQueryable()
+    {
+        await VerifyNoDiagnosticAsync(@"
+using System.Linq;
+
+class C
+{
+    void M()
+    {
+        IQueryable<string> q = null;
+        var x = q.OrderBy(f => f);
+    }
+}
 ");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1560,6 +1560,23 @@ void M()`
`1560`	`1560`	`list.FirstOrDefault(predicate);`
`1561`	`1561`	`}`
`1562`	`1562`	`}`
	`1563`	`+");`
	`1564`	`+ }`
	`1565`	`+`
	`1566`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.OptimizeLinqMethodCall)]`
	`1567`	`+ public async Task TestNoDiagnostic_OrderByToOrder_IQueryable()`
	`1568`	`+ {`
	`1569`	`+ await VerifyNoDiagnosticAsync(@"`
	`1570`	`+using System.Linq;`
	`1571`	`+`
	`1572`	`+class C`
	`1573`	`+{`
	`1574`	`+ void M()`
	`1575`	`+ {`
	`1576`	`+ IQueryable<string> q = null;`
	`1577`	`+ var x = q.OrderBy(f => f);`
	`1578`	`+ }`
	`1579`	`+}`
`1563`	`1580`	`");`
`1564`	`1581`	`}`
`1565`	`1582`	`}`