Fixed SD2-1228: Find references dialog title includes ampersand character

Fixed loading assemblies for code-completion that have multiple modules stored in multiple files (e.g. System.EnterpriseServices)

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

src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs

@@ -129,7 +129,7 @@ namespace Hornung.ResourceToolkit.Commands
 			
 			// Allow the menu to close
 			Application.DoEvents();
-			using(AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog(ResourceService.GetString("SharpDevelop.Refactoring.FindReferencesCommand").Replace("&", null))) {
+			using(AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog(ResourceService.GetString("SharpDevelop.Refactoring.FindReferences"))) {
 				FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:Hornung.ResourceToolkit.ReferencesToResource}", new string[,] { {"ResourceFileName", System.IO.Path.GetFileName(result.FileName)}, {"ResourceKey", result.Key} }),
 				                                                  ResourceRefactoringService.FindReferences(result.FileName, result.Key, monitor));
 			}

src/Main/Base/Project/Src/Services/RefactoringService/LocalVariableRefactoring.cs

@@ -17,8 +17,11 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		public override void Run()
 		{
 			LocalResolveResult local = (LocalResolveResult)Owner;
-			List<Reference> list = RefactoringService.FindReferences(local, null);
-			FindReferencesAndRenameHelper.ShowAsSearchResults("References to " + local.Field.Name, list);
+			FindReferencesAndRenameHelper.ShowAsSearchResults(
+				StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}",
+				                   new string[,] {{ "Name", local.Field.Name }}),
+				RefactoringService.FindReferences(local, null)
+			);
 		}
 	}
 	

src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs

@@ -269,7 +269,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 		{
 			MenuCommand item = (MenuCommand)sender;
 			IClass c = (IClass)item.Tag;
-			using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferencesCommand}"))
+			using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}"))
 			{
 				FindReferencesAndRenameHelper.ShowAsSearchResults(
 					StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}",

src/Main/Base/Project/Src/TextEditor/Commands/ClassMemberMenuBuilder.cs

@@ -187,7 +187,9 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 					results.Add(res);
 				}
 			}
-			SearchInFilesManager.ShowSearchResults("Overrides of " + member.Name, results);
+			SearchInFilesManager.ShowSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.OverridesOf}",
+			                                                          new string[,] {{ "Name", member.Name }}),
+			                                       results);
 		}
 		
 		void FindReferences(object sender, EventArgs e)
@@ -202,9 +204,10 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 			} else {
 				memberName = member.Name;
 			}
-			using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferencesCommand}"))
+			using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}"))
 			{
-				FindReferencesAndRenameHelper.ShowAsSearchResults("References to " + memberName, 
+				FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}",
+				                                                                     new string[,] {{ "Name", memberName }}),
 				                                                  RefactoringService.FindReferences(member, monitor));
 			}
 		}

src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/CecilReader.cs

@@ -23,14 +23,12 @@ namespace ICSharpCode.SharpDevelop.Dom
 			if (registry == null)
 				throw new ArgumentNullException("registry");
 			LoggingService.Info("Cecil: Load from " + fileName);
-			using (FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read)) {
-				AssemblyDefinition asm = AssemblyFactory.GetAssembly(fs);
-				List<AssemblyName> referencedAssemblies = new List<AssemblyName>();
-				foreach (AssemblyNameReference anr in asm.MainModule.AssemblyReferences) {
-					referencedAssemblies.Add(new AssemblyName(anr.FullName));
-				}
-				return new CecilProjectContent(asm.Name.FullName, fileName, referencedAssemblies.ToArray(), asm.MainModule.Types, registry);
+			AssemblyDefinition asm = AssemblyFactory.GetAssembly(fileName);
+			List<AssemblyName> referencedAssemblies = new List<AssemblyName>();
+			foreach (AssemblyNameReference anr in asm.MainModule.AssemblyReferences) {
+				referencedAssemblies.Add(new AssemblyName(anr.FullName));
 			}
+			return new CecilProjectContent(asm.Name.FullName, fileName, referencedAssemblies.ToArray(), asm.MainModule.Types, registry);
 		}
 		
 		static void AddAttributes(IProjectContent pc, IList<IAttribute> list, CustomAttributeCollection attributes)