Merge branch 'felipebz-issue-160'

code-cracker · Dec 15, 2014 · 5638cd1 · 5638cd1
2 parents 0ae1572 + 8136f14
commit 5638cd1
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 1 deletion.
diff --git a/src/CSharp/CodeCracker/Design/CopyEventToVariableBeforeFireCodeFixProvider.cs b/src/CSharp/CodeCracker/Design/CopyEventToVariableBeforeFireCodeFixProvider.cs
@@ -67,7 +67,15 @@ private async Task<Document> CreateVariable(Document document, InvocationExpress
 
             var root = await document.GetSyntaxRootAsync(ct);
 
-            var newRoot = root.ReplaceNode(invocation.Parent, invocation.Parent.WithAdditionalAnnotations(new SyntaxAnnotation(SyntaxAnnotatinKind)));
+            var oldNode = invocation.Parent;
+            var newNode = invocation.Parent.WithAdditionalAnnotations(new SyntaxAnnotation(SyntaxAnnotatinKind));
+
+            if (oldNode.Parent.IsEmbeddedStatementOwner())
+            {
+                newNode = SyntaxFactory.Block((StatementSyntax)newNode);
+            }
+
+            var newRoot = root.ReplaceNode(oldNode, newNode);
             newRoot = newRoot.InsertNodesAfter(GetMark(newRoot), new[] { variable as SyntaxNode, newInvocation as SyntaxNode });
             newRoot = newRoot.RemoveNode(GetMark(newRoot), SyntaxRemoveOptions.KeepNoTrivia);
 

diff --git a/src/CSharp/CodeCracker/Extensions/AnalyzerExtensions.cs b/src/CSharp/CodeCracker/Extensions/AnalyzerExtensions.cs
@@ -64,5 +64,18 @@ public static SyntaxNode WithSameTriviaAs(this SyntaxNode target, SyntaxNode sou
                 .WithLeadingTrivia(source.GetLeadingTrivia())
                 .WithTrailingTrivia(source.GetTrailingTrivia());
         }
+
+        public static bool IsEmbeddedStatementOwner(this SyntaxNode node)
+        {
+            return node is IfStatementSyntax ||
+                   node is ElseClauseSyntax ||
+                   node is ForStatementSyntax ||
+                   node is ForEachStatementSyntax ||
+                   node is WhileStatementSyntax ||
+                   node is UsingStatementSyntax ||
+                   node is DoStatementSyntax ||
+                   node is LockStatementSyntax ||
+                   node is FixedStatementSyntax;
+        }
     }
 }
diff --git a/test/CSharp/CodeCracker.Test/Design/CopyEventToVariableBeforeFireTests.cs b/test/CSharp/CodeCracker.Test/Design/CopyEventToVariableBeforeFireTests.cs
@@ -207,5 +207,38 @@ public void Execute()
 
             await VerifyCSharpFixAsync(source, fixtest, 0);
         }
+
+        [Fact]
+        public async void FixWhenInvocationIsInsideABlockWithoutBraces()
+        {
+            const string source = @"
+                public class MyClass
+                {
+                    public event System.EventHandler MyEvent;
+
+                    public void Execute()
+                    {
+                        if (raiseEvents) MyEvent(this, System.EventArgs.Empty);
+                    }
+                }";
+
+            const string fixtest = @"
+                public class MyClass 
+                {
+                    public event System.EventHandler MyEvent;
+
+                    public void Execute()
+                    {
+                        if (raiseEvents)
+                        {
+                            var handler = MyEvent;
+                            if (handler != null)
+                                handler(this, System.EventArgs.Empty);
+                        }
+                    }
+                }";
+
+            await VerifyCSharpFixAsync(source, fixtest, 0);
+        }
     }
 }