Use extent tuples to check keys on different lines

Author: Kapil Borle

Rules/AlignAssignmentStatement.cs

@@ -184,12 +184,13 @@ private IEnumerable<DiagnosticRecord> FindHashtableViolations(TokenOperations to
             foreach (var astItem in hashtableAsts)
             {
                 var hashtableAst = (HashtableAst)astItem;
-                if (!HasKeysOnSeparateLines(hashtableAst))
+                var extentTuples = GetExtents(tokenOps, hashtableAst);
+
+                if (!HasPropertiesOnSeparateLines(extentTuples))
                 {
                     continue;
                 }
 
-                var extentTuples = GetExtents(tokenOps, hashtableAst);
                 if (extentTuples == null
                     || extentTuples.Count == 0
                     || !extentTuples.All(t => t.Item1.StartLineNumber == t.Item2.EndLineNumber))
@@ -296,6 +297,24 @@ private static IList<Tuple<IScriptExtent, IScriptExtent>> GetExtents(
             return nodeTuples;
         }
 
+        private bool HasPropertiesOnSeparateLines(IEnumerable<Tuple<IScriptExtent, IScriptExtent>> tuples)
+        {
+            var lines = new HashSet<int>();
+            foreach (var kvp in tuples)
+            {
+                if (lines.Contains(kvp.Item1.StartLineNumber))
+                {
+                    return false;
+                }
+                else
+                {
+                    lines.Add(kvp.Item1.StartLineNumber);
+                }
+            }
+
+            return true;
+        }
+
         private bool HasKeysOnSeparateLines(HashtableAst hashtableAst)
         {
             var lines = new HashSet<int>();