first implementation of rename without proper UI

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

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
+using ICSharpCode.AvalonEdit.Document;
 using CSharpBinding.Parser;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.Core;
@@ -99,7 +100,7 @@ namespace CSharpBinding
 				return;
 			ReadOnlyDocument document = null;
 			IHighlighter highlighter = null;
-			List<Reference> results = new List<Reference>();
+			List<SearchResultMatch> results = new List<SearchResultMatch>();
 			
 			// Grab the unresolved file matching the compilation version
 			// (this may differ from the version created by re-parsing the project)
@@ -125,7 +126,7 @@ namespace CSharpBinding
 					int length = document.GetOffset(node.EndLocation) - offset;
 					var builder = SearchResultsPad.CreateInlineBuilder(node.StartLocation, node.EndLocation, document, highlighter);
 					var defaultTextColor = highlighter != null ? highlighter.DefaultTextColor : null;
-					results.Add(new Reference(region, result, offset, length, builder, defaultTextColor));
+					results.Add(new SearchResultMatch(fileName, node.StartLocation, node.EndLocation, offset, length, builder, defaultTextColor));
 				}, cancellationToken);
 			if (highlighter != null) {
 				highlighter.Dispose();
@@ -136,7 +137,93 @@ namespace CSharpBinding
 		
 		public Task RenameAsync(SymbolRenameArgs args, Action<PatchedFile> callback, Action<Error> errorCallback)
 		{
-			throw new NotImplementedException();
+			if (callback == null)
+				throw new ArgumentNullException("callback");
+			var cancellationToken = args.ProgressMonitor.CancellationToken;
+			return Task.Run(
+				() => {
+					bool isNameValid = true; // TODO : check name!
+					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;
+							});
+					}
+				}, cancellationToken
+			);
+		}
+		
+		void RenameReferencesInFile(SymbolRenameArgs args, IFindReferenceSearchScope searchScope, 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)
+					return;
+			}
+			
+			var parseInfo = SD.ParserService.Parse(fileName, textSource) as CSharpFullParseInformation;
+			if (parseInfo == null)
+				return;
+			ReadOnlyDocument document = null;
+			IHighlighter highlighter = null;
+			List<SearchResultMatch> results = new List<SearchResultMatch>();
+			
+			// Grab the unresolved file matching the compilation version
+			// (this may differ from the version created by re-parsing the project)
+			CSharpUnresolvedFile unresolvedFile = null;
+			IProjectContent pc = compilation.MainAssembly.UnresolvedAssembly as IProjectContent;
+			if (pc != null) {
+				unresolvedFile = pc.GetFile(fileName) as CSharpUnresolvedFile;
+			}
+			
+			CSharpAstResolver resolver = new CSharpAstResolver(compilation, parseInfo.SyntaxTree, unresolvedFile);
+			
+			fr.RenameReferencesInFile(
+				new[] { searchScope }, args.NewName, resolver,
+				delegate (RenameCallbackArguments callbackArgs) {
+					var node = callbackArgs.NodeToReplace;
+					if (document == null) {
+						document = new ReadOnlyDocument(textSource, fileName);
+						highlighter = SD.EditorControlService.CreateHighlighter(document);
+						highlighter.BeginHighlighting();
+					}
+					Identifier identifier = node.GetChildByRole(Roles.Identifier);
+					if (!identifier.IsNull)
+						node = identifier;
+					var region = new DomRegion(fileName, node.StartLocation, node.EndLocation);
+					int offset = document.GetOffset(node.StartLocation);
+					int length = document.GetOffset(node.EndLocation) - offset;
+					var builder = SearchResultsPad.CreateInlineBuilder(node.StartLocation, node.EndLocation, document, highlighter);
+					var defaultTextColor = highlighter != null ? highlighter.DefaultTextColor : null;
+					results.Add(new SearchResultMatch(fileName, node.StartLocation, node.EndLocation, offset, length, builder, defaultTextColor));
+				},
+				errorCallback, cancellationToken);
+			if (highlighter != null) {
+				highlighter.Dispose();
+			}
+			if (results.Count > 0) {
+				if (!isNameValid) {
+					errorCallback(new Error(ErrorType.Error, string.Format("The name '{0}' is not valid in the current context!", args.NewName), 0, 0));
+					return;
+				}
+				IDocument changedDocument = new TextDocument(document);
+				var oldVersion = changedDocument.Version;
+				foreach (var result in results.OrderByDescending(m => m.StartOffset)) {
+					changedDocument.Replace(result.StartOffset, result.Length, args.NewName);
+				}
+				callback(new PatchedFile(fileName, results, oldVersion, changedDocument.Version));
+			}
 		}
 	}
 }

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

