Merge pull request #2424 from sharwell/pattern-matching-is

Fix 'is pattern expression' parentheses handling
DotNetAnalyzers · Jun 19, 2017 · e809b29 · e809b29
2 parents b2f55c2 + ac0eff3
commit e809b29
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 2 deletions.
diff --git a/....Analyzers/StyleCop.Analyzers.Test.CSharp7/MaintainabilityRules/SA1119CSharp7UnitTests.cs b/....Analyzers/StyleCop.Analyzers.Test.CSharp7/MaintainabilityRules/SA1119CSharp7UnitTests.cs
@@ -16,7 +16,7 @@ public class SA1119CSharp7UnitTests : SA1119UnitTests
         /// </summary>
         /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
         /// <seealso cref="SA1408CSharp7UnitTests.TestPatternMatchingAsync"/>
-        [Fact]
+        [Fact(Skip = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2398")]
         public async Task TestPatternMatchingAsync()
         {
             var testCode = @"public class Foo
@@ -33,7 +33,7 @@ public void Bar()
 {
     public void Bar()
     {
-        if ( new object() is bool b && b)
+        if (new object() is bool b && b)
         {
             return;
         }
@@ -52,6 +52,25 @@ public void Bar()
             await this.VerifyCSharpFixAsync(testCode, fixedCode).ConfigureAwait(false);
         }
 
+        [Fact]
+        [WorkItem(2372, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2372")]
+        public async Task TestNegatedPatternMatchingAsync()
+        {
+            var testCode = @"public class Foo
+{
+    public void Bar()
+    {
+        object obj = null;
+        if (!(obj is string anythng))
+        {
+            // ...
+        }
+    }
+}";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestTupleDeconstructionAsync()
         {

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/AttributeTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/AttributeTests.cs
@@ -22,5 +22,15 @@ public void TestNoDiagnosticAttributeReason()
             var attribute = new NoDiagnosticAttribute(reason);
             Assert.Same(reason, attribute.Reason);
         }
+
+        [Fact]
+        public void TestWorkItemAttribute()
+        {
+            int id = 1234;
+            string issueUri = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2419";
+            var attribute = new WorkItemAttribute(id, issueUri);
+            Assert.Equal(id, attribute.Id);
+            Assert.Same(issueUri, attribute.Location);
+        }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -423,6 +423,7 @@
     <Compile Include="Verifiers\CodeFixVerifier.cs" />
     <Compile Include="Verifiers\DiagnosticVerifier.cs" />
     <Compile Include="Verifiers\DiagnosticVerifierTests.cs" />
+    <Compile Include="WorkItemAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\build\keys\TestingKey.snk">

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/WorkItemAttribute.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/WorkItemAttribute.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+namespace StyleCop.Analyzers.Test
+{
+    using System;
+
+    /// <summary>
+    /// Used to tag test methods or types which are created for a given WorkItem
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
+    public sealed class WorkItemAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WorkItemAttribute"/> class.
+        /// </summary>
+        /// <param name="id">The ID of the issue in the original tracker where the work item was first reported. This
+        /// could be a GitHub issue or pull request number, or the number of a Microsoft-internal bug.</param>
+        /// <param name="issueUri">The URI where the work item can be viewed. This is a link to work item
+        /// <paramref name="id"/> in the original source.</param>
+        public WorkItemAttribute(int id, string issueUri)
+        {
+            this.Id = id;
+            this.Location = issueUri;
+        }
+
+        public int Id
+        {
+            get;
+        }
+
+        public string Location
+        {
+            get;
+        }
+    }
+}
diff --git a/...tyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs b/...tyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs
@@ -10,6 +10,7 @@ namespace StyleCop.Analyzers.MaintainabilityRules
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Diagnostics;
+    using StyleCop.Analyzers.Lightup;
 
     /// <summary>
     /// A C# statement contains parenthesis which are unnecessary and should be removed.
@@ -106,6 +107,7 @@ private static void HandleParenthesizedExpression(SyntaxNodeAnalysisContext cont
                     && !node.Expression.IsKind(SyntaxKind.CastExpression)
                     && !node.Expression.IsKind(SyntaxKind.ConditionalExpression)
                     && !node.Expression.IsKind(SyntaxKind.IsExpression)
+                    && !node.Expression.IsKind(SyntaxKindEx.IsPatternExpression)
                     && !node.Expression.IsKind(SyntaxKind.SimpleLambdaExpression)
                     && !node.Expression.IsKind(SyntaxKind.ParenthesizedLambdaExpression)
                     && !node.Expression.IsKind(SyntaxKind.ArrayCreationExpression)