Merge branch 'master' of github.com:icsharpcode/SharpDevelop

Author: PeterForstmeier

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/CSharpSymbolSearch.cs

@@ -24,6 +24,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using ICSharpCode.NRefactory.Analysis;
 using CSharpBinding.Parser;
 using ICSharpCode.AvalonEdit.Document;
 using ICSharpCode.AvalonEdit.Highlighting;
@@ -56,22 +57,44 @@ public class CSharpSymbolSearch : ISymbolSearch
 		FindReferences fr = new FindReferences();
 		IList<IFindReferenceSearchScope> searchScopes;
 		IList<string>[] interestingFileNames;
+		Dictionary<string, IList<IFindReferenceSearchScope>> searchScopesPerFile;
 		int workAmount;
 		double workAmountInverse;
 
 		public CSharpSymbolSearch(IProject project, ISymbol entity)
 		{
 			this.project = project;
-			searchScopes = fr.GetSearchScopes(entity);
 			compilation = SD.ParserService.GetCompilation(project);
+			var relatedSymbols = GetRelatedSymbols(entity);
+			if ((relatedSymbols != null) && relatedSymbols.Any()) {
+				searchScopes = relatedSymbols.SelectMany(e => fr.GetSearchScopes(e)).ToList();
+			} else {
+				searchScopes = fr.GetSearchScopes(entity);
+			}
+			
+			searchScopesPerFile = new Dictionary<string, IList<IFindReferenceSearchScope>>();
 			interestingFileNames = new IList<string>[searchScopes.Count];
 			for (int i = 0; i < searchScopes.Count; i++) {
-				interestingFileNames[i] = fr.GetInterestingFiles(searchScopes[i], compilation).Select(f => f.FileName).ToList();
-				workAmount += interestingFileNames[i].Count;
+				var thisSearchScope = searchScopes[i];
+				var interestingFiles = fr.GetInterestingFiles(thisSearchScope, compilation).Select(f => f.FileName).ToList();
+				foreach (var file in interestingFiles) {
+					if (!searchScopesPerFile.ContainsKey(file))
+						searchScopesPerFile[file] = new List<IFindReferenceSearchScope>();
+					searchScopesPerFile[file].Add(thisSearchScope);
+				}
+				interestingFileNames[i] = interestingFiles.ToList();
+				workAmount += interestingFiles.Count;
 			}
 			workAmountInverse = 1.0 / workAmount;
 		}
 
+		IEnumerable<ISymbol> GetRelatedSymbols(ISymbol entity)
+		{
+			TypeGraph typeGraph = new TypeGraph(new [] { compilation.MainAssembly });
+			var symbolCollector = new SymbolCollector();
+			return symbolCollector.GetRelatedSymbols(typeGraph, entity);
+		}
+		
 		public double WorkAmount {
 			get { return workAmount; }
 		}
@@ -83,38 +106,36 @@ public Task FindReferencesAsync(SymbolSearchArgs args, Action<SearchedFile> call
 			var cancellationToken = args.ProgressMonitor.CancellationToken;
 			return Task.Run(
 				() => {
-					for (int i = 0; i < searchScopes.Count; i++) {
-						IFindReferenceSearchScope searchScope = searchScopes[i];
-						object progressLock = new object();
-						Parallel.ForEach(
-							interestingFileNames[i],
-							new ParallelOptions {
-								MaxDegreeOfParallelism = Environment.ProcessorCount,
-								CancellationToken = cancellationToken
-							},
-							delegate (string fileName) {
-								try {
-									FindReferencesInFile(args, searchScope, FileName.Create(fileName), callback, cancellationToken);
-								} catch (OperationCanceledException) {
-									throw;
-								} catch (Exception ex) {
-									throw new ApplicationException("Error searching in file '" + fileName + "'", ex);
-								}
-								lock (progressLock)
-									args.ProgressMonitor.Progress += workAmountInverse;
-							});
-					}
+					object progressLock = new object();
+					Parallel.ForEach(
+						searchScopesPerFile.Keys,
+						new ParallelOptions {
+							MaxDegreeOfParallelism = Environment.ProcessorCount,
+							CancellationToken = cancellationToken
+						},
+						delegate (string fileName) {
+							try {
+								FindReferencesInFile(args, searchScopesPerFile[fileName], FileName.Create(fileName), callback, cancellationToken);
+							} catch (OperationCanceledException) {
+								throw;
+							} catch (Exception ex) {
+								throw new ApplicationException("Error searching in file '" + fileName + "'", ex);
+							}
+							lock (progressLock)
+								args.ProgressMonitor.Progress += workAmountInverse;
+						});
 				}, cancellationToken
 			);
 		}
 
