[AssemblyBrowser] Creation of NR5 type system is now moved to a

background task.
+ Fixed some UI issues.

6 files changed, 100 insertions, 89 deletions

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index 54ad286a35..83a1171990 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -258,7 +258,8 @@ namespace MonoDevelop.AssemblyBrowser
 			this.inspectEditor.IsReadOnly = true;
 //			this.inspectEditor.Document.SyntaxMode = new Mono.TextEditor.Highlighting.MarkupSyntaxMode ();
 //			this.inspectEditor.LinkRequest += InspectEditorhandleLinkRequest;
-			documentationScrolledWindow.Add (inspectEditor);
+
+			documentationScrolledWindow.PackStart (inspectEditor, true, true, 0);
 
 			this.hpaned1.ExposeEvent += HPaneExpose;
 			hpaned1 = hpaned1.ReplaceWithWidget (new HPanedThin (), true);
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
index d5859582ac..0942715e79 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
@@ -60,10 +60,10 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 		}
 		
-		readonly Lazy<IUnresolvedAssembly> unresolvedAssembly;
+		IUnresolvedAssembly unresolvedAssembly;
 		public IUnresolvedAssembly UnresolvedAssembly {
 			get {
-				return unresolvedAssembly.Value;
+				return unresolvedAssembly;
 			}
 		}
 		
@@ -77,25 +77,18 @@ namespace MonoDevelop.AssemblyBrowser
 			this.FileName = fileName;
 			if (!File.Exists (fileName))
 				throw new ArgumentException ("File doesn't exist.", "fileName");
-			this.assemblyLoaderTask = Task.Factory.StartNew<AssemblyDefinition> (() => {
+			this.assemblyLoaderTask = Task.Run (() => {
 				try {
-					return AssemblyDefinition.ReadAssembly (FileName, new ReaderParameters {
+					var asm = AssemblyDefinition.ReadAssembly (FileName, new ReaderParameters {
 						AssemblyResolver = this
 					});
+					unresolvedAssembly = widget.CecilLoader.LoadAssembly (asm);
+					return asm;
 				} catch (Exception e) {
 					LoggingService.LogError ("Error while reading assembly " + FileName, e);
 					return null;
 				}
 			}, src.Token);
-			
-			this.unresolvedAssembly = new Lazy<IUnresolvedAssembly> (delegate {
-				try {
-					return widget.CecilLoader.LoadAssembly (Assembly);
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while loading assembly", e);
-					return new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedAssembly (FileName);
-				}
-			});
 		}
 		
 		#region IAssemblyResolver implementation
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs
index a7dabd0e11..b7191c7738 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs
@@ -46,7 +46,7 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			layout = new Pango.Layout (PangoContext);
 			layout.Wrap = Pango.WrapMode.Word;
-			layout.FontDescription = Pango.FontDescription.FromString (PropertyService.Get<string> ("FontName"));
+			//layout.FontDescription = Pango.FontDescription.FromString (PropertyService.Get<string> ("FontName"));
 		}
 		
 		protected override void OnDestroyed ()
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
index 5ebb678ab8..99e5465de5 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
@@ -2,102 +2,113 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.AssemblyBrowser
 {
-	internal partial class AssemblyBrowserWidget
+	public partial class AssemblyBrowserWidget
 	{
 		private global::Gtk.UIManager UIManager;
+
 		private global::Gtk.Action NavigateBackwardAction;
+
 		private global::Gtk.Action NavigateForwardAction;
+
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.HPaned hpaned1;
+
 		private global::Gtk.Alignment treeViewPlaceholder;
+
 		private global::Gtk.VBox vbox3;
+
 		private global::Gtk.Notebook notebook1;
-		private global::MonoDevelop.Components.CompactScrolledWindow documentationScrolledWindow;
+
+		private global::Gtk.HBox documentationScrolledWindow;
+
 		private global::Gtk.VBox searchWidget;
+
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+
 		private global::Gtk.TreeView searchTreeview;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget
-			Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach (this);
-			this.UIManager = new global::Gtk.UIManager ();
-			global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Default");
-			this.NavigateBackwardAction = new global::Gtk.Action ("NavigateBackwardAction", global::Mono.Unix.Catalog.GetString ("Navigate backward"), null, "gtk-go-back");
-			this.NavigateBackwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate backward");
-			w2.Add (this.NavigateBackwardAction, null);
-			this.NavigateForwardAction = new global::Gtk.Action ("NavigateForwardAction", global::Mono.Unix.Catalog.GetString ("Navigate forward"), null, "gtk-go-forward");
-			this.NavigateForwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate forward");
-			w2.Add (this.NavigateForwardAction, null);
-			this.UIManager.InsertActionGroup (w2, 0);
+			Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach(this);
+			this.UIManager = new global::Gtk.UIManager();
+			global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup("Default");
+			this.NavigateBackwardAction = new global::Gtk.Action("NavigateBackwardAction", global::Mono.Unix.Catalog.GetString("Navigate backward"), null, "gtk-go-back");
+			this.NavigateBackwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Navigate backward");
+			w2.Add(this.NavigateBackwardAction, null);
+			this.NavigateForwardAction = new global::Gtk.Action("NavigateForwardAction", global::Mono.Unix.Catalog.GetString("Navigate forward"), null, "gtk-go-forward");
+			this.NavigateForwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Navigate forward");
+			w2.Add(this.NavigateForwardAction, null);
+			this.UIManager.InsertActionGroup(w2, 0);
 			this.Name = "MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget";
 			// Container child MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 2;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.hpaned1 = new global::Gtk.HPaned ();
+			this.hpaned1 = new global::Gtk.HPaned();
 			this.hpaned1.CanFocus = true;
 			this.hpaned1.Name = "hpaned1";
 			this.hpaned1.Position = 271;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.treeViewPlaceholder = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.treeViewPlaceholder = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.treeViewPlaceholder.Name = "treeViewPlaceholder";
-			this.hpaned1.Add (this.treeViewPlaceholder);
-			global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.treeViewPlaceholder]));
+			this.hpaned1.Add(this.treeViewPlaceholder);
+			global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.treeViewPlaceholder]));
 			w3.Resize = false;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3 = new global::Gtk.VBox();
 			this.vbox3.Name = "vbox3";
 			this.vbox3.Spacing = 6;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.notebook1 = new global::Gtk.Notebook ();
