Fixed SD2-551: Project view not always synchronising the current document

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@770 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/ConvertVisitor.cs

@@ -254,7 +254,6 @@ namespace Grunwald.BooBinding.CodeCompletion
 				return CreateReturnType(field.Type);
 			}
 		}
-		// TODO: Type inference
 		IReturnType CreateReturnType(AST.Method node, IMethod method)
 		{
 			if (node.ReturnType == null)

src/Libraries/ICSharpCode.TextEditor/Project/Src/Document/HighlightingStrategy/TextWord.cs

@@ -37,10 +37,10 @@ namespace ICSharpCode.TextEditor.Document
 				length = 1;
 			}
 			
-			public SpaceTextWord(HighlightColor  color)
+			public SpaceTextWord(HighlightColor color)
 			{
 				length = 1;
-				base.color  = color;
+				base.SyntaxColor = color;
 			}
 			
 			public override Font Font {
@@ -67,10 +67,10 @@ namespace ICSharpCode.TextEditor.Document
 			{
 				length = 1;
 			}
-			public TabTextWord(HighlightColor  color)
+			public TabTextWord(HighlightColor color)
 			{
 				length = 1;
-				base.color  = color;
+				base.SyntaxColor = color;
 			}
 			
 			public override Font Font {
@@ -158,6 +158,7 @@ namespace ICSharpCode.TextEditor.Document
 				return color;
 			}
 			set {
+				Debug.Assert(color != null);
 				color = value;
 			}
 		}

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs

@@ -141,11 +141,25 @@ namespace ICSharpCode.SharpDevelop.Project
 			return FindFileNode(treeView.Nodes, fileName);
 		}
 		
+		/// <summary>
+		/// Selects the node of a file if it is visible
+		/// </summary>
 		public void SelectFile(string fileName)
 		{
 			FileNode node = FindFileNode(fileName);
-			if (node != null)
-				treeView.SelectedNode = node;
+			if (node != null) {
+				// select first parent that is not collapsed
+				TreeNode nodeToSelect = node;
+				TreeNode p = node.Parent;
+				while (p != null) {
+					if (!p.IsExpanded)
+						nodeToSelect = p;
+					p = p.Parent;
+				}
+				if (nodeToSelect != null) {
+					treeView.SelectedNode = nodeToSelect;
+				}
+			}
 		}
 		
 		public void ViewSolution(Solution solution)

src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs

@@ -514,15 +514,17 @@ namespace ICSharpCode.Core
 		
 		protected IClass GetClassInternal(string typeName, int typeParameterCount, LanguageProperties language)
 		{
-			IClass c;
-			if (GetClasses(language).TryGetValue(typeName, out c)) {
-				GenericClassContainer gcc = c as GenericClassContainer;
-				if (gcc != null) {
-					return gcc.GetBest(typeParameterCount);
+			lock (namespaces) {
+				IClass c;
+				if (GetClasses(language).TryGetValue(typeName, out c)) {
+					GenericClassContainer gcc = c as GenericClassContainer;
+					if (gcc != null) {
+						return gcc.GetBest(typeParameterCount);
+					}
+					return c;
 				}
-				return c;
+				return null;
 			}
-			return null;
 		}
 		
 		public IClass GetClass(string typeName, int typeParameterCount, LanguageProperties language, bool lookInReferences)