Fix build (however formatting tests will fail).

ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeSystemConvertVisitorTests.cs

@@ -30,7 +30,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 			TypeSystemConvertVisitor visitor = new TypeSystemConvertVisitor(testCasePC, fileName);
 			cu.AcceptVisitor(visitor, null);
 			ParsedFile parsedFile = visitor.ParsedFile;
-			((SimpleProjectContent)testCasePC).UpdateProjectContent(null, parsedFile.TopLevelTypeDefinitions, null, parsedFile.AssemblyAttributes);
+			((SimpleProjectContent)testCasePC).UpdateProjectContent(null, parsedFile);
 		}
 	}
 }

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs

@@ -151,7 +151,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			ParsedFile parsedFile = new ParsedFile("test.cs", rootUsingScope);
 			TypeSystemConvertVisitor convertVisitor = new TypeSystemConvertVisitor(parsedFile, resolver.UsingScope, null);
 			cu.AcceptVisitor(convertVisitor, null);
-			project.UpdateProjectContent(null, convertVisitor.ParsedFile.TopLevelTypeDefinitions, null, null);
+			project.UpdateProjectContent(null, convertVisitor.ParsedFile);
 			
 			FindNodeVisitor fnv = new FindNodeVisitor(dollars[0], dollars[1]);
 			cu.AcceptVisitor(fnv, null);

ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using ICSharpCode.NRefactory.CSharp;
 using System.IO;
 using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
 
 namespace ICSharpCode.NRefactory.FormattingTests
 {
@@ -107,16 +108,6 @@ namespace ICSharpCode.NRefactory.FormattingTests
 			return new Segment (startOffset, endOffset - startOffset, delimiterLength);
 		}
 		
-		public void ApplyChanges (List<Change> changes)
-		{
-			changes.Sort ((x, y) => x.Offset.CompareTo (y.Offset));
-			changes.Reverse ();
-			foreach (var change in changes) {
-				text = text.Substring (0, change.Offset) + change.InsertedText + text.Substring (change.Offset + change.RemovedChars);
-			}
-			delimiters = new  List<Delimiter> (FindDelimiter (text));
-		}
-		
 		#region ITextEditorAdapter implementation
 		public int LocationToOffset (int line, int col)
 		{
@@ -224,14 +215,15 @@ namespace ICSharpCode.NRefactory.FormattingTests
 	
 	public abstract class TestBase
 	{
+		static IActionFactory factory = null;
 		protected static ITextEditorAdapter GetResult (CSharpFormattingOptions policy, string input)
 		{
 			var adapter = new TextEditorTestAdapter (input);
-			var visitior = new AstFormattingVisitor (policy, adapter);
+			var visitior = new AstFormattingVisitor (policy, adapter, factory);
 			
 			var compilationUnit = new CSharpParser ().Parse (new StringReader (adapter.Text));
 			compilationUnit.AcceptVisitor (visitior, null);
-			adapter.ApplyChanges (visitior.Changes);
+//			adapter.ApplyChanges (visitior.Changes);
 
 			return adapter;
 		}
@@ -239,22 +231,22 @@ namespace ICSharpCode.NRefactory.FormattingTests
 		protected static ITextEditorAdapter Test (CSharpFormattingOptions policy, string input, string expectedOutput)
 		{
 			var adapter = new TextEditorTestAdapter (input);
-			var visitior = new AstFormattingVisitor (policy, adapter);
+			var visitior = new AstFormattingVisitor (policy, adapter, factory);
 			
 			var compilationUnit = new CSharpParser ().Parse (new StringReader (adapter.Text));
 			compilationUnit.AcceptVisitor (visitior, null);
-			adapter.ApplyChanges (visitior.Changes);
+//			adapter.ApplyChanges (visitior.Changes);
 			Assert.AreEqual (expectedOutput, adapter.Text);
 			return adapter;
 		}
 
 		protected static void Continue (CSharpFormattingOptions policy, ITextEditorAdapter adapter, string expectedOutput)
 		{
-			var visitior = new AstFormattingVisitor (policy, adapter);
+			var visitior = new AstFormattingVisitor (policy, adapter, factory);
 			
 			var compilationUnit = new CSharpParser ().Parse (new StringReader (adapter.Text));
 			compilationUnit.AcceptVisitor (visitior, null);
-			((TextEditorTestAdapter)adapter).ApplyChanges (visitior.Changes);
+//			((TextEditorTestAdapter)adapter).ApplyChanges (visitior.Changes);
 			Assert.AreEqual (expectedOutput, adapter.Text);
 		}
 

ICSharpCode.NRefactory.Tests/TypeSystem/CecilLoaderTests.cs

@@ -98,11 +98,11 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			ITypeDefinition c = Mscorlib.GetClass(typeof(Environment));
 			Assert.IsNotNull(c, "System.Environment not found");
 			ITypeReference rt = c.Methods.First(m => m.Name == "GetFolderPath").Parameters[0].Type;
-			Assert.AreSame(c.InnerClasses.Single(ic => ic.Name == "SpecialFolder"), rt.Resolve(ctx));
+			Assert.AreSame(c.NestedTypes.Single(ic => ic.Name == "SpecialFolder"), rt.Resolve(ctx));
 		}
 		
 		[Test]
-		public void InnerClassesTest()
+		public void NestedTypesTest()
 		{
 			ITypeDefinition c = Mscorlib.GetClass(typeof(Environment.SpecialFolder));
 			Assert.IsNotNull(c, "c is null");

ICSharpCode.NRefactory.Tests/TypeSystem/TestInterningProvider.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2010 AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) 2010 AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under MIT X11 license (for details please see \doc\license.txt)
 
 using System;
@@ -130,7 +130,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			
 			public void InternProject(IProjectContent pc)
 			{
-				foreach (var c in TreeTraversal.PreOrder(pc.GetClasses(), c => c.InnerClasses)) {
+				foreach (var c in TreeTraversal.PreOrder(pc.GetClasses(), c => c.NestedTypes)) {
 					Intern(c.Namespace);
 					Intern(c.Name);
 					foreach (IMember m in c.Members) {