Merge pull request #21 from GrahamTheCoder/fix-1174-vb-with-block-null-conditional-12294486853097276888

Fix VB With block conversion with null-conditional operator

Author: GrahamTheCoder

CodeConverter/CSharp/NameExpressionNodeVisitor.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using System.Globalization;
 using ICSharpCode.CodeConverter.CSharp.Replacements;
 using ICSharpCode.CodeConverter.Util.FromRoslyn;
@@ -688,14 +688,19 @@ private static QualifiedNameSyntax Qualify(string qualification, ExpressionSynta
 
     private static bool IsSubPartOfConditionalAccess(VBasic.Syntax.MemberAccessExpressionSyntax node)
     {
-        var firstPossiblyConditionalAncestor = node.Parent;
-        while (firstPossiblyConditionalAncestor != null &&
-               firstPossiblyConditionalAncestor.IsKind(VBasic.SyntaxKind.InvocationExpression,
-                   VBasic.SyntaxKind.SimpleMemberAccessExpression)) {
-            firstPossiblyConditionalAncestor = firstPossiblyConditionalAncestor.Parent;
+        static bool IsMemberAccessChain(SyntaxNode exp) =>
+            exp?.IsKind(VBasic.SyntaxKind.InvocationExpression,
+                VBasic.SyntaxKind.SimpleMemberAccessExpression,
+                VBasic.SyntaxKind.ParenthesizedExpression,
+                VBasic.SyntaxKind.ConditionalAccessExpression) == true;
+
+        for (SyntaxNode child = node, parent = node.Parent; IsMemberAccessChain(parent); child = parent, parent = parent.Parent) {
+            if (parent is VBSyntax.ConditionalAccessExpressionSyntax cae && cae.WhenNotNull == child) {
+                return true; // On right hand side of a ?. conditional access
+            }
         }
 
-        return firstPossiblyConditionalAncestor?.IsKind(VBasic.SyntaxKind.ConditionalAccessExpression) == true;
+        return false;
     }
 
     private static CSharpSyntaxNode ReplaceRightmostIdentifierText(CSharpSyntaxNode expr, SyntaxToken idToken, string overrideIdentifier)

Tests/CSharp/StatementTests/MethodStatementTests.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using ICSharpCode.CodeConverter.Tests.TestRunners;
 using Xunit;
 
@@ -1673,4 +1673,44 @@ public object Func()
     }
 }");
     }
-}
+
+    [Fact]
+    public async Task WithBlockWithNullConditionalAccessAsync()
+    {
+        await TestConversionVisualBasicToCSharpAsync(@"
+Public Class Class1
+    Public Property x As Class1
+    Public Property Name As String
+End Class
+
+Public Class TestClass
+    Private _Data As Class1
+    Private x As String
+
+    Public Sub TestMethod()
+        With _Data
+            x = .x?.Name
+        End With
+    End Sub
+End Class", @"
+public partial class Class1
+{
+    public Class1 x { get; set; }
+    public string Name { get; set; }
+}
+
+public partial class TestClass
+{
+    private Class1 _Data;
+    private string x;
+
+    public void TestMethod()
+    {
+        {
+            ref var withBlock = ref _Data;
+            x = withBlock.x?.Name;
+        }
+    }
+}");
+    }
+}