+			this.notebook1 = new global::Gtk.Notebook();
 			this.notebook1.CanFocus = true;
 			this.notebook1.Name = "notebook1";
 			this.notebook1.CurrentPage = 0;
 			this.notebook1.ShowBorder = false;
 			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.documentationScrolledWindow = new global::MonoDevelop.Components.CompactScrolledWindow ();
-			this.documentationScrolledWindow.CanFocus = true;
+			this.documentationScrolledWindow = new global::Gtk.HBox();
 			this.documentationScrolledWindow.Name = "documentationScrolledWindow";
-			this.documentationScrolledWindow.ShowBorderLine = false;
-			this.notebook1.Add (this.documentationScrolledWindow);
+			this.documentationScrolledWindow.Spacing = 6;
+			this.notebook1.Add(this.documentationScrolledWindow);
 			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.searchWidget = new global::Gtk.VBox ();
+			this.searchWidget = new global::Gtk.VBox();
 			this.searchWidget.Name = "searchWidget";
 			this.searchWidget.Spacing = 6;
 			// Container child searchWidget.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
+			this.scrolledwindow1 = new global::Gtk.ScrolledWindow();
 			this.scrolledwindow1.CanFocus = true;
 			this.scrolledwindow1.Name = "scrolledwindow1";
 			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.searchTreeview = new global::Gtk.TreeView ();
+			this.searchTreeview = new global::Gtk.TreeView();
 			this.searchTreeview.CanFocus = true;
 			this.searchTreeview.Name = "searchTreeview";
-			this.scrolledwindow1.Add (this.searchTreeview);
-			this.searchWidget.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.searchWidget [this.scrolledwindow1]));
+			this.scrolledwindow1.Add(this.searchTreeview);
+			this.searchWidget.Add(this.scrolledwindow1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.searchWidget[this.scrolledwindow1]));
 			w6.Position = 0;
-			this.notebook1.Add (this.searchWidget);
-			global::Gtk.Notebook.NotebookChild w7 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.searchWidget]));
+			this.notebook1.Add(this.searchWidget);
+			global::Gtk.Notebook.NotebookChild w7 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1[this.searchWidget]));
 			w7.Position = 1;
