Fix NSAB/NSBB analyzers to ignore braces in interpolation.

maroontress · Sep 21, 2020 · fe30070 · fe30070
1 parent 797bcda
commit fe30070
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/StyleChecker/StyleChecker.Test/Spacing/NoSpaceAfterBrace/Okay.cs b/StyleChecker/StyleChecker.Test/Spacing/NoSpaceAfterBrace/Okay.cs
@@ -36,5 +36,10 @@ static void M(string[] a)
             _ = new[] { "" }!;
             _ = new[] { "" }[0];
         }
+
+        public void Interpolation(string m)
+        {
+            _ = $"{m}";
+        }
     }
 }
diff --git a/StyleChecker/StyleChecker.Test/Spacing/NoSpaceBeforeBrace/Okay.cs b/StyleChecker/StyleChecker.Test/Spacing/NoSpaceBeforeBrace/Okay.cs
@@ -31,5 +31,10 @@ static void M(string[] a)
 
             M(new[] { "" });
         }
+
+        public void Interpolation(string m)
+        {
+            _ = $"{m}";
+        }
     }
 }
diff --git a/StyleChecker/StyleChecker/Spacing/NoSpaceAfterBrace/Analyzer.cs b/StyleChecker/StyleChecker/Spacing/NoSpaceAfterBrace/Analyzer.cs
@@ -96,15 +96,21 @@ static bool DoesOpenBraceNeedSpace(SyntaxToken token)
                         SyntaxKind.CloseBraceToken));
             }
 
+            static bool IsExceptional(SyntaxToken token)
+            {
+                return token.IsMissing
+                    || token.Parent.IsKind(SyntaxKind.Interpolation);
+            }
+
             var root = context.Tree
                 .GetCompilationUnitRoot(context.CancellationToken);
             var leftBraces = root.DescendantTokens()
                 .Where(t => t.IsKind(SyntaxKind.OpenBraceToken)
-                    && !t.IsMissing
+                    && !IsExceptional(t)
                     && DoesOpenBraceNeedSpace(t));
             var rightBraces = root.DescendantTokens()
                 .Where(t => t.IsKind(SyntaxKind.CloseBraceToken)
-                    && !t.IsMissing
+                    && !IsExceptional(t)
                     && DoesCloseBraceNeedSpace(t));
             var all = leftBraces.Concat(rightBraces);
             foreach (var t in all)

diff --git a/StyleChecker/StyleChecker/Spacing/NoSpaceBeforeBrace/Analyzer.cs b/StyleChecker/StyleChecker/Spacing/NoSpaceBeforeBrace/Analyzer.cs
@@ -96,15 +96,21 @@ static bool DoesCloseBraceNeedSpace(SyntaxToken token)
                         SyntaxKind.OpenBraceToken));
             }
 
+            static bool IsExceptional(SyntaxToken token)
+            {
+                return token.IsMissing
+                    || token.Parent.IsKind(SyntaxKind.Interpolation);
+            }
+
             var root = context.Tree
                 .GetCompilationUnitRoot(context.CancellationToken);
             var leftBraces = root.DescendantTokens()
                 .Where(t => t.IsKind(SyntaxKind.OpenBraceToken)
-                    && !t.IsMissing
+                    && !IsExceptional(t)
                     && DoesOpenBraceNeedSpace(t));
             var rightBraces = root.DescendantTokens()
                 .Where(t => t.IsKind(SyntaxKind.CloseBraceToken)
-                    && !t.IsMissing
+                    && !IsExceptional(t)
                     && DoesCloseBraceNeedSpace(t));
             var all = leftBraces.Concat(rightBraces);
             foreach (var t in all)