introduce missing MBROs

src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/FormsDesignerBinding.cs

@@ -48,14 +48,14 @@ namespace Grunwald.BooBinding.Designer
 				return new IViewContent[0];
 			}
 			
-			IDesignerLoaderProvider loader = new BooDesignerLoaderProvider();
+			IDesignerLoaderProviderWithViewContent loader = new BooDesignerLoaderProvider();
 			IDesignerGenerator generator = new BooDesignerGenerator();
 			IDesignerSourceProvider sourceProvider = (IDesignerSourceProvider)generator;
 			return new IViewContent[] { new FormsDesignerViewContent(viewContent, loader, generator, sourceProvider) };
 		}
 	}
 	
-	public class BooDesignerLoaderProvider : IDesignerLoaderProvider
+	public class BooDesignerLoaderProvider : IDesignerLoaderProviderWithViewContent
 	{
 		public BooDesignerLoaderProvider()
 		{

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerLoaderProvider.cs

@@ -8,13 +8,13 @@ using ICSharpCode.Scripting;
 
 namespace ICSharpCode.PythonBinding
 {
-	public class PythonDesignerLoaderProvider : IDesignerLoaderProvider
+	public class PythonDesignerLoaderProvider : IDesignerLoaderProviderWithViewContent
 	{
 		public PythonDesignerLoaderProvider()
 		{
 		}
 		
-		public DesignerLoader CreateLoader(IDesignerGenerator generator)
+		public IDesignerLoader CreateLoader(IDesignerGenerator generator)
 		{
 			return new PythonDesignerLoader(generator as IScriptingDesignerGenerator);
 		}	
@@ -27,10 +27,5 @@ namespace ICSharpCode.PythonBinding
 				throw new NotImplementedException();
 			}
 		}
-		
-		IDesignerLoader IDesignerLoaderProvider.CreateLoader(IDesignerGenerator generator)
-		{
-			throw new NotImplementedException();
-		}
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonFormsDesignerDisplayBinding.cs

@@ -54,7 +54,7 @@ namespace ICSharpCode.PythonBinding
 				}
 			}
 			
-			IDesignerLoaderProvider loader = new PythonDesignerLoaderProvider();
+			IDesignerLoaderProviderWithViewContent loader = new PythonDesignerLoaderProvider();
 			IDesignerGenerator generator = new PythonDesignerGenerator(textEditorOptions);
 			IDesignerSourceProvider sourceProvider = (IDesignerSourceProvider)generator;
 			return new IViewContent[] { new FormsDesignerViewContent(viewContent, loader, generator, sourceProvider) };

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyDesignerLoaderProvider.cs

@@ -8,13 +8,13 @@ using ICSharpCode.Scripting;
 
 namespace ICSharpCode.RubyBinding
 {
-	public class RubyDesignerLoaderProvider : IDesignerLoaderProvider
+	public class RubyDesignerLoaderProvider : IDesignerLoaderProviderWithViewContent
 	{
 		public RubyDesignerLoaderProvider()
 		{
 		}
 		
-		public DesignerLoader CreateLoader(IDesignerGenerator generator)
+		public IDesignerLoader CreateLoader(IDesignerGenerator generator)
 		{
 			return new RubyDesignerLoader(generator as IScriptingDesignerGenerator);
 		}	
@@ -27,10 +27,5 @@ namespace ICSharpCode.RubyBinding
 				throw new NotImplementedException();
 			}
 		}
-		
-		IDesignerLoader IDesignerLoaderProvider.CreateLoader(IDesignerGenerator generator)
-		{
-			throw new NotImplementedException();
-		}
 	}
 }

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyFormsDesignerDisplayBinding.cs

@@ -54,7 +54,7 @@ namespace ICSharpCode.RubyBinding
 				}
 			}
 			
-			IDesignerLoaderProvider loader = new RubyDesignerLoaderProvider();
+			IDesignerLoaderProviderWithViewContent loader = new RubyDesignerLoaderProvider();
 			IDesignerGenerator generator = new RubyDesignerGenerator(textEditorOptions);
 			IDesignerSourceProvider sourceProvider = (IDesignerSourceProvider)generator;
 			return new IViewContent[] { new FormsDesignerViewContent(viewContent, loader, generator, sourceProvider) };

src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerLoader.cs

@@ -10,7 +10,7 @@ using System.ComponentModel.Design.Serialization;
 using System.Globalization;
 using System.Resources;
 using System.Security.Permissions;
-
+using ICSharpCode.FormsDesigner;
 using ICSharpCode.FormsDesigner.Services;
 
 namespace ICSharpCode.Scripting