@@ -149,7 +149,7 @@ namespace CSharpBinding.Parser
 			return ResolveAtLocation.Resolve(compilation, csParseInfo.UnresolvedFile, csParseInfo.SyntaxTree, location, cancellationToken);
 		}
 		
-		public void FindLocalReferences(ParseInformation parseInfo, ITextSource fileContent, IVariable variable, ICompilation compilation, Action<Reference> callback, CancellationToken cancellationToken)
+		public void FindLocalReferences(ParseInformation parseInfo, ITextSource fileContent, IVariable variable, ICompilation compilation, Action<SearchResultMatch> callback, CancellationToken cancellationToken)
 		{
 			var csParseInfo = parseInfo as CSharpFullParseInformation;
 			if (csParseInfo == null)
@@ -171,7 +171,7 @@ namespace CSharpBinding.Parser
 					int length = document.GetOffset(node.EndLocation) - offset;
 					var builder = SearchResultsPad.CreateInlineBuilder(node.StartLocation, node.EndLocation, document, highlighter);
 					var defaultTextColor = highlighter != null ? highlighter.DefaultTextColor : null;
-					callback(new Reference(region, result, offset, length, builder, defaultTextColor));
+					callback(new SearchResultMatch(parseInfo.FileName, node.StartLocation, node.EndLocation, offset, length, builder, defaultTextColor));
 				}, cancellationToken);
 			
 			if (highlighter != null) {

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs

@@ -18,6 +18,7 @@ using ICSharpCode.NRefactory.Utils;
 using ICSharpCode.NRefactory.Xml;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Editor.Search;
 using ICSharpCode.SharpDevelop.Parser;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Refactoring;
@@ -104,7 +105,7 @@ namespace ICSharpCode.XamlBinding
 				.ResolveAtLocation(location, cancellationToken);
 		}
 		
-		public void FindLocalReferences(ParseInformation parseInfo, ITextSource fileContent, IVariable variable, ICompilation compilation, Action<Reference> callback, CancellationToken cancellationToken)
+		public void FindLocalReferences(ParseInformation parseInfo, ITextSource fileContent, IVariable variable, ICompilation compilation, Action<SearchResultMatch> callback, CancellationToken cancellationToken)
 		{
 			throw new NotImplementedException();
 		}

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlSymbolSearch.cs

@@ -87,7 +87,7 @@ namespace ICSharpCode.XamlBinding
 				return;
 			ReadOnlyDocument document = null;
 			IHighlighter highlighter = null;
