VB -> C#: Convert orderby distinct in linq correctly - fixes #635

icsharpcode · Jul 5, 2021 · e98a632 · e98a632
1 parent 8278d9d
commit e98a632
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### VB -> C#
 
+* Convert `orderby distinct` in linq - fixes #635
 
 ### C# -> VB
 

diff --git a/CodeConverter/CSharp/QueryConverter.cs b/CodeConverter/CSharp/QueryConverter.cs
@@ -93,12 +93,12 @@ public async Task<CSharpSyntaxNode> ConvertClausesAsync(SyntaxList<VBSyntax.Quer
                     new Queue<(SyntaxList<CSSyntax.QueryClauseSyntax>, VBSyntax.QueryClauseSyntax)>();
                 while (vbBodyClauses.Any() && !RequiresMethodInvocation(vbBodyClauses.Peek())) {
                     var convertedClauses = new List<CSSyntax.QueryClauseSyntax>();
-                    while (vbBodyClauses.Any() && !RequiredContinuation(vbBodyClauses.Peek(), vbBodyClauses.Count - 1)) {
+                    while (vbBodyClauses.Any() && !RequiredContinuation(vbBodyClauses.Peek(), vbBodyClauses.Count - 1) && !RequiresMethodInvocation(vbBodyClauses.Peek())) {
                         convertedClauses.Add(await ConvertQueryBodyClauseAsync(vbBodyClauses.Dequeue()));
                     }
 
                     var convertQueryBodyClauses = (SyntaxFactory.List(convertedClauses),
-                        vbBodyClauses.Any() ? vbBodyClauses.Dequeue() : null);
+                        vbBodyClauses.Any() && !RequiresMethodInvocation(vbBodyClauses.Peek()) ? vbBodyClauses.Dequeue() : null);
                     querySectionsReversed.Enqueue(convertQueryBodyClauses);
                 }
                 querySegments.Add((querySectionsReversed, vbBodyClauses.Any() ? vbBodyClauses.Dequeue() : null));

diff --git a/Tests/CSharp/ExpressionTests/LinqExpressionTests.cs b/Tests/CSharp/ExpressionTests/LinqExpressionTests.cs
@@ -6,6 +6,34 @@ namespace ICSharpCode.CodeConverter.Tests.CSharp.ExpressionTests
 {
     public class LinqExpressionTests : ConverterTestBase
     {
+        [Fact]
+        public async Task Issue635_LinqDistinctOrderByAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(@"
+Imports System.Collections.Generic
+Imports System.Linq
+
+Public Class Issue635
+    Dim l As List(Of Integer)
+    Dim listSortedDistinct = From x In l Order By x Distinct
+End Class",
+@"using System.Collections.Generic;
+using System.Linq;
+
+public partial class Issue635
+{
+    public Issue635()
+    {
+        listSortedDistinct = (from x in l
+                              orderby x
+                              select x).Distinct();
+    }
+
+    private List<int> l;
+    private object listSortedDistinct;
+}");
+        }
+
         [Fact]
         public async Task Linq1Async()
         {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

		### VB -> C#

		* Convert `orderby distinct` in linq - fixes #635

		### C# -> VB

Expand Down