Merge pull request microsoft#277 from MikhailArkhipov/11

Fix overload merge with Typeshed

src/Analysis/Engine/Impl/OverloadResult.cs

@@ -136,6 +136,14 @@ public override string ToString() {
             var doc = string.IsNullOrEmpty(Documentation) ? "" : "'''{0}'''".FormatInvariant(Documentation);
             return "{0}({1}) -> {2}{3}".FormatInvariant(Name, parameters, returnType, doc);
         }
+
+        public override bool Equals(object obj) {
+            if(obj is OverloadResult other) {
+                return OverloadResultComparer.Instance.Equals(this, other);
+            }
+            return base.Equals(obj);
+        }
+        public override int GetHashCode() => OverloadResultComparer.Instance.GetHashCode(this);
     }
 
     class AccumulatedOverloadResult {

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

@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using Microsoft.PythonTools.Analysis.Infrastructure;
 using Microsoft.PythonTools.Interpreter;
 using Microsoft.PythonTools.Parsing.Ast;
 
@@ -172,5 +173,14 @@ internal override AnalysisValue UnionMergeTypes(AnalysisValue ns, int strength)
             }
             return base.UnionMergeTypes(ns, strength);
         }
+
+        public override bool Equals(object obj) {
+            if(obj is BuiltinFunctionInfo other && !other.Overloads.SetEquals(Overloads)) {
+                return false;
+            }
+            return base.Equals(obj);
+        }
+
+        public override int GetHashCode() => base.GetHashCode() ^ Overloads.GetHashCode();
     }
 }

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

@@ -831,10 +831,6 @@ public static IAnalysisSet GetMemberFromMroNoReferences(IEnumerable<IAnalysisSet
                         result = result.Union(ns.GetMember(node, unit, name));
                     }
                 }
-
-                if (result != null && result.Count > 0) {
-                    break;
-                }
             }
             return result;
         }

src/Analysis/Engine/Test/AstAnalysisTests.cs

@@ -25,7 +25,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
-using Microsoft.Python.LanguageServer;
 using Microsoft.Python.LanguageServer.Implementation;
 using Microsoft.Python.Tests.Utilities;
 using Microsoft.Python.Tests.Utilities.FluentAssertions;