-			List<Reference> results = new List<Reference>();
+			List<SearchResultMatch> results = new List<SearchResultMatch>();
 			XamlAstResolver resolver = new XamlAstResolver(compilation, parseInfo);
 			do {
 				if (document == null) {
@@ -100,7 +100,7 @@ namespace ICSharpCode.XamlBinding
 				if ((result is TypeResolveResult && ((TypeResolveResult)result).Type.Equals(entity)) || (result is MemberResolveResult && ((MemberResolveResult)result).Member.Equals(entity))) {
 					var region = new DomRegion(fileName, document.GetLocation(offset), document.GetLocation(offset + length));
 					var builder = SearchResultsPad.CreateInlineBuilder(region.Begin, region.End, document, highlighter);
-					results.Add(new Reference(region, result, offset, length, builder, highlighter.DefaultTextColor));
+					results.Add(new SearchResultMatch(fileName, document.GetLocation(offset), document.GetLocation(offset + length), offset, length, builder, highlighter.DefaultTextColor));
 				}
 				offset = textSource.IndexOf(entity.Name, offset + length, textSource.TextLength - offset - length, StringComparison.OrdinalIgnoreCase);
 			} while (offset > 0);
@@ -113,7 +113,8 @@ namespace ICSharpCode.XamlBinding
 		
 		public Task RenameAsync(SymbolRenameArgs args, Action<PatchedFile> callback, Action<Error> errorCallback)
 		{
-			throw new NotImplementedException();
+			// TODO implement Rename for XAML
+			return Task.Run(() => {});
 		}
 	}
 }

src/Main/Base/Project/Editor/Search/SearchResultMatch.cs