-		void FindReferencesInFile(SymbolSearchArgs args, IFindReferenceSearchScope searchScope, FileName fileName, Action<SearchedFile> callback, CancellationToken cancellationToken)
+		void FindReferencesInFile(SymbolSearchArgs args, IList<IFindReferenceSearchScope> searchScopeList, FileName fileName, Action<SearchedFile> callback, CancellationToken cancellationToken)
 		{
 			ITextSource textSource = args.ParseableFileContentFinder.Create(fileName);
 			if (textSource == null)
 				return;
-			if (searchScope.SearchTerm != null) {
-				if (textSource.IndexOf(searchScope.SearchTerm, 0, textSource.TextLength, StringComparison.Ordinal) < 0)
+			if (searchScopeList != null) {
+				if (!searchScopeList.Any(
+					scope => (scope.SearchTerm == null) || (textSource.IndexOf(scope.SearchTerm, 0, textSource.TextLength, StringComparison.Ordinal) >= 0)))
 					return;
 			}
 
@@ -134,7 +155,7 @@ void FindReferencesInFile(SymbolSearchArgs args, IFindReferenceSearchScope searc
 			}
 
 			fr.FindReferencesInFile(
-				searchScope, unresolvedFile, parseInfo.SyntaxTree, compilation,
+				searchScopeList, unresolvedFile, parseInfo.SyntaxTree, compilation,
 				delegate (AstNode node, ResolveResult result) {
 					if (document == null) {
 						document = new ReadOnlyDocument(textSource, fileName);
@@ -154,8 +175,18 @@ void FindReferencesInFile(SymbolSearchArgs args, IFindReferenceSearchScope searc
 			if (highlighter != null) {
 				highlighter.Dispose();
 			}
-			if (results.Count > 0)
-				callback(new SearchedFile(fileName, results));
+			if (results.Count > 0) {
+				// Remove overlapping results
+				List<SearchResultMatch> fixedResults = new List<SearchResultMatch>();
+				int lastEndOffset = 0;
+				foreach (var result in results.OrderBy(m => m.StartOffset)) {
+					if (result.StartOffset >= lastEndOffset) {
+						fixedResults.Add(result);
+						lastEndOffset = result.EndOffset;
+					}
+				}
+				callback(new SearchedFile(fileName, fixedResults));
+			}
 		}
 
 		public Task RenameAsync(SymbolRenameArgs args, Action<PatchedFile> callback, Action<Error> errorCallback)
@@ -166,32 +197,30 @@ public Task RenameAsync(SymbolRenameArgs args, Action<PatchedFile> callback, Act
 			return Task.Run(
 				() => {
 					bool isNameValid = Mono.CSharp.Tokenizer.IsValidIdentifier(args.NewName);
-					for (int i = 0; i < searchScopes.Count; i++) {
-						IFindReferenceSearchScope searchScope = searchScopes[i];
-						object progressLock = new object();
-						Parallel.ForEach(
-							interestingFileNames[i],
-							new ParallelOptions {
-								MaxDegreeOfParallelism = Environment.ProcessorCount,
-								CancellationToken = cancellationToken
-							},
-							delegate (string fileName) {
-								RenameReferencesInFile(args, searchScope, FileName.Create(fileName), callback, errorCallback, isNameValid, cancellationToken);
-								lock (progressLock)
-									args.ProgressMonitor.Progress += workAmountInverse;
-							});
-					}
+					object progressLock = new object();
+					Parallel.ForEach(
+						searchScopesPerFile.Keys,
+						new ParallelOptions {
+							MaxDegreeOfParallelism = Environment.ProcessorCount,
+							CancellationToken = cancellationToken
+						},
+						delegate (string fileName) {
+							RenameReferencesInFile(args, searchScopesPerFile[fileName], FileName.Create(fileName), callback, errorCallback, isNameValid, cancellationToken);
+							lock (progressLock)
+								args.ProgressMonitor.Progress += workAmountInverse;
+						});
 				}, cancellationToken
 			);
 		}
 
-		void RenameReferencesInFile(SymbolRenameArgs args, IFindReferenceSearchScope searchScope, FileName fileName, Action<PatchedFile> callback, Action<Error> errorCallback, bool isNameValid, CancellationToken cancellationToken)
+		void RenameReferencesInFile(SymbolRenameArgs args, IList<IFindReferenceSearchScope> searchScopeList, FileName fileName, Action<PatchedFile> callback, Action<Error> errorCallback, bool isNameValid, CancellationToken cancellationToken)
 		{
 			ITextSource textSource = args.ParseableFileContentFinder.Create(fileName);
 			if (textSource == null)
 				return;
-			if (searchScope.SearchTerm != null) {
-				if (textSource.IndexOf(searchScope.SearchTerm, 0, textSource.TextLength, StringComparison.Ordinal) < 0)
+			if (searchScopeList != null) {
+				if (!searchScopeList.Any(
+					scope => (scope.SearchTerm == null) || (textSource.IndexOf(scope.SearchTerm, 0, textSource.TextLength, StringComparison.Ordinal) >= 0)))
 					return;
 			}
 
@@ -213,7 +242,7 @@ void RenameReferencesInFile(SymbolRenameArgs args, IFindReferenceSearchScope sea
 			CSharpAstResolver resolver = new CSharpAstResolver(compilation, parseInfo.SyntaxTree, unresolvedFile);
 
 			fr.RenameReferencesInFile(
-				new[] { searchScope }, args.NewName, resolver,
+				searchScopeList, args.NewName, resolver,
 				delegate (RenameCallbackArguments callbackArgs) {
 					var node = callbackArgs.NodeToReplace;
 					string newCode = callbackArgs.NewNode.ToString();
@@ -249,10 +278,16 @@ void RenameReferencesInFile(SymbolRenameArgs args, IFindReferenceSearchScope sea
 				}
 				IDocument changedDocument = new TextDocument(document);
 				var oldVersion = changedDocument.Version;
+				List<SearchResultMatch> fixedResults = new List<SearchResultMatch>();
+				int lastStartOffset = changedDocument.TextLength + 1;
 				foreach (var result in results.OrderByDescending(m => m.StartOffset)) {
-					changedDocument.Replace(result.StartOffset, result.Length, result.NewCode);
+					if (result.EndOffset <= lastStartOffset) {
+						changedDocument.Replace(result.StartOffset, result.Length, result.NewCode);
+						fixedResults.Add(result);
+						lastStartOffset = result.StartOffset;
+					}
 				}
-				callback(new PatchedFile(fileName, results, oldVersion, changedDocument.Version));
+				callback(new PatchedFile(fileName, fixedResults, oldVersion, changedDocument.Version));
 			}
 		}
 	}

src/AddIns/Debugger/Debugger.Core/Process.cs

@@ -527,8 +527,16 @@ public void AsyncTerminate()
 			System.Threading.Thread.Sleep(0);
 
 			// Stop&terminate - both must be called
-			corProcess.Stop(uint.MaxValue);
-			corProcess.Terminate(0);
+			try {
+				corProcess.Stop(uint.MaxValue);
+				corProcess.Terminate(0);
+			} catch (COMException ex) {
+				if (ex.ErrorCode == unchecked((int)0x80131301)) {
+					// COMException (0x80131301): Process was terminated.
+				} else {
+					throw;
+				}
+			}
 			this.TerminateCommandIssued = true;
 
 			// Do not mark the process as exited

src/AddIns/DisplayBindings/IconEditor/PickFormatDialog.Designer.cs

@@ -80,5 +80,12 @@ public override bool StorePanelContents()
 			}
 			return true;
 		}
+		
+		void fileTypesListBox_MouseClick(object sender, System.Windows.Forms.MouseEventArgs e)
+		{
+			if (fileTypesListBox.IndexFromPoint(e.X, e.Y) == ListBox.NoMatches) {
+				fileTypesListBox.SelectedIndex = -1;
+			}
+		}
 	}
 }

src/AddIns/Misc/FiletypeRegisterer/Project/Src/RegisterFiletypesPanel.Designer.cs

@@ -53,6 +53,10 @@ public class RenameSymbolCommand : ResolveResultMenuCommand
 		public override void Run(ResolveResult symbol)
 		{
 			var entity = GetSymbol(symbol);
+			if ((entity is IMember) && ((entity.SymbolKind == SymbolKind.Constructor) || (entity.SymbolKind == SymbolKind.Destructor))) {
+				// Don't rename constructors/destructors, rename their declaring type instead
+				entity = ((IMember) entity).DeclaringType.GetDefinition();
+			}
 			if (entity != null) {
 				var project = GetProjectFromSymbol(entity);
 				if (project != null) {