Fix handling of nullable suppression operator after parentheses

Fixes #2991
DotNetAnalyzers · Sep 3, 2019 · 4ff982f · 4ff982f
1 parent e35d446
commit 4ff982f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1009CSharp8UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1009CSharp8UnitTests.cs
@@ -3,9 +3,44 @@
 
 namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.CSharp;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1009ClosingParenthesisMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     public class SA1009CSharp8UnitTests : SA1009CSharp7UnitTests
     {
+        [Fact]
+        [WorkItem(2991, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2991")]
+        public async Task TestFollowedBySuppressionOperatorAsync()
+        {
+            const string testCode = @"
+public class Foo
+{
+    public void TestMethod<T>()
+    {
+        if (default(T[|)|] ! is null)
+        {
+        }
+    }
+}";
+            const string fixedCode = @"
+public class Foo
+{
+    public void TestMethod<T>()
+    {
+        if (default(T)! is null)
+        {
+        }
+    }
+}";
+
+            await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }
diff --git a/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs b/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs
@@ -173,6 +173,10 @@ private static void HandleCloseParenToken(SyntaxTreeAnalysisContext context, Syn
                 precedesStickyCharacter = nextToken.Parent is InterpolationSyntax;
                 break;
 
+            case SyntaxKind.ExclamationToken when nextToken.Parent.IsKind(SyntaxKindEx.SuppressNullableWarningExpression):
+                precedesStickyCharacter = true;
+                break;
+
             default:
                 precedesStickyCharacter = false;
                 break;