fix nested types

Fody · Mar 7, 2013 · cb5d742 · cb5d742
1 parent 0df15f4
commit cb5d742
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/AssemblyToProcess/AssemblyToProcess.csproj b/AssemblyToProcess/AssemblyToProcess.csproj
@@ -69,6 +69,7 @@
     <Compile Include="AlsoRemoveMe.cs" />
     <Compile Include="ClassEndingInMock.cs" />
     <Compile Include="ClassEndingInTests.cs" />
+    <Compile Include="ClassWithNested.cs" />
     <Compile Include="ForceReferences.cs" />
     <Compile Include="MSpec\AssemblyContext.cs" />
     <Compile Include="MSpec\CleanupAfterEveryContextInAssembly.cs" />

diff --git a/AssemblyToProcess/ClassWithNested.cs b/AssemblyToProcess/ClassWithNested.cs
@@ -0,0 +1,7 @@
+public class ClassWithNested
+{
+    public class NestedClassEndingInTests
+    {
+
+    }
+}
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -2,5 +2,5 @@
 
 [assembly: AssemblyTitle("Scalpel")]
 [assembly: AssemblyProduct("Scalpel")]
-[assembly: AssemblyVersion("0.7.0.0")]
-[assembly: AssemblyFileVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]
diff --git a/Fody/ModuleWeaver.cs b/Fody/ModuleWeaver.cs
@@ -34,12 +34,21 @@ public void Execute()
         }
         ReadConfig();
 
-        var typeDefinitions = ModuleDefinition.Types.ToList();
+        var typeDefinitions = ModuleDefinition.GetTypes().ToList();
         foreach (var type in typeDefinitions)
         {
             if (removers.Any(x => x.ShouldRemoveType(type)))
             {
-                ModuleDefinition.Types.Remove(type);
+                if (type.IsNested)
+                {
+                    var enclosingType = type.DeclaringType;
+                    enclosingType.NestedTypes.Remove(type);
+                }
+                else
+                {
+
+                ModuleDefinition.Types.Remove(type);       
+                }
             }
         }
         var assemblyNameReferences = ModuleDefinition.AssemblyReferences.ToList();

diff --git a/Tests/IntegrationTests.cs b/Tests/IntegrationTests.cs
@@ -76,6 +76,11 @@ public void ClassEndingInTestsIsRemoved()
     {
         Assert.IsFalse(assembly.GetTypes().Any(x => x.Name == "ClassEndingInTests"));
     }
+    [Test]
+    public void NestedClassEndingInTests()
+    {
+        Assert.IsFalse(assembly.GetTypes().Any(x => x.Name == "NestedClassEndingInTests"));
+    }
 
 
     [Test]
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,11 @@ public void ClassEndingInTestsIsRemoved() @@
         {
             Assert.IsFalse(assembly.GetTypes().Any(x => x.Name == "ClassEndingInTests"));
         }
+        [Test]
+        public void NestedClassEndingInTests()
+        {
+            Assert.IsFalse(assembly.GetTypes().Any(x => x.Name == "NestedClassEndingInTests"));
+        }
         [Test]
@@ Expand Down @@