Merge pull request #2423 from sharwell/default-expression

Ignore spacing around a default literal expression
DotNetAnalyzers · Jun 17, 2017 · 70e9c76 · 70e9c76
2 parents a5ca880 + 2c69f73
commit 70e9c76
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs
@@ -9,6 +9,7 @@ internal static class SyntaxKindEx
     {
         public const SyntaxKind UnderscoreToken = (SyntaxKind)8491;
         public const SyntaxKind IsPatternExpression = (SyntaxKind)8657;
+        public const SyntaxKind DefaultLiteralExpression = (SyntaxKind)8755;
         public const SyntaxKind LocalFunctionStatement = (SyntaxKind)8830;
         public const SyntaxKind TupleType = (SyntaxKind)8924;
         public const SyntaxKind TupleElement = (SyntaxKind)8925;

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1000KeywordsMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1000KeywordsMustBeSpacedCorrectly.cs
@@ -9,6 +9,7 @@ namespace StyleCop.Analyzers.SpacingRules
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Diagnostics;
+    using StyleCop.Analyzers.Lightup;
 
     /// <summary>
     /// The spacing around a C# keyword is incorrect.
@@ -124,6 +125,15 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)
                     break;
 
                 case SyntaxKind.DefaultKeyword:
+                    if (token.Parent.IsKind(SyntaxKindEx.DefaultLiteralExpression))
+                    {
+                        // Ignore spacing around a default literal expression for now
+                        break;
+                    }
+
+                    HandleDisallowedSpaceToken(ref context, token);
+                    break;
+
                 case SyntaxKind.NameOfKeyword:
                 case SyntaxKind.SizeOfKeyword:
                 case SyntaxKind.TypeOfKeyword: