Merge pull request #206 from MikhailArkhipov/master

Make sure tuple protocol name does not ignore unknown parameter types
microsoft · Oct 5, 2018 · 306f568 · 306f568
2 parents b00b697 + 96ae479
commit 306f568
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 8 deletions.
diff --git a/src/Analysis/Engine/Impl/Infrastructure/Extensions/StringBuilderExtensions.cs b/src/Analysis/Engine/Impl/Infrastructure/Extensions/StringBuilderExtensions.cs
@@ -37,7 +37,15 @@ public static StringBuilder EnsureEndsWithWhiteSpace(this StringBuilder sb, int
             if (whiteSpaceCount > 0) {
                 sb.Append(' ', whiteSpaceCount);
             }
-
+
+            return sb;
+        }
+
+        public static StringBuilder AppendIf(this StringBuilder sb, bool condition, string value) {
+            if (condition) {
+                sb.Append(value);
+            }
+
             return sb;
         }
     }

diff --git a/src/Analysis/Engine/Impl/Values/Protocols.cs b/src/Analysis/Engine/Impl/Values/Protocols.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Microsoft.PythonTools.Analysis.Infrastructure;
 using Microsoft.PythonTools.Interpreter;
 using Microsoft.PythonTools.Parsing;
@@ -389,9 +390,32 @@ class TupleProtocol : IterableProtocol {
 
         public TupleProtocol(ProtocolInfo self, IEnumerable<IAnalysisSet> values) : base(self, AnalysisSet.UnionAll(values)) {
             _values = values.Select(s => s.AsUnion(1)).ToArray();
+            Name = GetNameFromValues();
+        }
+
+        private string GetNameFromValues() {
+            // Enumerate manually since SelectMany drops empty/unknown values
+            var sb = new StringBuilder("tuple[");
+            for (var i = 0; i < _values.Length; i++) {
+               sb.AppendIf(i > 0, ", ");
+               AppendParameterString(sb, _values[i].ToArray());
+            }
+            sb.Append(']');
+            return sb.ToString();
+        }
+
+        private void AppendParameterString(StringBuilder sb, AnalysisValue[] sets) {
+            if (sets.Length == 0) {
+                sb.Append('?');
+                return;
+            }
 
-            var argTypes = _values.SelectMany(e => e.Select(v => v is IHasQualifiedName qn ? qn.FullyQualifiedName : v.ShortDescription));
-            Name = "tuple[{0}]".FormatInvariant(string.Join(", ", argTypes));
+            sb.AppendIf(sets.Length > 1, "[");
+            for (var i = 0; i < sets.Length; i++) {
+                sb.AppendIf(i > 0, ", ");
+                sb.Append(sets[i] is IHasQualifiedName qn ? qn.FullyQualifiedName : sets[i].ShortDescription);
+            }
+            sb.AppendIf(sets.Length > 1, "]");
         }
 
         protected override void EnsureMembers(IDictionary<string, IAnalysisSet> members) {
@@ -419,6 +443,7 @@ public override IAnalysisSet GetIndex(Node node, AnalysisUnit unit, IAnalysisSet
         }
 
         public override string Name { get; }
+        public override BuiltinTypeId TypeId => BuiltinTypeId.Tuple;
 
         public override IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             if (_values.Any()) {
@@ -437,7 +462,7 @@ public override IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             }
         }
 
-        protected override bool Equals(Protocol other) => 
+        protected override bool Equals(Protocol other) =>
             other is TupleProtocol tp &&
             _values.Zip(tp._values, (x, y) => x.SetEquals(y)).All(b => b);
 
@@ -524,6 +549,7 @@ public override IAnalysisSet GetIndex(Node node, AnalysisUnit unit, IAnalysisSet
         }
 
         public override string Name => "dict";
+        public override BuiltinTypeId TypeId => BuiltinTypeId.Dict;
 
         public override IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             if (_valueType.Any()) {
@@ -576,14 +602,13 @@ protected override void EnsureMembers(IDictionary<string, IAnalysisSet> members)
         }
 
         public override string Name => "generator";
-
+        public override BuiltinTypeId TypeId => BuiltinTypeId.Generator;
+
         public IAnalysisSet Yielded => _yielded;
         public IAnalysisSet Sent { get; }
         public IAnalysisSet Returned { get; }
 
-        public override IAnalysisSet GetReturnForYieldFrom(Node node, AnalysisUnit unit) {
-            return Returned;
-        }
+        public override IAnalysisSet GetReturnForYieldFrom(Node node, AnalysisUnit unit) => Returned;
 
         public override IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             if (_yielded.Any() || Sent.Any() || Returned.Any()) {