Merge pull request #104 from MikhailArkhipov/master

Fix tests

Author: Mikhail Arkhipov

src/Analysis/Engine/Impl/Values/IterableInfo.cs

@@ -293,20 +293,17 @@ public override IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             }
 
             yield return new KeyValuePair<string, string>(WellKnownRichDescriptionKinds.Misc, "[");
-            if (indexTypes.Length < 6) {
-                bool first = true;
-                foreach (var i in indexTypes) {
-                    if (first) {
-                        first = false;
-                    } else {
-                        yield return new KeyValuePair<string, string>(WellKnownRichDescriptionKinds.Comma, ", ");
-                    }
-                    foreach (var kv in i.Types.GetRichDescriptions(unionPrefix: "[", unionSuffix: "]")) {
-                        yield return kv;
-                    }
+            var i = 0;
+            for (; i < Math.Min(indexTypes.Length, 6); i++) {
+                if (i > 0) {
+                    yield return new KeyValuePair<string, string>(WellKnownRichDescriptionKinds.Comma, ", ");
                 }
-            } else {
-                yield return new KeyValuePair<string, string>(WellKnownRichDescriptionKinds.Misc, "...");
+                foreach (var kv in indexTypes[i].Types.GetRichDescriptions(unionPrefix: "[", unionSuffix: "]")) {
+                    yield return kv;
+                }
+            }
+            if(i < indexTypes.Length){
+                yield return new KeyValuePair<string, string>(WellKnownRichDescriptionKinds.Misc, ", ...");
             }
             yield return new KeyValuePair<string, string>(WellKnownRichDescriptionKinds.Misc, "]");
         }

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -2573,7 +2573,7 @@ public async Task SequenceMultiply() {
                 var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
                 analysis.Should().HaveVariable("y").WithDescription("tuple")
                     .And.HaveVariable("y1").WithDescription("tuple[int, int, int]")
-                    .And.HaveVariable("oar").WithDescription("list[int]")
+                    .And.HaveVariable("oar").WithDescription("list[int, int, int]")
                     .And.HaveVariable("oar2").WithDescription("list");
             }
         }
@@ -2597,11 +2597,29 @@ public async Task SequenceMultiply_2() {
                 var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
                 analysis.Should().HaveVariable("y").WithDescription("tuple")
                     .And.HaveVariable("y1").WithDescription("tuple[int, int, int]")
-                    .And.HaveVariable("oar").WithDescription("list[int]")
+                    .And.HaveVariable("oar").WithDescription("list[int, int, int]")
                     .And.HaveVariable("oar2").WithDescription("list");
             }
         }
 
+        [TestMethod, Priority(0)]
+        public async Task InterableTypesDescription_Long() {
+            var text = @"
+x1 = (1,'2',3,4.,5,6,7,8)
+y1 = 100 * x1
+
+fob = [1,2,'3',4,5.,6,7,8]
+oar = 100 * fob
+";
+
+            using (var server = await CreateServerAsync(PythonVersions.LatestAvailable2X)) {
+                var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
+                analysis.Should()
+                    .HaveVariable("y1").WithDescription("tuple[int, str, int, float, int, int, ...]")
+                    .And.HaveVariable("oar").WithDescription("list[int, int, str, int, float, int, ...]");
+            }
+        }
+
         [TestMethod, Priority(0)]
         public async Task SequenceContains() {
             var text = @"
@@ -5426,7 +5444,9 @@ import fob.y as y
                 await server.SendDidOpenTextDocument(uriSrc2, src2);
                 await server.SendDidOpenTextDocument(uriSrc3, src3);
 
+                await server.GetAnalysisAsync(uriSrc1);
                 var analysis = await server.GetAnalysisAsync(uriSrc2);
+
                 analysis.Should().HaveVariable("y").WithDescription("Python module fob.y")
                     .And.HaveVariable("abc").OfType(BuiltinTypeId.Int);
             }