-			this.vbox3.Add (this.notebook1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.notebook1]));
+			this.vbox3.Add(this.notebook1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.notebook1]));
 			w8.Position = 0;
-			this.hpaned1.Add (this.vbox3);
-			this.vbox1.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hpaned1]));
+			this.hpaned1.Add(this.vbox3);
+			this.vbox1.Add(this.hpaned1);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hpaned1]));
 			w10.Position = 0;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			w1.SetUiManager (UIManager);
-			this.Hide ();
-			this.NavigateBackwardAction.Activated += new global::System.EventHandler (this.OnNavigateBackwardActionActivated);
-			this.NavigateForwardAction.Activated += new global::System.EventHandler (this.OnNavigateForwardActionActivated);
+			w1.SetUiManager(UIManager);
+			this.Hide();
+			this.NavigateBackwardAction.Activated += new global::System.EventHandler(this.OnNavigateBackwardActionActivated);
+			this.NavigateForwardAction.Activated += new global::System.EventHandler(this.OnNavigateForwardActionActivated);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
index 3285e87c05..453751b36a 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
@@ -6,9 +6,10 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		internal static void Initialize (Gtk.Widget iconRenderer)
+		internal static void Initialize(Gtk.Widget iconRenderer)
 		{
-			if ((Stetic.Gui.initialized == false)) {
+			if ((Stetic.Gui.initialized == false))
+			{
 				Stetic.Gui.initialized = true;
 			}
 		}
@@ -17,50 +18,55 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
-		
+
 		private Gtk.UIManager uimanager;
 
-		public static BinContainer Attach (Gtk.Bin bin)
+		public static BinContainer Attach(Gtk.Bin bin)
 		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
+			BinContainer bc = new BinContainer();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
 			return bc;
 		}
 
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
+		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
 		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
+			if ((this.child != null))
+			{
+				args.Requisition = this.child.SizeRequest();
 			}
 		}
 
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
+		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
 		{
-			if ((this.child != null)) {
+			if ((this.child != null))
+			{
 				this.child.Allocation = args.Allocation;
 			}
 		}
 
-		private void OnAdded (object sender, Gtk.AddedArgs args)
+		private void OnAdded(object sender, Gtk.AddedArgs args)
 		{
 			this.child = args.Widget;
 		}
 
-		public void SetUiManager (Gtk.UIManager uim)
+		public void SetUiManager(Gtk.UIManager uim)
 		{
 			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
+			this.child.Realized += new System.EventHandler(this.OnRealized);
 		}
 
-		private void OnRealized (object sender, System.EventArgs args)
+		private void OnRealized(object sender, System.EventArgs args)
 		{
-			if ((this.uimanager != null)) {
+			if ((this.uimanager != null))
+			{
 				Gtk.Widget w;
 				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
+				if (((w != null)
+							&& typeof(Gtk.Window).IsInstanceOfType(w)))
+				{
+					((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
 					this.uimanager = null;
 				}
 			}
@@ -69,12 +75,12 @@ namespace Stetic
 
 	internal class ActionGroups
 	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		public static Gtk.ActionGroup GetActionGroup(System.Type type)
 		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+			return Stetic.ActionGroups.GetActionGroup(type.FullName);
 		}
 
-		public static Gtk.ActionGroup GetActionGroup (string name)
+		public static Gtk.ActionGroup GetActionGroup(string name)
 		{
 			return null;
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
index 3eef8c0c9a..fe7c847d7a 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
@@ -6,10 +6,9 @@
   </configuration>
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
     <widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
+    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/DisplayBindings/AssemblyBrowser/MonoDevelop.AssemblyBrowser.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget" design-size="702 482">
@@ -31,7 +30,6 @@
     </action-group>
     <property name="MemberName" />
     <property name="Visible">False</property>
-    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox1">
         <property name="MemberName" />
@@ -63,10 +61,12 @@
                     <property name="CurrentPage">0</property>
                     <property name="ShowBorder">False</property>
                     <child>
-                      <widget class="MonoDevelop.Components.CompactScrolledWindow" id="documentationScrolledWindow">
+                      <widget class="Gtk.HBox" id="documentationScrolledWindow">
                         <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShowBorderLine">False</property>
+                        <property name="Spacing">6</property>
+                        <child>
+                          <placeholder />
+                        </child>
                       </widget>
                     </child>
                     <child>