fix: Fix OutOfMemory exception when mapping base classes

sboulema · Sep 24, 2021 · 4195040 · 4195040
1 parent ab860c1
commit 4195040
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/CodeNav.Shared/Mappers/ClassMapper.cs b/CodeNav.Shared/Mappers/ClassMapper.cs
@@ -14,7 +14,7 @@ namespace CodeNav.Mappers
     public class ClassMapper
     {
         public static CodeClassItem MapClass(ClassDeclarationSyntax member,
-            ICodeViewUserControl control, SemanticModel semanticModel, SyntaxTree tree)
+            ICodeViewUserControl control, SemanticModel semanticModel, SyntaxTree tree, bool mapBaseClass)
         {
             if (member == null)
             {
@@ -37,7 +37,10 @@ public static CodeClassItem MapClass(ClassDeclarationSyntax member,
             var implementedInterfaces = InterfaceMapper.MapImplementedInterfaces(member, control, semanticModel, tree);
 
             // Map members from the base class
-            MapMembersFromBaseClass(member, regions, control, semanticModel, tree);
+            if (mapBaseClass)
+            {
+                MapMembersFromBaseClass(member, regions, control, semanticModel);
+            }
 
             // Map class members
             foreach (var classMember in member.Members)
@@ -143,7 +146,10 @@ public static CodeClassItem MapClass(VisualBasicSyntax.TypeBlockSyntax member,
 
         private static string MapInheritance(ClassDeclarationSyntax member)
         {
-            if (member?.BaseList == null) return string.Empty;
+            if (member?.BaseList == null)
+            {
+                return string.Empty;
+            }
 
             var inheritanceList = (from BaseTypeSyntax bases in member.BaseList.Types select bases.Type.ToString()).ToList();
 
@@ -152,7 +158,10 @@ private static string MapInheritance(ClassDeclarationSyntax member)
 
         private static string MapInheritance(VisualBasicSyntax.TypeBlockSyntax member)
         {
-            if (member?.Inherits == null) return string.Empty;
+            if (member?.Inherits == null)
+            {
+                return string.Empty;
+            }
 
             var inheritanceList = new List<string>();
 
@@ -166,7 +175,7 @@ private static string MapInheritance(VisualBasicSyntax.TypeBlockSyntax member)
 
         private static void MapMembersFromBaseClass(ClassDeclarationSyntax member,
             List<CodeRegionItem> regions, ICodeViewUserControl control,
-            SemanticModel semanticModel, SyntaxTree tree)
+            SemanticModel semanticModel)
         {
             var classSymbol = semanticModel.GetDeclaredSymbol(member);
             var baseType = classSymbol?.BaseType;
@@ -206,7 +215,7 @@ private static void MapMembersFromBaseClass(ClassDeclarationSyntax member,
                 }
 
                 var memberItem = SyntaxMapper.MapMember(syntaxNode, syntaxNode.SyntaxTree,
-                    SyntaxHelper.GetCSharpSemanticModel(syntaxNode.SyntaxTree), control);
+                    SyntaxHelper.GetCSharpSemanticModel(syntaxNode.SyntaxTree), control, mapBaseClass: false);
 
                 baseRegion.Members.Add(memberItem);
             }

diff --git a/CodeNav.Shared/Mappers/SyntaxMapper.cs b/CodeNav.Shared/Mappers/SyntaxMapper.cs
@@ -166,7 +166,8 @@ public static async Task<List<CodeItem>> MapDocument(ICodeViewUserControl contro
         }
 
         public static CodeItem MapMember(SyntaxNode member,
-            SyntaxTree tree, SemanticModel semanticModel, ICodeViewUserControl control)
+            SyntaxTree tree, SemanticModel semanticModel, ICodeViewUserControl control,
+            bool mapBaseClass = true)
         {
             if (member == null)
             {
@@ -190,7 +191,7 @@ public static CodeItem MapMember(SyntaxNode member,
                 case SyntaxKind.StructDeclaration:
                     return StructMapper.MapStruct(member as StructDeclarationSyntax, control, semanticModel, tree);
                 case SyntaxKind.ClassDeclaration:
-                    return ClassMapper.MapClass(member as ClassDeclarationSyntax, control, semanticModel, tree);
+                    return ClassMapper.MapClass(member as ClassDeclarationSyntax, control, semanticModel, tree, mapBaseClass);
                 case SyntaxKind.EventFieldDeclaration:
                     return DelegateEventMapper.MapEvent(member as EventFieldDeclarationSyntax, control, semanticModel);
                 case SyntaxKind.DelegateDeclaration: