Merge pull request #917 from MaStr11/CC0022BugFalsePositiveWhenUsingN…

…ullCoalescing Fix for bug #878 and #870 CC0022 False positive when using null coalescing operator
code-cracker · May 3, 2017 · 6682f8b · 6682f8b
2 parents 6471990 + e74608c
commit 6682f8b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/CSharp/CodeCracker/Usage/DisposableVariableNotDisposedAnalyzer.cs b/src/CSharp/CodeCracker/Usage/DisposableVariableNotDisposedAnalyzer.cs
@@ -40,7 +40,7 @@ private static void AnalyzeObjectCreation(SyntaxNodeAnalysisContext context)
 
             var originalNode = objectCreation;
             SyntaxNode topSyntaxNode = originalNode;
-            while (topSyntaxNode.Parent.IsAnyKind(SyntaxKind.ParenthesizedExpression, SyntaxKind.ConditionalExpression, SyntaxKind.CastExpression))
+            while (topSyntaxNode.Parent.IsAnyKind(SyntaxKind.ParenthesizedExpression, SyntaxKind.ConditionalExpression, SyntaxKind.CastExpression, SyntaxKind.CoalesceExpression))
                 topSyntaxNode = topSyntaxNode.Parent;
 
             if (topSyntaxNode.Parent.IsAnyKind(SyntaxKind.ReturnStatement, SyntaxKind.UsingStatement, SyntaxKind.YieldReturnStatement))

diff --git a/test/CSharp/CodeCracker.Test/Usage/DisposableVariableNotDisposedTests.cs b/test/CSharp/CodeCracker.Test/Usage/DisposableVariableNotDisposedTests.cs
@@ -1574,6 +1574,28 @@ void Bar()
         var h = new HoldsDisposable();
         h.Ms = m;
     }
+}";
+            await VerifyCSharpHasNoDiagnosticsAsync(source);
+        }
+
+        [Fact]
+        public async Task IgnoreWhenAssignedToFieldByNullCoalescingOperator()
+        {
+            const string source = @"
+using System.IO;
+public class Test : IDisposable
+{
+    private IDisposable _stream;
+
+    public void Update()
+    {
+        _stream = _stream ?? new MemoryStream();
+    }
+
+    public void Dispose()
+    {
+        _stream.Dispose();
+    }
 }";
             await VerifyCSharpHasNoDiagnosticsAsync(source);
         }