Fix SA1009 handling of record inheritance

Fixes DotNetAnalyzers#3248
sharwell · Dec 5, 2020 · 847d8f0 · 847d8f0
1 parent 363a36c
commit 847d8f0
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/SpacingRules/SA1009CSharp9UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/SpacingRules/SA1009CSharp9UnitTests.cs
@@ -3,9 +3,54 @@
 
 namespace StyleCop.Analyzers.Test.CSharp9.SpacingRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.CSharp;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp8.SpacingRules;
+    using Xunit;
+    using static StyleCop.Analyzers.SpacingRules.SA1009ClosingParenthesisMustBeSpacedCorrectly;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1009ClosingParenthesisMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     public class SA1009CSharp9UnitTests : SA1009CSharp8UnitTests
     {
+        [Fact]
+        [WorkItem(3248, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3248")]
+        public async Task TestRecordInheritanceAsync()
+        {
+            const string testCode = @"
+public abstract record BaseQuery<T>;
+public record MyQuery1( {|#0:)|}: BaseQuery<object>;
+public record MyQuery2( {|#1:)|} : BaseQuery<object>;
+public record MyQuery3({|#2:)|}: BaseQuery<object>;";
+            const string fixedCode = @"
+public abstract record BaseQuery<T>;
+public record MyQuery1() : BaseQuery<object>;
+public record MyQuery2() : BaseQuery<object>;
+public record MyQuery3() : BaseQuery<object>;";
+
+            await new CSharpTest(LanguageVersion.CSharp9)
+            {
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
+                ExpectedDiagnostics =
+                {
+                    // /0/Test0.cs(3,25): warning SA1009: Closing parenthesis should not be preceded by a space
+                    Diagnostic(DescriptorNotPreceded).WithLocation(0),
+
+                    // /0/Test0.cs(3,25): warning SA1009: Closing parenthesis should be followed by a space
+                    Diagnostic(DescriptorFollowed).WithLocation(0),
+
+                    // /0/Test0.cs(4,25): warning SA1009: Closing parenthesis should not be preceded by a space
+                    Diagnostic(DescriptorNotPreceded).WithLocation(1),
+
+                    // /0/Test0.cs(5,24): warning SA1009: Closing parenthesis should be followed by a space
+                    Diagnostic(DescriptorFollowed).WithLocation(2),
+                },
+                TestCode = testCode,
+                FixedCode = fixedCode,
+            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }
diff --git a/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs b/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs
@@ -171,7 +171,8 @@ private static void HandleCloseParenToken(SyntaxTreeAnalysisContext context, Syn
                 bool requireSpace =
                     nextToken.Parent.IsKind(SyntaxKind.ConditionalExpression)
                     || nextToken.Parent.IsKind(SyntaxKind.BaseConstructorInitializer)
-                    || nextToken.Parent.IsKind(SyntaxKind.ThisConstructorInitializer);
+                    || nextToken.Parent.IsKind(SyntaxKind.ThisConstructorInitializer)
+                    || nextToken.Parent.IsKind(SyntaxKind.BaseList);
                 precedesStickyCharacter = !requireSpace;
                 break;