@@ -21,7 +21,7 @@ namespace ICSharpCode.Scripting
 	/// </summary>
 	[PermissionSet(SecurityAction.InheritanceDemand, Name="FullTrust")]
 	[PermissionSet(SecurityAction.LinkDemand, Name="FullTrust")]
-	public class ScriptingDesignerLoader : BasicDesignerLoader, IComponentCreator
+	public class ScriptingDesignerLoader : BasicDesignerLoader, IComponentCreator, IDesignerLoader
 	{
 		IScriptingDesignerGenerator generator;
 		IDesignerSerializationManager serializationManager;
@@ -154,5 +154,25 @@ namespace ICSharpCode.Scripting
 		{
 			return null;
 		}
+		
+		public System.CodeDom.CodeCompileUnit Parse()
+		{
+			throw new NotImplementedException();
+		}
+		
+		public void Write(System.CodeDom.CodeCompileUnit unit)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public CodeDomLocalizationModel GetLocalizationModel()
+		{
+			throw new NotImplementedException();
+		}
+		
+		public bool IsReloadNeeded(bool value)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/AbstractDesignerGenerator.cs

@@ -20,7 +20,7 @@ using ReflectionLayer = ICSharpCode.SharpDevelop.Dom.ReflectionLayer;
 
 namespace ICSharpCode.FormsDesigner
 {
-	public abstract class AbstractDesignerGenerator : IDesignerGenerator, IDesignerSourceProvider
+	public abstract class AbstractDesignerGenerator : MarshalByRefObject, IDesignerGenerator, IDesignerSourceProvider
 	{
 		/// <summary>The currently open part of the class being designed.</summary>
 		IClass currentClassPart;

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/AbstractCodeDomDesignerLoader.cs

@@ -9,7 +9,7 @@ namespace ICSharpCode.FormsDesigner
 	/// <summary>
 	/// Description of AbstractCodeDomDesignerLoader.
 	/// </summary>
-	public abstract class AbstractCodeDomDesignerLoader : IDesignerLoader
+	public abstract class AbstractCodeDomDesignerLoader : MarshalByRefObject, IDesignerLoader
 	{
 		protected AbstractCodeDomDesignerLoader(IDesignerGenerator generator)
 		{

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/DesignerLoaderProvider.cs

@@ -8,13 +8,12 @@ using ICSharpCode.NRefactory;
 
 namespace ICSharpCode.FormsDesigner
 {
-	public interface IDesignerLoaderProvider
+	public interface IDesignerLoaderProviderWithViewContent : IDesignerLoaderProvider
 	{
-		IDesignerLoader CreateLoader(IDesignerGenerator generator);
 		FormsDesignerViewContent ViewContent { get; set; }
 	}
 	
-	public class NRefactoryDesignerLoaderProvider : IDesignerLoaderProvider
+	public class NRefactoryDesignerLoaderProvider : MarshalByRefObject, IDesignerLoaderProviderWithViewContent
 	{
 		readonly SupportedLanguage language;
 		FormsDesignerViewContent viewContent;

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs

@@ -33,8 +33,7 @@ namespace ICSharpCode.FormsDesigner
 		bool disposing;
 		
 		readonly IViewContent primaryViewContent;
-		readonly IDesignerLoaderProvider loaderProvider;
-		DesignerLoader loader;
+		readonly IDesignerLoaderProviderWithViewContent loaderProvider;
 		readonly IDesignerGenerator generator;
 		readonly IDesignerSourceProvider sourceProvider;
 		readonly ResourceStore resourceStore;
@@ -121,12 +120,24 @@ namespace ICSharpCode.FormsDesigner
 			FileService.FileRemoving += this.FileServiceFileRemoving;
 			ICSharpCode.SharpDevelop.Debugging.DebuggerService.DebugStarting += this.DebugStarting;
 			
+			options = LoadOptions();
+			
+			var creationProperties = new FormsDesignerAppDomainCreationProperties {
+				 FileName = PrimaryFileName,
+				 TypeLocator = new DomTypeLocator(PrimaryFileName),
+				 GacWrapper = new DomGacWrapper(),
+				 Commands = new SharpDevelopCommandProvider(this),
+				 FormsDesignerProxy = new ViewContentIFormsDesignerProxy(this),
+				 Logger = new FormsDesignerLoggingServiceImpl(),
+				 Options = options
+			};
+			
 			appDomain = null;
-			appDomainHost = FormsDesignerAppDomainHost.CreateFormsDesignerInAppDomain(ref appDomain, PrimaryFileName, new DomTypeLocator(PrimaryFileName), new DomGacWrapper(), new SharpDevelopCommandProvider(this), new ViewContentIFormsDesignerProxy(this), new FormsDesignerLoggingServiceImpl());
+			appDomainHost = FormsDesignerAppDomainHost.CreateFormsDesignerInAppDomain(ref appDomain, creationProperties);
 			toolbox = new ToolboxProvider(appDomainHost);
 		}
 		
-		public FormsDesignerViewContent(IViewContent primaryViewContent, IDesignerLoaderProvider loaderProvider, IDesignerGenerator generator, IDesignerSourceProvider sourceProvider)
+		public FormsDesignerViewContent(IViewContent primaryViewContent, IDesignerLoaderProviderWithViewContent loaderProvider, IDesignerGenerator generator, IDesignerSourceProvider sourceProvider)
 			: this(primaryViewContent)
 		{
 			if (loaderProvider == null)
@@ -175,7 +186,7 @@ namespace ICSharpCode.FormsDesigner
 				
 			} else if (file == this.PrimaryFile || this.sourceCodeStorage.ContainsFile(file)) {
 				
-				if (this.loader != null && this.loader.Loading) {
+				if (appDomainHost.IsLoaderLoading) {
 					throw new InvalidOperationException("Designer loading a source code file while DesignerLoader is loading and the view is not in a master load operation. This must not happen.");
 				}
 				
@@ -225,7 +236,7 @@ namespace ICSharpCode.FormsDesigner
 				// Loading a resource file
 				
 				bool mustReload;
-				if (this.loader != null && !this.loader.Loading) {
+				if (appDomainHost.IsLoaderLoading) {
 					LoggingService.Debug("Forms designer: Reloading designer because of LoadInternal on resource file");
 					this.UnloadDesigner();
 					mustReload = true;
@@ -313,8 +324,6 @@ namespace ICSharpCode.FormsDesigner
 		{
 			LoggingService.Info("Form Designer: BEGIN INITIALIZE");
 			
-			options = LoadOptions();
-			
 			appDomainHost.AddService(typeof(IMessageService), new FormsMessageService());
 			appDomainHost.AddService(typeof(System.Windows.Forms.Design.IUIService), new UIService(this));
 			appDomainHost.AddService(typeof(System.Drawing.Design.IToolboxService), toolbox.ToolboxService);
@@ -322,7 +331,6 @@ namespace ICSharpCode.FormsDesigner
 			appDomainHost.AddService(typeof(IHelpService), new HelpService());
 			
 			appDomainHost.AddService(typeof(System.ComponentModel.Design.IResourceService), new DesignerResourceService(this.resourceStore));
-			appDomainHost.AddService(typeof(DesignerOptionService), new SharpDevelopDesignerOptionService(options));
 			appDomainHost.AddService(typeof(IProjectResourceService), new ProjectResourceService(ParserService.GetParseInformation(this.DesignerCodeFile.FileName).CompilationUnit.ProjectContent));
 			appDomainHost.AddService(typeof(IImageResourceEditorDialogWrapper), new ImageResourceEditorDialogWrapper(ParserService.GetParseInformation(this.DesignerCodeFile.FileName).CompilationUnit.ProjectContent.Project as IProject));
 			
@@ -339,8 +347,7 @@ namespace ICSharpCode.FormsDesigner
 			appDomainHost.DesignSurfaceFlushed += new EventHandlerProxy(DesignerFlushed);
 			appDomainHost.DesignSurfaceUnloading += new EventHandlerProxy(DesignerUnloading);
 
-			this.loader = new SharpDevelopDesignerLoader(appDomainHost, generator, loaderProvider.CreateLoader(generator));
-			appDomainHost.BeginDesignSurfaceLoad(this.loader);
+			appDomainHost.BeginDesignSurfaceLoad(generator, loaderProvider);
 
 			if (!appDomainHost.IsDesignSurfaceLoaded) {
 				throw new FormsDesignerLoadException(appDomainHost.LoadErrors);
@@ -414,7 +421,7 @@ namespace ICSharpCode.FormsDesigner
 		
 		void ComponentChanged(object sender, ComponentChangedEventArgs e)
 		{
-			bool loading = this.loader != null && this.loader.Loading;
+			bool loading = appDomainHost.IsLoaderLoading;
 			LoggingService.Debug("Forms designer: ComponentChanged: " + (e.Component == null ? "<null>" : e.Component.ToString()) + ", Member=" + (e.Member == null ? "<null>" : e.Member.Name) + ", OldValue=" + (e.OldValue == null ? "<null>" : e.OldValue.ToString()) + ", NewValue=" + (e.NewValue == null ? "<null>" : e.NewValue.ToString()) + "; Loading=" + loading + "; Unloading=" + this.unloading);
 			if (!loading && !unloading) {
 				try {
@@ -434,7 +441,7 @@ namespace ICSharpCode.FormsDesigner
 		
 		void ComponentListChanged(object sender, EventArgs e)
 		{
-			bool loading = this.loader != null && this.loader.Loading;
+			bool loading = appDomainHost.IsLoaderLoading;
 			LoggingService.Debug("Forms designer: Component added/removed/renamed, Loading=" + loading + ", Unloading=" + this.unloading);
 			if (!loading && !unloading) {
 				shouldUpdateSelectableObjects = true;
@@ -483,8 +490,6 @@ namespace ICSharpCode.FormsDesigner
 				}
 			}
 			
-			this.loader = null;
-			
 			foreach (KeyValuePair<Type, TypeDescriptionProvider> entry in this.addedTypeDescriptionProviders) {
 				TypeDescriptor.RemoveProvider(entry.Value, entry.Key);
 			}

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/ImageResourceEditorDialog.cs

@@ -577,7 +577,7 @@ namespace ICSharpCode.FormsDesigner.Gui
 		#endregion
 	}
 	
-	public class ImageResourceEditorDialogWrapper : IImageResourceEditorDialogWrapper
+	public class ImageResourceEditorDialogWrapper : MarshalByRefObject, IImageResourceEditorDialogWrapper
 	{
 		IProject project;
 		

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/SecondaryDisplayBinding.cs

@@ -113,7 +113,7 @@ namespace ICSharpCode.FormsDesigner
 			
 			fileExtension = Path.GetExtension(fileName).ToLowerInvariant();
 			
-			IDesignerLoaderProvider loader;
+			IDesignerLoaderProviderWithViewContent loader;
 			IDesignerGenerator generator;
 			IDesignerSourceProvider sourceProvider;
 			

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/ProjectResourceService.cs

@@ -19,7 +19,7 @@ namespace ICSharpCode.FormsDesigner.Services
 	/// <summary>
 	/// Supports project-level resources in the Windows.Forms designer.
 	/// </summary>
-	public sealed class ProjectResourceService : IProjectResourceService
+	public sealed class ProjectResourceService : MarshalByRefObject, IProjectResourceService
 	{
 		IProjectContent projectContent;
 		string stringLiteralDelimiter;

src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesignerAppDomainHost.cs

@@ -22,6 +22,7 @@ namespace ICSharpCode.FormsDesigner
 	{
 		DesignSurface designSurface;
 		ServiceContainer container;
+		DesignerLoader loader;
 		
 		public string DesignSurfaceName {
 			get {
@@ -35,6 +36,12 @@ namespace ICSharpCode.FormsDesigner
 			}
 		}
 		
+		public bool IsLoaderLoading {
+			get {
+				return this.loader != null && this.loader.Loading;
+			}
+		}
+		
 		public IDesignerHost Host {
 			get {
 				if (designSurface == null)
@@ -49,7 +56,7 @@ namespace ICSharpCode.FormsDesigner
 		
 		static readonly DesignSurfaceManager designSurfaceManager = new DesignSurfaceManager();
 		
-		public static FormsDesignerAppDomainHost CreateFormsDesignerInAppDomain(ref AppDomain appDomain, string fileName, ITypeLocator typeLocator, IGacWrapper gacWrapper, ICommandProvider commands, IFormsDesigner formsDesignerProxy, IFormsDesignerLoggingService logger)
+		public static FormsDesignerAppDomainHost CreateFormsDesignerInAppDomain(ref AppDomain appDomain, FormsDesignerAppDomainCreationProperties properties)
 		{
 			if (appDomain == null) {
 				// Construct and initialize settings for a second AppDomain.
@@ -63,24 +70,25 @@ namespace ICSharpCode.FormsDesigner
 				appDomain = AppDomain.CreateDomain("FormsDesigner AD", null, formsDesignerAppDomainSetup);
 			}
 			var host = (FormsDesignerAppDomainHost)appDomain.CreateInstanceAndUnwrap(typeof(FormsDesignerAppDomainHost).Assembly.FullName, typeof(FormsDesignerAppDomainHost).FullName);
-			host.Initialize(fileName, typeLocator, gacWrapper, commands, formsDesignerProxy, logger);
+			host.Initialize(properties);
 			return host;
 		}
 		
-		void Initialize(string fileName, ITypeLocator typeLocator, IGacWrapper gacWrapper, ICommandProvider commands, IFormsDesigner formsDesignerProxy, IFormsDesignerLoggingService logger)
+		void Initialize(FormsDesignerAppDomainCreationProperties properties)
 		{
 			this.container = new DefaultServiceContainer();
-			container.AddService(typeof(IFormsDesignerLoggingService), logger);
+			container.AddService(typeof(IFormsDesignerLoggingService), properties.Logger);
 			container.AddService(typeof(System.Drawing.Design.IPropertyValueUIService), new PropertyValueUIService());
-			container.AddService(typeof(ITypeResolutionService), new TypeResolutionService(fileName, container, typeLocator));
-			container.AddService(typeof(ITypeDiscoveryService), new TypeDiscoveryService(gacWrapper, container));
+			container.AddService(typeof(ITypeResolutionService), new TypeResolutionService(properties.FileName, container, properties.TypeLocator));
+			container.AddService(typeof(ITypeDiscoveryService), new TypeDiscoveryService(properties.GacWrapper, container));
 			container.AddService(typeof(MemberRelationshipService), new DefaultMemberRelationshipService(container));
 			container.AddService(typeof(AmbientProperties), new AmbientProperties());
+			container.AddService(typeof(DesignerOptionService), new SharpDevelopDesignerOptionService(properties.Options));
 			
 			this.designSurface = designSurfaceManager.CreateDesignSurface(container);
 			
-			container.AddService(typeof(System.ComponentModel.Design.IMenuCommandService), new ICSharpCode.FormsDesigner.Services.MenuCommandService(commands, designSurface).Proxy);
-			Services.EventBindingService eventBindingService = new Services.EventBindingService(formsDesignerProxy, designSurface);
+			container.AddService(typeof(System.ComponentModel.Design.IMenuCommandService), new ICSharpCode.FormsDesigner.Services.MenuCommandService(properties.Commands, designSurface).Proxy);
+			Services.EventBindingService eventBindingService = new Services.EventBindingService(properties.FormsDesignerProxy, designSurface);
 			container.AddService(typeof(System.ComponentModel.Design.IEventBindingService), eventBindingService);
 			
 			InitializeEvents();
@@ -270,8 +278,9 @@ namespace ICSharpCode.FormsDesigner
 			return designSurface.GetService(serviceType);
 		}
 		
-		public void BeginDesignSurfaceLoad(DesignerLoader loader)
+		public void BeginDesignSurfaceLoad(IDesignerGenerator generator, IDesignerLoaderProvider loaderProvider)
 		{
+			this.loader = new SharpDevelopDesignerLoader(this, generator, loaderProvider.CreateLoader(generator));
 			designSurface.BeginLoad(loader);
 		}
 		
@@ -294,7 +303,10 @@ namespace ICSharpCode.FormsDesigner
 		}
 		
 		public bool ReferencedAssemblyChanged {
-			get { return ((TypeResolutionService)GetService(typeof(ITypeResolutionService))).ReferencedAssemblyChanged; }
+			get {
+				var typeResolutionService = (TypeResolutionService)GetService(typeof(ITypeResolutionService));
+				return typeResolutionService != null && typeResolutionService.ReferencedAssemblyChanged;
+			}
 		}
 		
 		public void FlushDesignSurface()
@@ -340,4 +352,15 @@ namespace ICSharpCode.FormsDesigner
 			Services.AddService(type, service);
 		}
 	}
+	
+	public class FormsDesignerAppDomainCreationProperties : MarshalByRefObject
+	{
+		public string FileName { get; set; }
+		public ITypeLocator TypeLocator { get; set; }
+		public IGacWrapper GacWrapper { get; set; }
+		public ICommandProvider Commands { get; set; }
+		public IFormsDesigner FormsDesignerProxy { get; set; }
+		public IFormsDesignerLoggingService Logger { get; set; }
+		public SharpDevelopDesignerOptions Options { get; set; }
+	}
 }

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/IFormsDesignerLoggingService.cs

@@ -15,4 +15,10 @@ namespace ICSharpCode.FormsDesigner
 		void DebugFormatted(string format, params object[] args);
 		void WarnFormatted(string format, params object[] args);
 	}
+	
+	public interface IDesignerLoaderProvider
+	{
+		IDesignerLoader CreateLoader(IDesignerGenerator generator);
+	}
+	
 }