fixes type resolution resolving to non existing Assembly.MainModule.T…

…ypeSystem members (#277)
adrianoc · Apr 11, 2024 · 4bcdc2b · 4bcdc2b
1 parent d75ff46
commit 4bcdc2b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Cecilifier.Core.Tests/Tests/Unit/TypeResolutionTests.cs b/Cecilifier.Core.Tests/Tests/Unit/TypeResolutionTests.cs
@@ -79,6 +79,19 @@ public void GenericTypeParameterInTopLevelMethod(string code, string testSpecifi
             Does.Match(testSpecificExpectation));
     }
 
+    [TestCase("DateTime field;", TestName = "Field")]
+    [TestCase("DateTime Prop { get => default(DateTime); }", TestName = "Property")]
+    [TestCase("DateTime M() => default(DateTime);", TestName = "Method return type")]
+    [TestCase("void M(DateTime d) {}", TestName = "Parameter")]
+    [TestCase("void M() { DateTime d; }", TestName = "Local variable")]
+    [TestCase("void M() { Action<DateTime> d; }", TestName = "Local variable (generic)")]
+    [TestCase("void M() { Delegate d; }", TestName = "Delegate")]
+    public void TestTypeResolution_Issue277(string memberDefinition)
+    {
+        var result = RunCecilifier($$"""using System; class C { {{memberDefinition}} }""");
+        Assert.That(result.GeneratedCode.ReadToEnd(), Does.Not.Match(@"assembly\.MainModule\.TypeSystem\.DateTime"));
+    }
+
     private static IEnumerable ExternalTypeTestScenarios()
     {
         const string fieldTemplate = @"using System.Collections; class Foo {{ {0} field; }}";

diff --git a/Cecilifier.Core/Misc/TypeResolverImpl.cs b/Cecilifier.Core/Misc/TypeResolverImpl.cs
@@ -47,8 +47,14 @@ private string ResolvePredefinedAndComposedTypes(ITypeSymbol type)
             {
                 return CecilDefinitionsFactory.FunctionPointerType(this, functionPointer);
             }
-
-            if (type.SpecialType == SpecialType.None || type.SpecialType == SpecialType.System_Enum || type.SpecialType == SpecialType.System_ValueType || type.SpecialType == SpecialType.System_Decimal || type.TypeKind == TypeKind.Interface)
+
+            if (type.SpecialType == SpecialType.None 
+                || type.SpecialType == SpecialType.System_Enum 
+                || type.SpecialType == SpecialType.System_ValueType 
+                || type.SpecialType == SpecialType.System_Decimal 
+                || type.SpecialType == SpecialType.System_DateTime
+                || type.SpecialType == SpecialType.System_Delegate
+                || type.TypeKind == TypeKind.Interface)
             {
                 return null;
             }