Merge pull request #3254 from NextTurn/sa1011

Fix SA1011 for function pointer unmanaged calling convention list
DotNetAnalyzers · Nov 30, 2020 · 78eff0d · 78eff0d
2 parents 7ae1443 + da6bc8a
commit 78eff0d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/SpacingRules/SA1011CSharp9UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/SpacingRules/SA1011CSharp9UnitTests.cs
@@ -3,9 +3,40 @@
 
 namespace StyleCop.Analyzers.Test.CSharp9.SpacingRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
     using StyleCop.Analyzers.Test.CSharp8.SpacingRules;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1011ClosingSquareBracketsMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     public class SA1011CSharp9UnitTests : SA1011CSharp8UnitTests
     {
+        [Fact]
+        public async Task TestFunctionPointerUnmanagedCallingConventionListAsync()
+        {
+            var testCode = @"public class TestClass
+{
+    unsafe delegate* unmanaged[Stdcall {|#0:]|}<void> FuncPtr1;
+    unsafe delegate* unmanaged[Stdcall{|#1:]|} <void> FuncPtr2;
+}
+";
+
+            var fixedCode = @"public class TestClass
+{
+    unsafe delegate* unmanaged[Stdcall]<void> FuncPtr1;
+    unsafe delegate* unmanaged[Stdcall]<void> FuncPtr2;
+}
+";
+
+            var expected = new[]
+            {
+                Diagnostic().WithArguments(" not", "preceded").WithLocation(0),
+                Diagnostic().WithArguments(" not", "followed").WithLocation(1),
+            };
+
+            await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs
@@ -51,5 +51,6 @@ internal static class SyntaxKindEx
         public const SyntaxKind NullableDirectiveTrivia = (SyntaxKind)9055;
         public const SyntaxKind WithInitializerExpression = (SyntaxKind)9062;
         public const SyntaxKind RecordDeclaration = (SyntaxKind)9063;
+        public const SyntaxKind FunctionPointerUnmanagedCallingConventionList = (SyntaxKind)9066;
     }
 }
diff --git a/...yzers/StyleCop.Analyzers/SpacingRules/SA1011ClosingSquareBracketsMustBeSpacedCorrectly.cs b/...yzers/StyleCop.Analyzers/SpacingRules/SA1011ClosingSquareBracketsMustBeSpacedCorrectly.cs
@@ -10,6 +10,7 @@ namespace StyleCop.Analyzers.SpacingRules
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Diagnostics;
     using StyleCop.Analyzers.Helpers;
+    using StyleCop.Analyzers.Lightup;
 
     /// <summary>
     /// A closing square bracket within a C# statement is not spaced correctly.
@@ -114,6 +115,11 @@ private static void HandleCloseBracketToken(SyntaxTreeAnalysisContext context, S
                     suppressFollowingSpaceError = false;
                     break;
 
+                case SyntaxKind.LessThanToken:
+                    precedesSpecialCharacter = token.Parent.IsKind(SyntaxKindEx.FunctionPointerUnmanagedCallingConventionList);
+                    suppressFollowingSpaceError = false;
+                    break;
+
                 case SyntaxKind.GreaterThanToken:
                     precedesSpecialCharacter = nextToken.Parent.IsKind(SyntaxKind.TypeArgumentList);
                     break;