@@ -156,26 +156,24 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 	
 	public class PatchedFile : SearchedFile
 	{
-		ITextSourceVersion result;
+		ITextSourceVersion oldVersion;
+		ITextSourceVersion newVersion;
 		
-		public PatchedFile(FileName fileName, IReadOnlyList<SearchResultMatch> matches, ITextSourceVersion result)
+		public PatchedFile(FileName fileName, IReadOnlyList<SearchResultMatch> matches, ITextSourceVersion oldVersion, ITextSourceVersion newVersion)
 			: base(fileName, matches)
 		{
-			if (result == null)
-				throw new ArgumentNullException("result");
-			this.result = result;
+			if (oldVersion == null)
+				throw new ArgumentNullException("oldVersion");
+			if (newVersion == null)
+				throw new ArgumentNullException("newVersion");
+			this.oldVersion = oldVersion;
+			this.newVersion = newVersion;
 		}
 		
 		public void Apply(IDocument document)
 		{
-			ITextSourceVersion oldVersion = document.Version;
-			if (oldVersion == null)
-				throw new InvalidOperationException("Document is unversioned, cannot apply changes!");
-			if (!result.BelongsToSameDocumentAs(oldVersion))
-				throw new InvalidOperationException("Patch does not belong to this document!");
-				
 			using (document.OpenUndoGroup()) {
-				var changes = oldVersion.GetChangesTo(result);
+				var changes = oldVersion.GetChangesTo(newVersion);
 				foreach (var change in changes)
 					document.Replace(change.Offset, change.RemovalLength, change.InsertedText);
 			}

src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@@ -1262,7 +1262,7 @@
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectCulturePanel"/>
 			<OptionPanel id    = "SelectStyle"
 			             label = "${res:Dialog.Options.IDEOptions.SelectVisualStyle.PanelName}"
-			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanel"/>		
+			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanel"/>
 			<OptionPanel id    = "LoadSave"
 			             label = "${res:Dialog.Options.IDEOptions.LoadSaveOptions.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.OptionPanels.LoadSaveOptions"/>
@@ -1296,7 +1296,7 @@
 		
 		<OptionPanel id    = "ToolsOptions"
 		             label = "${res:Dialog.Options.IDEOptions.ToolsOptionsText}">
-		
+			
 			<OptionPanel id    = "ExternalTools"
 			             label = "${res:Dialog.Options.ExternalToolsText}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ExternalToolPanel"/>
@@ -1841,6 +1841,11 @@
 			          icon="Icons.16x16.SelectionArrow"
 			          class = "ICSharpCode.SharpDevelop.Editor.Commands.FindReferencesCommand"/>
 			
+			<MenuItem id = "Rename"
+			          label = "${res:SharpDevelop.Refactoring.RenameCommand}"
+			          shortcut="Ctrl+R"
+			          class = "ICSharpCode.SharpDevelop.Editor.Commands.RenameSymbolCommand"/>
+			
 			<MenuItem id = "GotoBrace"
 			          label = "${res:XML.MainMenu.SearchMenu.GotoBrace}"
 			          shortcut = "Control|B"

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -735,7 +735,6 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Src\Services\RefactoringService\RefactoringService.cs" />
-    <Compile Include="Src\Services\RefactoringService\Reference.cs" />
     <Compile Include="Src\Services\ProjectService\ParseableFileContentFinder.cs" />
     <Compile Include="Src\Project\Items\ImportProjectItem.cs" />
     <Compile Include="Src\Services\Debugger\CurrentLineBookmark.cs" />

src/Main/Base/Project/Parser/IParser.cs

@@ -10,6 +10,7 @@ using ICSharpCode.NRefactory;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.SharpDevelop.Editor.Search;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Refactoring;
 
@@ -62,7 +63,7 @@ namespace ICSharpCode.SharpDevelop.Parser
 		
 		ResolveResult ResolveSnippet(ParseInformation parseInfo, TextLocation location, string codeSnippet, ICompilation compilation, CancellationToken cancellationToken);
 		
-		void FindLocalReferences(ParseInformation parseInfo, ITextSource fileContent, IVariable variable, ICompilation compilation, Action<Reference> callback, CancellationToken cancellationToken);
+		void FindLocalReferences(ParseInformation parseInfo, ITextSource fileContent, IVariable variable, ICompilation compilation, Action<SearchResultMatch> callback, CancellationToken cancellationToken);
 		
 		/// <summary>
 		/// Creates a compilation for a single file that does not belong to any project.

src/Main/Base/Project/Parser/IParserService.cs

@@ -12,6 +12,7 @@ using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Editor.Search;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Refactoring;
@@ -230,7 +231,7 @@ namespace ICSharpCode.SharpDevelop.Parser
 		                                 ITextSource fileContent = null, ICompilation compilation = null,
 		                                 CancellationToken cancellationToken = default(CancellationToken));
 		
-		Task FindLocalReferencesAsync(FileName fileName, IVariable variable, Action<Reference> callback,
+		Task FindLocalReferencesAsync(FileName fileName, IVariable variable, Action<SearchResultMatch> callback,
 		                              ITextSource fileContent = null, ICompilation compilation = null,
 		                              CancellationToken cancellationToken = default(CancellationToken));
 		#endregion

src/Main/Base/Project/Src/Editor/Commands/FindReferencesCommand.cs

@@ -4,6 +4,7 @@
 using System;
 using ICSharpCode.Core;
 using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Refactoring;
 
 namespace ICSharpCode.SharpDevelop.Editor.Commands
@@ -34,10 +35,38 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands
 		public override void Run(ResolveResult symbol)
 		{
 			var entity = GetEntity(symbol);
+			
+			string title = "${res:SharpDevelop.Refactoring.Rename}";
+			string text = title; // TODO add proper text
 			if (entity != null) {
-				//FindReferenceService.RenameSymbol(entity, 
+				switch (entity.SymbolKind) {
+					case ICSharpCode.NRefactory.TypeSystem.SymbolKind.TypeDefinition:
+						text = "${res:SharpDevelop.Refactoring.RenameClassText}";
+						break;
+					default:
+						text = "${res:SharpDevelop.Refactoring.RenameMemberText}";
+						break;
+				}
+				
+				string newName = SD.MessageService.ShowInputBox(title, text, entity.Name);
+				if (newName != entity.Name) {
+					if (!CheckName(newName)) {
+						SD.MessageService.ShowError("The symbol cannot be renamed because its new name is invalid!");
+						return;
+					}
+					using (IProgressMonitor progressMonitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.Rename}"))
+						FindReferenceService.RenameSymbol(entity, newName, progressMonitor)
+							.ObserveOnUIThread()
+							.Subscribe(error => SD.MessageService.ShowError(error.Message), ex => SD.MessageService.ShowException(ex), () => {});
+				}
 			}
 			
 		}
+		
+		bool CheckName(string name)
+		{
+			// TODO implement for current language!
+			return !string.IsNullOrWhiteSpace(name);
+		}
 	}
 }

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

