Persistence update:

- changing qualified name to :SuperType
- trimming the leading ":" from builttin types

Author: bschnurr

src/Analysis/Ast/Impl/Types/PythonSuperType.cs

@@ -29,6 +29,12 @@ public PythonSuperType(Location location, IReadOnlyList<IPythonType> mro)
             Mro = mro;
         }
 
+        public override string QualifiedName {
+            get {
+                return $":SuperType[{string.Join(",", Mro.Select(t => t.QualifiedName))}]";
+            }
+        }
+
         public IReadOnlyList<IPythonType> Mro { get; }
 
         public override IMember GetMember(string name) => Mro.MaybeEnumerate().Select(c => c.GetMember(name)).ExcludeDefault().FirstOrDefault();

src/Caching/Impl/Models/ModuleModel.cs

@@ -38,7 +38,7 @@ internal sealed class ModuleModel : MemberModel {
         public ClassModel[] Classes { get; set; }
         public TypeVarModel[] TypeVars { get; set; }
         public NamedTupleModel[] NamedTuples { get; set; }
-
+        
         /// <summary>
         /// Collection of new line information for conversion of linear spans
         /// to line/columns in navigation to member definitions and references.
@@ -69,7 +69,7 @@ public static ModuleModel FromAnalysis(IDocumentAnalysis analysis, IServiceConta
             var classes = new Dictionary<string, ClassModel>();
             var typeVars = new Dictionary<string, TypeVarModel>();
             var namedTuples = new Dictionary<string, NamedTupleModel>();
-
+        
             // Go directly through variables which names are listed in GetMemberNames
             // as well as variables that are declarations.
             var exportedNames = new HashSet<string>(analysis.Document.GetMemberNames());

src/Caching/Impl/ModuleFactory.cs

@@ -169,7 +169,7 @@ private IMember GetMember(IMember root, IEnumerable<string> memberNames) {
                 if (mc is IBuiltinsPythonModule builtins) {
                     // Builtins require special handling since there may be 'hidden' names
                     // which need to be mapped to visible types.
-                    member = GetBuiltinMember(builtins, memberName) ?? builtins.Interpreter.UnknownType;
+                    member = GetBuiltinMember(builtins, memberName, typeArgs) ?? builtins.Interpreter.UnknownType;
                 } else {
                     member = mc?.GetMember(memberName);
                     // Work around problem that some stubs have incorrectly named tuples.
@@ -193,7 +193,7 @@ private IMember GetMember(IMember root, IEnumerable<string> memberNames) {
             return member;
         }
 
-        private IMember GetBuiltinMember(IBuiltinsPythonModule builtins, string memberName) {
+        private IMember GetBuiltinMember(IBuiltinsPythonModule builtins, string memberName, IReadOnlyList<IPythonType> typeArgs) {
             if (memberName.StartsWithOrdinal("__")) {
                 memberName = memberName.Substring(2, memberName.Length - 4);
             }
@@ -203,6 +203,10 @@ private IMember GetBuiltinMember(IBuiltinsPythonModule builtins, string memberNa
                     return builtins.Interpreter.GetBuiltinType(BuiltinTypeId.None);
                 case "Unknown":
                     return builtins.Interpreter.UnknownType;
+                case "SuperType":
+                    var location = new Location(Module, default);
+                    return new PythonSuperType(location, typeArgs);
+                    
             }
             return builtins.GetMember(memberName);
         }

src/Caching/Impl/TypeNames.cs

@@ -89,9 +89,10 @@ private static void GetObjectTypeFromPrefix(string qualifiedName, ref QualifiedN
         private static void GetModuleNameAndMembers(string qualifiedName, ref QualifiedNameParts parts, int prefixOffset) {
             // Strip the prefix, turning i:module:A.B.C into module:A.B.C
             var typeName = qualifiedName.Substring(prefixOffset);
-
+            
             var moduleSeparatorIndex = typeName.IndexOf(':');
-            if (moduleSeparatorIndex < 0) {
+            if (moduleSeparatorIndex <= 0) {
+                typeName = typeName.TrimStart(':');
                 switch (parts.ObjectType) {
                     case ObjectType.Type:
                     case ObjectType.Instance:

src/Caching/Test/ClassesTests.cs

@@ -152,7 +152,6 @@ def __init__(self):
         }
 
         [TestMethod, Priority(0)]
-        [Ignore("Todo: super() persistence support, Asserts in debug due to no model found for super")]
         public async Task ClassesWithSuper() {
             const string code = @"
 class A:
@@ -162,18 +161,38 @@ def methodA(self):
 class B(A):
     def methodB(self):
         return super()
+";
+            var analysis = await GetAnalysisAsync(code);
+           
+            var model = ModuleModel.FromAnalysis(analysis, Services, AnalysisCachingLevel.Library);
+
+            using (var dbModule = CreateDbModule(model, analysis.Document.FilePath)) {
+                dbModule.Should().HaveSameMembersAs(analysis.Document);
+            }
+        }
 
-b = B().methodB()
+        [TestMethod, Priority(0)]
+        public async Task GlobalSuper() {
+            const string code = @"
+class Baze:
+    def baze_foo(self):
+        pass
+
+class Derived(Baze):
+    def foo(self):
+        pass
+
+d = Derived()
+
+x = super(Derived, d)
 ";
             var analysis = await GetAnalysisAsync(code);
-            analysis.Should().HaveVariable("b").Which.Should().HaveType("super");
 
             var model = ModuleModel.FromAnalysis(analysis, Services, AnalysisCachingLevel.Library);
-          
+
             using (var dbModule = CreateDbModule(model, analysis.Document.FilePath)) {
                 dbModule.Should().HaveSameMembersAs(analysis.Document);
             }
         }
-
     }
 }