Merge pull request #1622 from vweijsters/fix-1617

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1010UnitTests.cs

@@ -161,6 +161,64 @@ public int this [ [CLSCompliant(true)]int index]
             await this.VerifyCSharpFixAsync(testCode, ExpectedCode).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verify that index initializers are properly handled.
+        /// Regression test for https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/1617
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task VerifyIndexInitializerAsync()
+        {
+            var testCode = @"using System.Collections.Generic;
+
+public class TestClass
+{
+    public void TestMethod(IDictionary<ulong, string> items)
+    {
+        var test = new Dictionary<ulong, string>(items) { [100] = ""100"" };
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Verify that index initializer scope determination is working as intended.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task VerifyThatIndexInitializerScopeIsDeterminedProperlyAsync()
+        {
+            var testCode = @"using System.Collections.Generic;
+
+public class TestClass
+{
+    public void TestMethod(IDictionary<ulong, string> items)
+    {
+        int[] indexes = { 0 };
+        var dictionary = new Dictionary<int, int> { [indexes [0]] = 0 };
+    }
+}
+";
+
+            var fixedTestCode = @"using System.Collections.Generic;
+
+public class TestClass
+{
+    public void TestMethod(IDictionary<ulong, string> items)
+    {
+        int[] indexes = { 0 };
+        var dictionary = new Dictionary<int, int> { [indexes[0]] = 0 };
+    }
+}
+";
+            var expected = this.CSharpDiagnostic().WithLocation(8, 62).WithArguments("not be preceded");
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
         {

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1010OpeningSquareBracketsMustBeSpacedCorrectly.cs

@@ -92,7 +92,7 @@ private static void HandleOpenBracketToken(SyntaxTreeAnalysisContext context, Sy
             bool followedBySpace = token.IsFollowedByWhitespace();
             bool lastInLine = token.IsLastInLine();
 
-            if (!firstInLine && precededBySpace && !ignorePrecedingSpaceProblem)
+            if (!firstInLine && precededBySpace && !ignorePrecedingSpaceProblem && !IsPartOfIndexInitializer(token))
             {
                 // Opening square bracket must {not be preceded} by a space.
                 context.ReportDiagnostic(Diagnostic.Create(Descriptor, token.GetLocation(), TokenSpacingCodeFixProvider.RemovePreceding, "not be preceded"));
@@ -104,5 +104,11 @@ private static void HandleOpenBracketToken(SyntaxTreeAnalysisContext context, Sy
                 context.ReportDiagnostic(Diagnostic.Create(Descriptor, token.GetLocation(), TokenSpacingCodeFixProvider.RemoveFollowing, "not be followed"));
             }
         }
+
+        private static bool IsPartOfIndexInitializer(SyntaxToken token)
+        {
+            return token.Parent.IsKind(SyntaxKind.BracketedArgumentList)
+                && token.Parent.Parent.IsKind(SyntaxKind.ImplicitElementAccess);
+        }
     }
 }