Merge remote-tracking branch 'upstream/master'

gumme · gumme · commit b7643d66ebd6 · 2014-01-09T11:21:50.000+01:00
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpSemanticHighlighter.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpSemanticHighlighter.cs
@@ -256,7 +256,7 @@ HighlightedLine DoHighlightLine(int lineNumber, IDocumentLine documentLine, Cach
 			if (parseInfo == null) {
 				if (invalidLines != null && !invalidLines.Contains(documentLine)) {
 					invalidLines.Add(documentLine);
-					Debug.WriteLine("Semantic highlighting for line {0} - marking as invalid", lineNumber);
+					//Debug.WriteLine("Semantic highlighting for line {0} - marking as invalid", lineNumber);
 				}
 				
 				if (cachedLine != null) {
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeActionProviderDoozer.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeActionProviderDoozer.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using ICSharpCode.SharpDevelop;
 using CSharpBinding.Parser;
 using ICSharpCode.Core;
 using ICSharpCode.NRefactory.CSharp;
@@ -93,11 +94,17 @@ public Task<IContextAction[]> GetAvailableActionsAsync(EditorRefactoringContext
 				int selectionLength = editor.SelectionLength;
 				return Task.Run(
 					async delegate {
-						if (!CreateCodeActionProvider())
+						try {
+							if (!CreateCodeActionProvider())
+								return new IContextAction[0];
+							CSharpAstResolver resolver = await context.GetAstResolverAsync().ConfigureAwait(false);
+							var refactoringContext = new SDRefactoringContext(context.TextSource, resolver, context.CaretLocation, selectionStart, selectionLength, cancellationToken);
+							return codeActionProvider.GetActions(refactoringContext).Select(Wrap).ToArray();
+						} catch (Exception ex) {
+							SD.Log.WarnFormatted("CSharpContextActionProviderWrapper crashed: {0}", ex);
+							SD.AnalyticsMonitor.TrackException(ex);
 							return new IContextAction[0];
-						CSharpAstResolver resolver = await context.GetAstResolverAsync().ConfigureAwait(false);
-						var refactoringContext = new SDRefactoringContext(context.TextSource, resolver, context.CaretLocation, selectionStart, selectionLength, cancellationToken);
-						return codeActionProvider.GetActions(refactoringContext).Select(Wrap).ToArray();
+						}
 					}, cancellationToken);
 			}
 			
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs
@@ -1027,7 +1027,7 @@ VisualLine BuildVisualLine(DocumentLine documentLine,
 			if (heightTree.GetIsCollapsed(documentLine.LineNumber))
 				throw new InvalidOperationException("Trying to build visual line from collapsed line");
 			
-			Debug.WriteLine("Building line " + documentLine.LineNumber);
+			//Debug.WriteLine("Building line " + documentLine.LineNumber);
 			
 			VisualLine visualLine = new VisualLine(this, documentLine);
 			VisualLineTextSource textSource = new VisualLineTextSource(visualLine) {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs
@@ -117,6 +117,8 @@ public override void VisitObjectCreateExpression(ObjectCreateExpression objectCr
 			
 			bool BaseTypeHasUsableParameterlessConstructor()
 			{
+				if (baseType.Kind == TypeKind.Unknown)
+					return true; // don't show CS1729 error message if base type is unknown 
 				var memberLookup = new MemberLookup(currentType.GetDefinition(), ctx.Compilation.MainAssembly);
 				OverloadResolution or = new OverloadResolution(ctx.Compilation, new ResolveResult[0]);
 				foreach (var ctor in baseType.GetConstructors()) {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
@@ -167,7 +167,7 @@ void WriteTypeDeclarationName(ITypeDefinition typeDef, TokenWriter writer, CShar
 			if (typeDef.DeclaringTypeDefinition != null) {
 				WriteTypeDeclarationName(typeDef.DeclaringTypeDefinition, writer, formattingPolicy);
 				writer.WriteToken(Roles.Dot, ".");
-			} else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) == ConversionFlags.UseFullyQualifiedTypeNames) {
+			} else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) == ConversionFlags.UseFullyQualifiedMemberNames) {
 				WriteQualifiedName(typeDef.Namespace, writer, formattingPolicy);
 				writer.WriteToken(Roles.Dot, ".");
 			}
@@ -265,13 +265,15 @@ public string ConvertType(IType type)
 				throw new ArgumentNullException("type");
 			
 			TypeSystemAstBuilder astBuilder = CreateAstBuilder();
+			astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) != ConversionFlags.UseFullyQualifiedMemberNames;
 			AstType astType = astBuilder.ConvertType(type);
 			return astType.ToString();
 		}
 		
 		public void ConvertType(IType type, TokenWriter writer, CSharpFormattingOptions formattingPolicy)
 		{
 			TypeSystemAstBuilder astBuilder = CreateAstBuilder();
+			astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) != ConversionFlags.UseFullyQualifiedMemberNames;
 			AstType astType = astBuilder.ConvertType(type);
 			astType.AcceptVisitor(new CSharpOutputVisitor(writer, formattingPolicy));
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IAmbience.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IAmbience.cs
@@ -70,6 +70,11 @@ public enum ConversionFlags
 		/// </summary>
 		ShowBody = 0x200,
 		
+		/// <summary>
+		/// Use fully qualified names for members.
+		/// </summary>
+		UseFullyQualifiedMemberNames = 0x400,
+		
 		StandardConversionFlags = ShowParameterNames |
 			ShowAccessibility |
 			ShowParameterList |
@@ -79,7 +84,7 @@ public enum ConversionFlags
 			ShowDefinitionKeyword |
 			ShowBody,
 		
-		All = 0x3ff,
+		All = 0x7ff,
 	}
 	
 	public interface IAmbience
diff --git a/src/Main/Base/Project/Dom/ClassBrowser/AssemblyReferenceTreeNode.cs b/src/Main/Base/Project/Dom/ClassBrowser/AssemblyReferenceTreeNode.cs
@@ -19,6 +19,9 @@ public AssemblyReferenceTreeNode(IAssemblyReferenceModel model)
 			if (model == null)
 				throw new ArgumentNullException("model");
 			this.model = model;
+			
+			// To avoid the "+" sign in front of node...
+			this.LazyLoading = false;
 		}
 		
 		protected override object GetModel()
diff --git a/src/Main/Base/Project/Dom/ClassBrowser/ClassBrowserTreeView.cs b/src/Main/Base/Project/Dom/ClassBrowser/ClassBrowserTreeView.cs
@@ -183,7 +183,7 @@ public bool GoToEntity(IEntity entity)
 												int entityParamsCount = parametrizedEntityMember.Parameters != null ? parametrizedEntityMember.Parameters.Count : 0;
 												if (treeNodeParamsCount == entityParamsCount) {
 													for (int i = 0; i < entityParamsCount; i++) {
-														if (parametrizedEntityMember.Parameters[i].Type.FullName != parametrizedTreeNodeMember.Parameters[i].Type.Resolve(entityAssembly.Compilation).FullName) {
+														if (!parametrizedEntityMember.Parameters[i].Type.Equals(parametrizedTreeNodeMember.Parameters[i].Type.Resolve(entityAssembly.Compilation))) {
 															return false;
 														}
 													}
diff --git a/src/Main/Base/Project/Dom/ClassBrowser/TypeDefinitionTreeNode.cs b/src/Main/Base/Project/Dom/ClassBrowser/TypeDefinitionTreeNode.cs
@@ -17,6 +17,7 @@ public class TypeDefinitionTreeNode : ModelCollectionTreeNode
 	{
 		static readonly IComparer<SharpTreeNode> TypeMemberNodeComparer =  new TypeDefinitionMemberNodeComparer();
 		ITypeDefinitionModel definition;
+		IModelCollection<object> combinedModelChildren;
 		
 		public TypeDefinitionTreeNode(ITypeDefinitionModel definition)
 		{
@@ -27,6 +28,7 @@ public TypeDefinitionTreeNode(ITypeDefinitionModel definition)
 				UpdateBaseTypesNode();
 				UpdateDerivedTypesNode();
 			};
+			this.combinedModelChildren = definition.NestedTypes.Concat<object>(definition.Members);
 		}
 		
 		protected override object GetModel()
@@ -55,7 +57,7 @@ protected override IComparer<SharpTreeNode> NodeComparer {
 		
 		protected override IModelCollection<object> ModelChildren {
 			get {
-				return definition.NestedTypes.Concat<object>(definition.Members);
+				return combinedModelChildren;
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Dom/ClassBrowser/WorkspaceTreeNode.cs b/src/Main/Base/Project/Dom/ClassBrowser/WorkspaceTreeNode.cs
@@ -34,11 +34,14 @@ public int Compare(SharpTreeNode x, SharpTreeNode y)
 				return stringComparer.Compare(x.Text.ToString(), y.Text.ToString());
 			}
 		}
+		
+		IModelCollection<object> combinedModelChildren;
 
 		protected static readonly IComparer<SharpTreeNode> ChildNodeComparer = new WorkspaceChildComparer();
 		
 		public WorkspaceTreeNode()
 		{
+			combinedModelChildren = SD.ClassBrowser.MainAssemblyList.Assemblies.Concat(SD.ClassBrowser.UnpinnedAssemblies.Assemblies);
 			SD.ClassBrowser.CurrentWorkspace.AssemblyLists.CollectionChanged += AssemblyListsCollectionChanged;
 		}
 		
@@ -48,7 +51,7 @@ protected override object GetModel()
 		}
 		
 		protected override IModelCollection<object> ModelChildren {
-			get { return SD.ClassBrowser.MainAssemblyList.Assemblies.Concat(SD.ClassBrowser.UnpinnedAssemblies.Assemblies); }
+			get { return combinedModelChildren; }
 		}
 		
 		protected override IComparer<SharpTreeNode> NodeComparer {
diff --git a/src/Main/Base/Project/Dom/ModelCollectionChangedEvent.cs b/src/Main/Base/Project/Dom/ModelCollectionChangedEvent.cs
@@ -25,7 +25,7 @@ public class ModelCollectionChangedEvent<T>
 		
 		public void AddHandler(ModelCollectionChangedEventHandler<T> handler)
 		{
-			if (handler != null)
+			if ((handler != null) && !_handlers.Contains(handler))
 				_handlers.Add(handler);
 		}
 		
diff --git a/src/Main/Base/Project/Editor/XmlDocFormatter.cs b/src/Main/Base/Project/Editor/XmlDocFormatter.cs
@@ -16,7 +16,7 @@ public static class XmlDocFormatter
 		public static FlowDocument CreateTooltip(IType type)
 		{
 			var ambience = AmbienceService.GetCurrentAmbience();
-			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedTypeNames;
+			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedMemberNames;
 			string header;
 			if (type is ITypeDefinition)
 				header = ambience.ConvertEntity((ITypeDefinition)type);
@@ -42,7 +42,7 @@ public static FlowDocument CreateTooltip(IType type)
 		public static FlowDocument CreateTooltip(IEntity entity)
 		{
 			var ambience = AmbienceService.GetCurrentAmbience();
-			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedTypeNames;
+			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedMemberNames;
 			string header = ambience.ConvertEntity(entity);
 			var documentation = XmlDocumentationElement.Get(entity);
 			
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowActiveEvaluator.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowActiveEvaluator.cs
@@ -2,6 +2,9 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
+using System.ComponentModel.Design;
+using System.Linq;
+using System.Reflection;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -25,18 +28,14 @@ public class WindowActiveConditionEvaluator : IConditionEvaluator
 	{
 		public bool IsValid(object caller, Condition condition)
 		{
-			if (SD.Workbench == null) {
-				return false;
-			}
-			
 			string activeWindow = condition.Properties["activewindow"];
 			if (activeWindow == "*") {
 				return SD.Workbench.ActiveWorkbenchWindow != null;
 			}
 			
-			Type activeWindowType = Type.GetType(activeWindow, false);
+			Type activeWindowType = condition.AddIn.FindType(activeWindow);
 			if (activeWindowType == null) {
-				//SD.Log.WarnFormatted("WindowActiveCondition: cannot find Type {0}", activeWindow);
+				SD.Log.WarnFormatted("WindowActiveCondition: cannot find Type {0}", activeWindow);
 				return false;
 			}
 			
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs
@@ -26,15 +26,11 @@ public class WindowOpenConditionEvaluator : IConditionEvaluator
 	{
 		public bool IsValid(object caller, Condition condition)
 		{
-			if (SD.Workbench == null) {
-				return false;
-			}
-			
 			string openWindow = condition.Properties["openwindow"];
 			
-			Type openWindowType = Type.GetType(openWindow, false);
+			Type openWindowType = condition.AddIn.FindType(openWindow);
 			if (openWindowType == null) {
-				//SD.Log.WarnFormatted("WindowOpenCondition: cannot find Type {0}", openWindow);
+				SD.Log.WarnFormatted("WindowOpenCondition: cannot find Type {0}", openWindow);
 				return false;
 			}
 			
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/ComplexCondition.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/ComplexCondition.cs
@@ -42,9 +42,9 @@ public bool IsValid(object parameter)
 			return !condition.IsValid(parameter);
 		}
 		
-		public static ICondition Read(XmlReader reader)
+		public static ICondition Read(XmlReader reader, AddIn addIn)
 		{
-			return new NegatedCondition(Condition.ReadConditionList(reader, "Not")[0]);
+			return new NegatedCondition(Condition.ReadConditionList(reader, "Not", addIn)[0]);
 		}
 	}
 
@@ -94,9 +94,9 @@ public bool IsValid(object parameter)
 			return true;
 		}
 		
-		public static ICondition Read(XmlReader reader)
+		public static ICondition Read(XmlReader reader, AddIn addIn)
 		{
-			return new AndCondition(Condition.ReadConditionList(reader, "And"));
+			return new AndCondition(Condition.ReadConditionList(reader, "And", addIn));
 		}
 	}
 	
@@ -147,9 +147,9 @@ public bool IsValid(object parameter)
 			return false;
 		}
 		
-		public static ICondition Read(XmlReader reader)
+		public static ICondition Read(XmlReader reader, AddIn addIn)
 		{
-			return new OrCondition(Condition.ReadConditionList(reader, "Or"));
+			return new OrCondition(Condition.ReadConditionList(reader, "Or", addIn));
 		}
 	}
 }
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/Condition.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/Condition.cs
@@ -13,6 +13,9 @@ public class Condition : ICondition
 		string                name;
 		Properties            properties;
 		ConditionFailedAction action;
+		
+		public AddIn AddIn { get; private set; }
+		
 		/// <summary>
 		/// Returns the action which occurs, when this condition fails.
 		/// </summary>
@@ -24,6 +27,7 @@ public ConditionFailedAction Action {
 				action = value;
 			}
 		}
+		
 		public string Name {
 			get {
 				return name;
@@ -42,8 +46,9 @@ public Properties Properties {
 			}
 		}
 		
-		public Condition(string name, Properties properties)
+		public Condition(string name, Properties properties, AddIn addIn)
 		{
+			this.AddIn = addIn;
 			this.name = name;
 			this.properties = properties;
 			action = properties.Get("action", ConditionFailedAction.Exclude);
@@ -59,14 +64,14 @@ public bool IsValid(object parameter)
 			}
 		}
 		
-		public static ICondition Read(XmlReader reader)
+		public static ICondition Read(XmlReader reader, AddIn addIn)
 		{
 			Properties properties = Properties.ReadFromAttributes(reader);
 			string conditionName = properties["name"];
-			return new Condition(conditionName, properties);
+			return new Condition(conditionName, properties, addIn);
 		}
 		
-		public static ICondition ReadComplexCondition(XmlReader reader)
+		public static ICondition ReadComplexCondition(XmlReader reader, AddIn addIn)
 		{
 			Properties properties = Properties.ReadFromAttributes(reader);
 			reader.Read();
@@ -76,13 +81,13 @@ public static ICondition ReadComplexCondition(XmlReader reader)
 					case XmlNodeType.Element:
 						switch (reader.LocalName) {
 							case "And":
-								condition = AndCondition.Read(reader);
+								condition = AndCondition.Read(reader, addIn);
 								goto exit;
 							case "Or":
-								condition = OrCondition.Read(reader);
+								condition = OrCondition.Read(reader, addIn);
 								goto exit;
 							case "Not":
-								condition = NegatedCondition.Read(reader);
+								condition = NegatedCondition.Read(reader, addIn);
 								goto exit;
 							default:
 								throw new AddInLoadException("Invalid element name '" + reader.LocalName
@@ -99,7 +104,7 @@ public static ICondition ReadComplexCondition(XmlReader reader)
 			return condition;
 		}
 		
-		public static ICondition[] ReadConditionList(XmlReader reader, string endElement)
+		public static ICondition[] ReadConditionList(XmlReader reader, string endElement, AddIn addIn)
 		{
 			List<ICondition> conditions = new List<ICondition>();
 			while (reader.Read()) {
@@ -112,16 +117,16 @@ public static ICondition[] ReadConditionList(XmlReader reader, string endElement
 					case XmlNodeType.Element:
 						switch (reader.LocalName) {
 							case "And":
-								conditions.Add(AndCondition.Read(reader));
+								conditions.Add(AndCondition.Read(reader, addIn));
 								break;
 							case "Or":
-								conditions.Add(OrCondition.Read(reader));
+								conditions.Add(OrCondition.Read(reader, addIn));
 								break;
 							case "Not":
-								conditions.Add(NegatedCondition.Read(reader));
+								conditions.Add(NegatedCondition.Read(reader, addIn));
 								break;
 							case "Condition":
-								conditions.Add(Condition.Read(reader));
+								conditions.Add(Condition.Read(reader, addIn));
 								break;
 							default:
 								throw new AddInLoadException("Invalid element name '" + reader.LocalName
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ServiceDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ServiceDoozer.cs
@@ -37,6 +37,7 @@ public object BuildItem(BuildItemArgs args)
 				// Use ServiceCreatorCallback to lazily create the service
 				container.AddService(
 					interfaceType, delegate {
+						// This callback runs within the service container's lock
 						if (serviceLoading)
 							throw new InvalidOperationException("Found cyclic dependency when initializating " + className);
 						serviceLoading = true;
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/ExtensionPath.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/ExtensionPath.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs
diff --git a/src/Main/SharpDevelop/Dom/TypeDefinitionModel.cs b/src/Main/SharpDevelop/Dom/TypeDefinitionModel.cs
diff --git a/src/Main/SharpDevelop/Parser/ParserService.cs b/src/Main/SharpDevelop/Parser/ParserService.cs
diff --git a/src/Main/SharpDevelop/Parser/ParserServiceEntry.cs b/src/Main/SharpDevelop/Parser/ParserServiceEntry.cs
diff --git a/src/Main/SharpDevelop/Project/Build/BuildEngine.cs b/src/Main/SharpDevelop/Project/Build/BuildEngine.cs
diff --git a/src/Main/SharpDevelop/Project/ProjectService.cs b/src/Main/SharpDevelop/Project/ProjectService.cs
diff --git a/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs b/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ HighlightedLine DoHighlightLine(int lineNumber, IDocumentLine documentLine, Cach`
`256`	`256`	`if (parseInfo == null) {`
`257`	`257`	`if (invalidLines != null && !invalidLines.Contains(documentLine)) {`
`258`	`258`	`invalidLines.Add(documentLine);`
`259`		`- Debug.WriteLine("Semantic highlighting for line {0} - marking as invalid", lineNumber);`
	`259`	`+ //Debug.WriteLine("Semantic highlighting for line {0} - marking as invalid", lineNumber);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`if (cachedLine != null) {`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ public override void VisitObjectCreateExpression(ObjectCreateExpression objectCr`
`117`	`117`
`118`	`118`	`bool BaseTypeHasUsableParameterlessConstructor()`
`119`	`119`	`{`
	`120`	`+ if (baseType.Kind == TypeKind.Unknown)`
	`121`	`+ return true; // don't show CS1729 error message if base type is unknown`
`120`	`122`	`var memberLookup = new MemberLookup(currentType.GetDefinition(), ctx.Compilation.MainAssembly);`
`121`	`123`	`OverloadResolution or = new OverloadResolution(ctx.Compilation, new ResolveResult[0]);`
`122`	`124`	`foreach (var ctor in baseType.GetConstructors()) {`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ void WriteTypeDeclarationName(ITypeDefinition typeDef, TokenWriter writer, CShar`
`167`	`167`	`if (typeDef.DeclaringTypeDefinition != null) {`
`168`	`168`	`WriteTypeDeclarationName(typeDef.DeclaringTypeDefinition, writer, formattingPolicy);`
`169`	`169`	`writer.WriteToken(Roles.Dot, ".");`
`170`		`- } else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) == ConversionFlags.UseFullyQualifiedTypeNames) {`
	`170`	`+ } else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) == ConversionFlags.UseFullyQualifiedMemberNames) {`
`171`	`171`	`WriteQualifiedName(typeDef.Namespace, writer, formattingPolicy);`
`172`	`172`	`writer.WriteToken(Roles.Dot, ".");`
`173`	`173`	`}`
`@@ -265,13 +265,15 @@ public string ConvertType(IType type)`
`265`	`265`	`throw new ArgumentNullException("type");`
`266`	`266`
`267`	`267`	`TypeSystemAstBuilder astBuilder = CreateAstBuilder();`
	`268`	`+ astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) != ConversionFlags.UseFullyQualifiedMemberNames;`
`268`	`269`	`AstType astType = astBuilder.ConvertType(type);`
`269`	`270`	`return astType.ToString();`
`270`	`271`	`}`
`271`	`272`
`272`	`273`	`public void ConvertType(IType type, TokenWriter writer, CSharpFormattingOptions formattingPolicy)`
`273`	`274`	`{`
`274`	`275`	`TypeSystemAstBuilder astBuilder = CreateAstBuilder();`
	`276`	`+ astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) != ConversionFlags.UseFullyQualifiedMemberNames;`
`275`	`277`	`AstType astType = astBuilder.ConvertType(type);`
`276`	`278`	`astType.AcceptVisitor(new CSharpOutputVisitor(writer, formattingPolicy));`
`277`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ public AssemblyReferenceTreeNode(IAssemblyReferenceModel model)`
`19`	`19`	`if (model == null)`
`20`	`20`	`throw new ArgumentNullException("model");`
`21`	`21`	`this.model = model;`
	`22`	`+`
	`23`	`+ // To avoid the "+" sign in front of node...`
	`24`	`+ this.LazyLoading = false;`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`protected override object GetModel()`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public bool GoToEntity(IEntity entity)`
`183`	`183`	`int entityParamsCount = parametrizedEntityMember.Parameters != null ? parametrizedEntityMember.Parameters.Count : 0;`
`184`	`184`	`if (treeNodeParamsCount == entityParamsCount) {`
`185`	`185`	`for (int i = 0; i < entityParamsCount; i++) {`
`186`		`- if (parametrizedEntityMember.Parameters[i].Type.FullName != parametrizedTreeNodeMember.Parameters[i].Type.Resolve(entityAssembly.Compilation).FullName) {`
	`186`	`+ if (!parametrizedEntityMember.Parameters[i].Type.Equals(parametrizedTreeNodeMember.Parameters[i].Type.Resolve(entityAssembly.Compilation))) {`
`187`	`187`	`return false;`
`188`	`188`	`}`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public class TypeDefinitionTreeNode : ModelCollectionTreeNode`
`17`	`17`	`{`
`18`	`18`	`static readonly IComparer<SharpTreeNode> TypeMemberNodeComparer = new TypeDefinitionMemberNodeComparer();`
`19`	`19`	`ITypeDefinitionModel definition;`
	`20`	`+ IModelCollection<object> combinedModelChildren;`
`20`	`21`
`21`	`22`	`public TypeDefinitionTreeNode(ITypeDefinitionModel definition)`
`22`	`23`	`{`
`@@ -27,6 +28,7 @@ public TypeDefinitionTreeNode(ITypeDefinitionModel definition)`
`27`	`28`	`UpdateBaseTypesNode();`
`28`	`29`	`UpdateDerivedTypesNode();`
`29`	`30`	`};`
	`31`	`+ this.combinedModelChildren = definition.NestedTypes.Concat<object>(definition.Members);`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`protected override object GetModel()`
`@@ -55,7 +57,7 @@ protected override IComparer<SharpTreeNode> NodeComparer {`
`55`	`57`
`56`	`58`	`protected override IModelCollection<object> ModelChildren {`
`57`	`59`	`get {`
`58`		`- return definition.NestedTypes.Concat<object>(definition.Members);`
	`60`	`+ return combinedModelChildren;`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,14 @@ public int Compare(SharpTreeNode x, SharpTreeNode y)`
`34`	`34`	`return stringComparer.Compare(x.Text.ToString(), y.Text.ToString());`
`35`	`35`	`}`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+ IModelCollection<object> combinedModelChildren;`
`37`	`39`
`38`	`40`	`protected static readonly IComparer<SharpTreeNode> ChildNodeComparer = new WorkspaceChildComparer();`
`39`	`41`
`40`	`42`	`public WorkspaceTreeNode()`
`41`	`43`	`{`
	`44`	`+ combinedModelChildren = SD.ClassBrowser.MainAssemblyList.Assemblies.Concat(SD.ClassBrowser.UnpinnedAssemblies.Assemblies);`
`42`	`45`	`SD.ClassBrowser.CurrentWorkspace.AssemblyLists.CollectionChanged += AssemblyListsCollectionChanged;`
`43`	`46`	`}`
`44`	`47`
`@@ -48,7 +51,7 @@ protected override object GetModel()`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`protected override IModelCollection<object> ModelChildren {`
`51`		`- get { return SD.ClassBrowser.MainAssemblyList.Assemblies.Concat(SD.ClassBrowser.UnpinnedAssemblies.Assemblies); }`
	`54`	`+ get { return combinedModelChildren; }`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`protected override IComparer<SharpTreeNode> NodeComparer {`