@@ -12,6 +12,7 @@ using ICSharpCode.NRefactory.Analysis;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Editor.Search;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Parser;
@@ -109,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			if (progressMonitor == null)
 				throw new ArgumentNullException("progressMonitor");
 			var fileName = FileName.Create(variable.Region.FileName);
-			List<Reference> references = new List<Reference>();
+			List<SearchResultMatch> references = new List<SearchResultMatch>();
 			await SD.ParserService.FindLocalReferencesAsync(
 				fileName, variable,
 				r => { lock (references) references.Add(r); },
@@ -186,7 +187,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		}
 		#endregion
 		
-		public static IReadOnlyList<Error> RenameSymbol(ISymbol symbol, IProgressMonitor progressMonitor)
+		public static async Task RenameSymbolAsync(ISymbol symbol, string newName, IProgressMonitor progressMonitor, Action<Error> errorCallback)
 		{
 			if (symbol == null)
 				throw new ArgumentNullException("symbol");
@@ -197,33 +198,49 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 				progressMonitor.ShowingDialog = true;
 				MessageService.ShowMessage("${res:SharpDevelop.Refactoring.LoadSolutionProjectsThreadRunning}");
 				progressMonitor.ShowingDialog = false;
-				return EmptyList<Error>.Instance;
+				return;
 			}
 			double totalWorkAmount;
 			List<ISymbolSearch> symbolSearches = PrepareSymbolSearch(symbol, progressMonitor.CancellationToken, out totalWorkAmount);
 			double workDone = 0;
 			ParseableFileContentFinder parseableFileContentFinder = new ParseableFileContentFinder();
 			var errors = new List<Error>();
+			var changes = new List<PatchedFile>();
 			foreach (ISymbolSearch s in symbolSearches) {
 				progressMonitor.CancellationToken.ThrowIfCancellationRequested();
 				using (var childProgressMonitor = progressMonitor.CreateSubTask(s.WorkAmount / totalWorkAmount)) {
-					s.RenameAsync(new SymbolRenameArgs(childProgressMonitor, parseableFileContentFinder),
-					              ApplyChanges, error => errors.Add(error)).FireAndForget();
+					await s.RenameAsync(new SymbolRenameArgs(newName, childProgressMonitor, parseableFileContentFinder),
+					                    file => changes.Add(file), error => errors.Add(error));
 				}
 				
 				workDone += s.WorkAmount;
 				progressMonitor.Progress = workDone / totalWorkAmount;
 			}
-			return errors;
+			if (errors.Count == 0) {
+				foreach (var file in changes) {
+					ApplyChanges(file);
+				}
+			} else {
+				foreach (var error in errors) {
+					errorCallback(error);
+				}
+			}
+		}
+		
+		public static IObservable<Error> RenameSymbol(ISymbol symbol, string newName, IProgressMonitor progressMonitor)
+		{
+			return ReactiveExtensions.CreateObservable<Error>(
+				(monitor, callback) => RenameSymbolAsync(symbol, newName, monitor, callback),
+				progressMonitor);
 		}
 		
 		static void ApplyChanges(PatchedFile file)
 		{
 			var view = SD.FileService.OpenFile(file.FileName, false);
-			IDocument document = view.GetService(typeof(IDocument)) as IDocument;
-			if (document == null)
-				throw new InvalidOperationException("Document not found!");
-			file.Apply(document);
+			ITextEditor editor = view.GetService(typeof(ITextEditor)) as ITextEditor;
+			if (editor == null)
+				throw new InvalidOperationException("Editor/document not found!");
+			file.Apply(editor.Document);
 		}
 	}
 	
