Fix issue #207 (#208)

malware-dev · Oct 22, 2020 · f354299 · f354299
1 parent c6bedd5
commit f354299
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Source/MDK/Build/AnalysisExtensions.cs b/Source/MDK/Build/AnalysisExtensions.cs
@@ -57,8 +57,8 @@ public static string GetFullName(this ISymbol symbol, DeclarationFullNameFlags f
             {
               var declaratorSyntax = namedType
                 .DeclaringSyntaxReferences
-                .First()
-                .GetSyntax();
+                .FirstOrDefault()
+                ?.GetSyntax();
               if (declaratorSyntax is TypeDeclarationSyntax typeDeclaration)
               {
                  return typeDeclaration.GetFullName(flags);

diff --git a/Source/MDK/Build/Composers/Minifying/CodeSimplifier.cs b/Source/MDK/Build/Composers/Minifying/CodeSimplifier.cs
@@ -256,6 +256,8 @@ bool IsInProgram(SyntaxNode node)
             return false;
         }
 
+        static string GetFullName(INamedTypeSymbol symbol) => symbol.GetFullName(DeclarationFullNameFlags.WithoutNamespaceName);
+
         public async Task<ProgramComposition> ProcessAsync(ProgramComposition composition, MDKProjectProperties config)
         {
             var newDocument = await Simplifier.ReduceAsync(composition.Document).ConfigureAwait(false);
@@ -272,7 +274,16 @@ public async Task<ProgramComposition> ProcessAsync(ProgramComposition compositio
                     {
                         var node = composition.RootNode.FindNode(location.Location.SourceSpan);
                         if (!IsInProgram(node))
+                        {
                             _externallyReferencedMembers.Add(typeUsage.FullName);
+                            if (typeUsage.Symbol is ITypeSymbol typeSymbol)
+                            {
+                                foreach (var interfaceName in typeSymbol.AllInterfaces.Select(GetFullName))
+                                    _externallyReferencedMembers.Add(interfaceName);
+                                if(typeSymbol.BaseType != null)
+                                    _externallyReferencedMembers.Add(GetFullName(typeSymbol.BaseType));
+                            }
+                        }
                     }
                 }
             }