Improved index initializer detection

Author: vweijsters

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

@@ -183,6 +183,42 @@ public void TestMethod(IDictionary<ulong, string> items)
             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

@@ -107,18 +107,8 @@ private static void HandleOpenBracketToken(SyntaxTreeAnalysisContext context, Sy
 
         private static bool IsPartOfIndexInitializer(SyntaxToken token)
         {
-            var currentParent = token.Parent;
-            while (currentParent != null)
-            {
-                if (currentParent.IsKind(SyntaxKind.ImplicitElementAccess))
-                {
-                    return true;
-                }
-
-                currentParent = currentParent.Parent;
-            }
-
-            return false;
+            return token.Parent.IsKind(SyntaxKind.BracketedArgumentList)
+                && token.Parent.Parent.IsKind(SyntaxKind.ImplicitElementAccess);
         }
     }
 }