@@ -250,10 +267,15 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 	
 	public class SymbolRenameArgs : SymbolSearchArgs
 	{
-		public SymbolRenameArgs(IProgressMonitor progressMonitor, ParseableFileContentFinder parseableFileContentFinder)
+		public SymbolRenameArgs(string newName, IProgressMonitor progressMonitor, ParseableFileContentFinder parseableFileContentFinder)
 			: base(progressMonitor, parseableFileContentFinder)
 		{
+			if (newName == null)
+				throw new ArgumentNullException("newName");
+			NewName = newName;
 		}
+		
+		public string NewName { get; private set; }
 	}
 	
 	public interface ISymbolSearch

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

@@ -337,7 +337,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		 */
 		
 		[Obsolete]
-		public static void ShowAsSearchResults(string title, List<Reference> list)
+		public static void ShowAsSearchResults(string title, List<SearchResultMatch> list)
 		{
 			if (list == null) return;
 			List<SearchResultMatch> results = new List<SearchResultMatch>(list.Count);
@@ -345,7 +345,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			ITextSource buffer = null;
 			FileName fileName = null;
 			IHighlighter highlighter = null;
-			foreach (Reference r in list) {
+			foreach (SearchResultMatch r in list) {
 				if (document == null || fileName != r.FileName) {
 					if (highlighter != null) {
 						highlighter.Dispose();

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

@@ -1,38 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.AvalonEdit.Highlighting;
-using ICSharpCode.Core;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.SharpDevelop.Editor.Search;
-
-namespace ICSharpCode.SharpDevelop.Refactoring
-{
-	/// <summary>
-	/// A reference to a class or class member.
-	/// </summary>
-	public class Reference : SearchResultMatch
-	{
-		// TODO: this looks like a memory usage problem
-		// SearchResultMatch is kept alive for a long time (list of previous searches),
-		// but ResolveResult keeps the whole compilation alive
-		// We might have to split Reference/SearchResultMatch into separate instances
-		ResolveResult resolveResult;
-		
-		public Reference(DomRegion region, ResolveResult resolveResult, int offset, int length, HighlightedInlineBuilder builder, HighlightingColor defaultTextColor)
-			: base(FileName.Create(region.FileName), region.Begin, region.End, offset, length, builder, defaultTextColor)
-		{
-			if (region.IsEmpty)
-				throw new ArgumentException("Region must not be empty");
-			if (resolveResult == null)
-				throw new ArgumentNullException("resolveResult");
-			this.resolveResult = resolveResult;
-		}
-		
-		public ResolveResult ResolveResult {
-			get { return resolveResult; }
-		}
-	}
-}

src/Main/Base/Project/Src/Services/Tasks/Task.cs

@@ -3,6 +3,7 @@
 
 using System;
 using ICSharpCode.Core;
+using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Project;
 
@@ -156,6 +157,22 @@ namespace ICSharpCode.SharpDevelop
 			this.BuildError = error;
 		}
 		
+		public SDTask(Error error)
+		{
+			if (error == null)
+				throw new ArgumentNullException("error");
+			switch (error.ErrorType) {
+				case ErrorType.Error:
+					type = TaskType.Error;
+					break;
+				case ErrorType.Warning:
+					type = TaskType.Warning;
+					break;
+			}
+			description = error.Message;
+			//hasLocation = !error.Region.IsEmpty;
+		}
+		
 		public void JumpToPosition()
 		{
 			if (hasLocation && !position.IsDeleted)

src/Main/SharpDevelop/Parser/ParserService.cs

@@ -15,6 +15,7 @@ using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Editor.Search;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Refactoring;
@@ -308,7 +309,7 @@ namespace ICSharpCode.SharpDevelop.Parser
 				}, cancellationToken);
 		}
 		
-		public async Task FindLocalReferencesAsync(FileName fileName, IVariable variable, Action<Reference> callback, ITextSource fileContent, ICompilation compilation, CancellationToken cancellationToken)
+		public async Task FindLocalReferencesAsync(FileName fileName, IVariable variable, Action<SearchResultMatch> callback, ITextSource fileContent, ICompilation compilation, CancellationToken cancellationToken)
 		{
 			var entry = GetFileEntry(fileName, true);
 			if (entry.parser == null)