Merge pull request #14984 from CyrusNajmabadi/outVarCrash

Fix crash in 'use out-var'
Fixes #14982

src/EditorFeatures/CSharpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs

@@ -47,6 +47,31 @@ void M()
 }");
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsInlineDeclaration)]
+        public async Task InlineInNestedCall()
+        {
+            await TestAsync(
+@"class C
+{
+    void M()
+    {
+        [|int|] i;
+        if (Foo(int.TryParse(v, out i)))
+        {
+        }
+    }
+}",
+@"class C
+{
+    void M()
+    {
+        if (Foo(int.TryParse(v, out int i)))
+        {
+        }
+    }
+}");
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsInlineDeclaration)]
         public async Task InlineVariableWithConstructor1()
         {

src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationCodeFixProvider.cs

@@ -85,9 +85,12 @@ private Task<Document> FixAsync(Document document, Diagnostic diagnostic, Cancel
             var invocationOrCreationLocation = diagnostic.AdditionalLocations[2];
             var outArgumentContainingStatementLocation = diagnostic.AdditionalLocations[3];
 
+            var root = declaratorLocation.SourceTree.GetRoot(cancellationToken);
+
             var declarator = (VariableDeclaratorSyntax)declaratorLocation.FindNode(cancellationToken);
             var identifier = (IdentifierNameSyntax)identifierLocation.FindNode(cancellationToken);
-            var invocationOrCreation = (ExpressionSyntax)invocationOrCreationLocation.FindNode(cancellationToken);
+            var invocationOrCreation = (ExpressionSyntax)invocationOrCreationLocation.FindNode(
+                getInnermostNodeForTie: true, cancellationToken: cancellationToken);
             var outArgumentContainingStatement = (StatementSyntax)outArgumentContainingStatementLocation.FindNode(cancellationToken);
 
             var declaration = (VariableDeclarationSyntax)declarator.Parent;

src/Workspaces/Core/Portable/Shared/Extensions/LocationExtensions.cs

@@ -12,6 +12,9 @@ public static SyntaxToken FindToken(this Location location, CancellationToken ca
         public static SyntaxNode FindNode(this Location location, CancellationToken cancellationToken)
             => location.SourceTree.GetRoot(cancellationToken).FindNode(location.SourceSpan);
 
+        public static SyntaxNode FindNode(this Location location, bool getInnermostNodeForTie, CancellationToken cancellationToken)
+            => location.SourceTree.GetRoot(cancellationToken).FindNode(location.SourceSpan, getInnermostNodeForTie: getInnermostNodeForTie);
+
         public static bool IsVisibleSourceLocation(this Location loc)
         {
             if (!loc.IsInSource)