Merge pull request #75645 from CyrusNajmabadi/useConditionalTopLevel

Fix 'use conditional expression' in top level statements
dotnet · Oct 29, 2024 · 1105596 · 1105596
2 parents 57f05a3 + 9be9f49
commit 1105596
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/...yzers/CSharp/Tests/UseConditionalExpression/UseConditionalExpressionForAssignmentTests.cs b/...yzers/CSharp/Tests/UseConditionalExpression/UseConditionalExpressionForAssignmentTests.cs
@@ -19,7 +19,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.UseConditionalExpressio
     CSharpUseConditionalExpressionForAssignmentCodeFixProvider>;
 
 [Trait(Traits.Feature, Traits.Features.CodeActionsUseConditionalExpression)]
-public partial class UseConditionalExpressionForAssignmentTests
+public sealed partial class UseConditionalExpressionForAssignmentTests
 {
     private static async Task TestMissingAsync(
         string testCode,
@@ -2102,4 +2102,47 @@ public static void Test(object obj)
             }
             """);
     }
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/71403")]
+    public async Task TestGlobalStatements()
+    {
+        await new VerifyCS.Test
+        {
+            TestCode = """
+                #nullable enable
+
+                using System;
+
+                object? x = null;
+                object? y = null;
+                object? z;
+
+                [|if|] (x != null)
+                {
+                    z = x;
+                }
+                else
+                {
+                    z = y;
+                }
+
+                Console.WriteLine($"{x}{y}{z}");
+                """,
+            FixedCode = """
+                #nullable enable
+
+                using System;
+
+                object? x = null;
+                object? y = null;
+                object? z = x != null ? x : y;
+            
+                Console.WriteLine($"{x}{y}{z}");
+                """,
+            LanguageVersion = LanguageVersion.CSharp9,
+            TestState = {
+                OutputKind = OutputKind.ConsoleApplication,
+            }
+        }.RunAsync();
+    }
 }
diff --git a/...lExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs b/...lExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs
@@ -60,7 +60,7 @@ protected override async Task FixOneAsync(
         SyntaxEditor editor, SyntaxFormattingOptions formattingOptions, CancellationToken cancellationToken)
     {
         var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
-        var ifStatement = diagnostic.AdditionalLocations[0].FindNode(cancellationToken);
+        var ifStatement = diagnostic.AdditionalLocations[0].FindNode(getInnermostNodeForTie: true, cancellationToken);
 
         var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
         var ifOperation = (IConditionalOperation)semanticModel.GetOperation(ifStatement, cancellationToken)!;