Merge branch 'master' into depth

MikhailArkhipov · MikhailArkhipov · commit 15d81570780f · 2018-10-04T16:42:43.000-07:00
diff --git a/src/Analysis/Engine/Impl/Values/Protocols.cs b/src/Analysis/Engine/Impl/Values/Protocols.cs
@@ -389,7 +389,9 @@ class TupleProtocol : IterableProtocol {
 
         public TupleProtocol(ProtocolInfo self, IEnumerable<IAnalysisSet> values) : base(self, AnalysisSet.UnionAll(values)) {
             _values = values.Select(s => s.AsUnion(1)).ToArray();
-            Name = "tuple[{0}]".FormatInvariant(string.Join(", ", _values.Select(v => v.GetShortDescriptions())));
+
+            var argTypes = _values.SelectMany(e => e.Select(v => v is IHasQualifiedName qn ? qn.FullyQualifiedName : v.ShortDescription));
+            Name = "tuple[{0}]".FormatInvariant(string.Join(", ", argTypes));
         }
 
         protected override void EnsureMembers(IDictionary<string, IAnalysisSet> members) {

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,9 @@ class TupleProtocol : IterableProtocol {`
`389`	`389`
`390`	`390`	`public TupleProtocol(ProtocolInfo self, IEnumerable<IAnalysisSet> values) : base(self, AnalysisSet.UnionAll(values)) {`
`391`	`391`	`_values = values.Select(s => s.AsUnion(1)).ToArray();`
`392`		`- Name = "tuple[{0}]".FormatInvariant(string.Join(", ", _values.Select(v => v.GetShortDescriptions())));`
	`392`	`+`
	`393`	`+ var argTypes = _values.SelectMany(e => e.Select(v => v is IHasQualifiedName qn ? qn.FullyQualifiedName : v.ShortDescription));`
	`394`	`+ Name = "tuple[{0}]".FormatInvariant(string.Join(", ", argTypes));`
`393`	`395`	`}`
`394`	`396`
`395`	`397`	`protected override void EnsureMembers(IDictionary<string, IAnalysisSet> members) {`