Change "SymbolUnderCaretMenuCommand" into "ResolveResultMenuCommand".

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs

@@ -214,7 +214,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				else
 					col += 1;
 			}
-			WorkbenchSingleton.StatusBar.SetCaretPosition(col, this.Line, chOffset);
+			SD.StatusBar.SetCaretPosition(col, this.Line, chOffset);
 		}
 		
 		public override bool IsReadOnly {

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs

@@ -455,8 +455,9 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				if (position == null)
 					return;
 				SD.AnalyticsMonitor.TrackFeature(typeof(GoToDefinition).FullName, "Ctrl+Click");
+				var resolveResult = SD.ParserService.Resolve(Adapter, position.Value.Location);
 				var goToDefinitionCommand = new GoToDefinition();
-				goToDefinitionCommand.Run(this.Adapter, this.Document.GetOffset(position.Value.Location));
+				goToDefinitionCommand.Run(resolveResult);
 				e.Handled = true;
 			}
 		}

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ContextActions/FindBaseClasses.cs

@@ -15,9 +15,9 @@ using ICSharpCode.SharpDevelop.Editor.Commands;
 
 namespace ICSharpCode.AvalonEdit.AddIn.ContextActions
 {
-	public class FindBaseClasses : SymbolUnderCaretMenuCommand
+	public class FindBaseClasses : ResolveResultMenuCommand
 	{
-		protected override void RunImpl(ITextEditor editor, int offset, ResolveResult symbol)
+		public override void Run(ResolveResult symbol)
 		{
 			IEntity entityUnderCaret = GetEntity(symbol);
 			if (entityUnderCaret is ITypeDefinition) {

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ContextActions/FindDerivedClassesOrOverrides.cs

@@ -16,9 +16,9 @@ using ICSharpCode.SharpDevelop.Refactoring;
 
 namespace ICSharpCode.AvalonEdit.AddIn.ContextActions
 {
-	public class FindDerivedClassesOrOverrides : SymbolUnderCaretMenuCommand
+	public class FindDerivedClassesOrOverrides : ResolveResultMenuCommand
 	{
-		protected override void RunImpl(ITextEditor editor, int offset, ResolveResult symbol)
+		public override void Run(ResolveResult symbol)
 		{
 			IEntity entityUnderCaret = GetEntity(symbol);
 			if (entityUnderCaret is ITypeDefinition && !entityUnderCaret.IsSealed) {

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/XmlDoc/XmlDocTooltipProvider.cs

@@ -41,6 +41,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.XmlDoc
 			
 			public FlowDocumentTooltip(FlowDocument document)
 			{
+				TextOptions.SetTextFormattingMode(this, TextFormattingMode.Display);
 				viewer = new FlowDocumentScrollViewer();
 				viewer.Document = document;
 				Border border = new Border {
@@ -55,8 +56,6 @@ namespace ICSharpCode.AvalonEdit.AddIn.XmlDoc
 				document.FontSize = CodeEditorOptions.Instance.FontSize;
 			}
 			
-			public event RoutedEventHandler Closed { add {} remove {} }
-			
 			public bool CloseOnHoverEnd {
 				get { return true; }
 			}
@@ -65,42 +64,45 @@ namespace ICSharpCode.AvalonEdit.AddIn.XmlDoc
 		object CreateTooltip(IType type)
 		{
 			var ambience = AmbienceService.GetCurrentAmbience();
-			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
+			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType;
-			string header = ambience.ConvertType(type);
+			string header;
+			if (type is ITypeDefinition)
+				header = ambience.ConvertEntity((ITypeDefinition)type);
+			else
+				header = ambience.ConvertType(type);
+			
+			ambience.ConversionFlags = ConversionFlags.ShowTypeParameterList;
+			DocumentationUIBuilder b = new DocumentationUIBuilder(ambience);
+			b.AddCodeBlock(header, keepLargeMargin: true);
+			
 			ITypeDefinition entity = type.GetDefinition();
 			if (entity != null) {
 				var documentation = XmlDocumentationElement.Get(entity);
 				if (documentation != null) {
-					ambience.ConversionFlags = ConversionFlags.ShowTypeParameterList;
-					DocumentationUIBuilder b = new DocumentationUIBuilder(ambience);
-					b.AddCodeBlock(header, keepLargeMargin: true);
 					foreach (var child in documentation.Children) {
 						b.AddDocumentationElement(child);
 					}
-					return new FlowDocumentTooltip(b.FlowDocument);
 				}
 			}
-			return header;
+			return new FlowDocumentTooltip(b.FlowDocument);
 		}
 		
 		object CreateTooltip(IEntity entity)
 		{
 			var ambience = AmbienceService.GetCurrentAmbience();
-			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
+			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType;
 			string header = ambience.ConvertEntity(entity);
 			var documentation = XmlDocumentationElement.Get(entity);
 			
-			if (documentation != null) {
 			ambience.ConversionFlags = ConversionFlags.ShowTypeParameterList;
 			DocumentationUIBuilder b = new DocumentationUIBuilder(ambience);
 			b.AddCodeBlock(header, keepLargeMargin: true);
+			if (documentation != null) {
 				foreach (var child in documentation.Children) {
 					b.AddDocumentationElement(child);
 				}
-				return new FlowDocumentTooltip(b.FlowDocument);
-			} else {
-				return header;
 			}
+			return new FlowDocumentTooltip(b.FlowDocument);
 		}
 	}
 }

src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.addin

@@ -17,21 +17,7 @@
 	</Path>
 	
 	<!-- Text editor context menu: Launch ILSpy command -->
-	<!--
+	<Path name="/SharpDevelop/ViewContent/TextEditor/EntityContextMenu">
-	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassMemberContextMenu">
+		<MenuItem id="ILSpy" icon="ILSpy" type="Item" label="${res:ILSpyAddIn.OpenILSpyCommand}" class="ICSharpCode.ILSpyAddIn.OpenInILSpyCommand"/>
-		<MenuItem id="ILSpy" icon="ILSpy" type="Item" label="${res:ILSpyAddIn.OpenILSpyCommand}" class="ICSharpCode.ILSpyAddIn.TextEditorContextMenuCommand"/>
 	</Path>
-	
-	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassBookmarkContextMenu">
-		<MenuItem id="ILSpy" icon="ILSpy" type="Item" label="${res:ILSpyAddIn.OpenILSpyCommand}" class="ICSharpCode.ILSpyAddIn.TextEditorContextMenuCommand"/>
-	</Path>
-	
-	<Path name = "/SharpDevelop/Pads/ClassBrowser/MemberContextMenu">
-		<MenuItem id="ILSpy" icon="ILSpy" type="Item" label="${res:ILSpyAddIn.OpenILSpyCommand}" class="ICSharpCode.ILSpyAddIn.TextEditorContextMenuCommand"/>
-	</Path>
-	
-	<Path name = "/SharpDevelop/Pads/ClassBrowser/ClassContextMenu">
-		<MenuItem id="ILSpy" icon="ILSpy" type="Item" label="${res:ILSpyAddIn.OpenILSpyCommand}" class="ICSharpCode.ILSpyAddIn.TextEditorContextMenuCommand"/>
-	</Path>
-	-->
 </AddIn>

src/AddIns/DisplayBindings/ILSpyAddIn/LaunchILSpy/OpenInILSpyCommand.cs

@@ -3,7 +3,9 @@
 
 using System;
 using ICSharpCode.Core;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.SharpDevelop.Bookmarks;
+using ICSharpCode.SharpDevelop.Editor.Commands;
 
 namespace ICSharpCode.ILSpyAddIn
 {
@@ -11,53 +13,14 @@ namespace ICSharpCode.ILSpyAddIn
 	/// Implements a menu command to position .NET ILSpy on a class
 	/// or class member.
 	/// </summary>
-	public sealed class OpenInILSpyCommand : AbstractMenuCommand
+	public sealed class OpenInILSpyCommand : ResolveResultMenuCommand
 	{
-		public override void Run()
+		public override void Run(ResolveResult symbol)
 		{
-			throw new NotImplementedException();
+			var entity = GetEntity(symbol);
-			#warning implement OpenInILSpyCommand
-			/*IClass c;
-			IMember m;
-			
-			MemberNode mn = this.Owner as MemberNode;
-			if (mn != null) {
-				m = mn.Member;
-				c = m.DeclaringType;
-			} else {
-				ClassNode cn = this.Owner as ClassNode;
-				if (cn != null) {
-					c = cn.Class;
-					m = null;
-				} else {
-					ClassMemberBookmark cmbm = this.Owner as ClassMemberBookmark;
-					if (cmbm != null) {
-						m = cmbm.Member;
-						c = m.DeclaringType;
-					} else {
-						ClassBookmark cbm = this.Owner as ClassBookmark;
-						if (cbm != null) {
-							c = cbm.Class;
-							m = null;
-						} else {
-							MessageService.ShowWarning("ILSpy AddIn: Could not determine the class for the selected element. Owner: " + ((this.Owner == null) ? "<null>" : this.Owner.ToString()));
-							return;
-						}
-					}
-				}
-			}
-			
-			if (c == null) {
-				MessageService.ShowWarning("ILSpy AddIn: Could not determine the class for the selected element (known owner). Owner: " + this.Owner.ToString());
-				return;
-			}
-			
-			AbstractEntity entity = m as AbstractEntity;
-			if (entity == null)
-				entity = c as AbstractEntity;
 			if (entity != null) {
 				ILSpyController.OpenInILSpy(entity);
-			}*/
+			}
 		}
 	}
 }

src/AddIns/DisplayBindings/ILSpyAddIn/ViewContent/DecompiledViewContent.cs

@@ -30,7 +30,7 @@ namespace ICSharpCode.ILSpyAddIn
 	{
 		readonly FileName assemblyFile;
 		readonly string fullTypeName;
-		readonly string uri;
+		readonly FileName virtualFileName;
 		
 		/// <summary>
 		/// Entity to jump to once decompilation has finished.
@@ -47,7 +47,7 @@ namespace ICSharpCode.ILSpyAddIn
 		#region Constructor
 		public DecompiledViewContent(FileName assemblyFile, string fullTypeName, string entityTag)
 		{
-			this.uri = string.Format("ilspy://{0}|{1}", assemblyFile, fullTypeName);
+			this.virtualFileName = FileName.Create("ilspy://" + assemblyFile + ">" + fullTypeName);
 			this.codeView = new CodeView();
 			
 			this.assemblyFile = assemblyFile;
@@ -273,7 +273,7 @@ namespace ICSharpCode.ILSpyAddIn
 		void BookmarkManager_Added(object sender, BookmarkEventArgs e)
 		{
 			var mark = e.Bookmark;
-			if (mark != null && mark is BreakpointBookmark && mark.FileName == uri) {
+			if (mark != null && mark is BreakpointBookmark && mark.FileName == virtualFileName) {
 				codeView.IconBarManager.Bookmarks.Add(mark);
 				mark.Document = this.codeView.Document;
 			}

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

@@ -1930,7 +1930,7 @@
 	<Path name = "/SharpDevelop/ViewContent/TextEditor/EntityContextMenu">
 		<MenuItem id = "FindReferences"
 		          label = "${res:SharpDevelop.Refactoring.FindReferencesCommand}"
-		          class = "ICSharpCode.SharpDevelop.Refactoring.FindLocalVariableReferencesCommand"/>
+		          class = "ICSharpCode.SharpDevelop.Editor.Commands.FindReferencesCommand"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/Common">

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

@@ -2,6 +2,7 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
+using ICSharpCode.Core;
 using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.SharpDevelop.Refactoring;
 
@@ -10,9 +11,9 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands
 	/// <summary>
 	/// Runs the find references command.
 	/// </summary>
-	public class FindReferencesCommand : SymbolUnderCaretMenuCommand
+	public class FindReferencesCommand : ResolveResultMenuCommand
 	{
-		protected override void RunImpl(ITextEditor editor, int offset, ResolveResult symbol)
+		public override void Run(ResolveResult symbol)
 		{
 			var entity = GetEntity(symbol);
 			if (entity != null) {

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

@@ -12,9 +12,9 @@ using Mono.Cecil;
 
 namespace ICSharpCode.SharpDevelop.Editor.Commands
 {
-	public class GoToDefinition : SymbolUnderCaretMenuCommand
+	public class GoToDefinition : ResolveResultMenuCommand
 	{
-		protected override void RunImpl(ITextEditor editor, int offset, ResolveResult symbol)
+		public override void Run(ResolveResult symbol)
 		{
 			if (symbol == null)
 				return;

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

@@ -12,26 +12,54 @@ using ICSharpCode.SharpDevelop.Parser;
 namespace ICSharpCode.SharpDevelop.Editor.Commands
 {
 	/// <summary>
-	/// A menu command that uses the symbol under the editor's caret.
+	/// A menu command that operates on a <see cref="ResolveResult"/>.
+	/// 
+	/// Supports the following types as <see cref="Owner"/>:
+	/// - IUnresolvedTypeDefinition (as used by EntityBookmark)
+	/// - IUnresolvedMember (as used by EntityBookmark)
+	/// 
+	/// If the owner isn't one of the types above, the command operates on the caret position in the current editor.
 	/// </summary>
-	public abstract class SymbolUnderCaretMenuCommand : AbstractMenuCommand
+	public abstract class ResolveResultMenuCommand : AbstractMenuCommand
 	{
+		public abstract void Run(ResolveResult symbol);
+		
 		public override void Run()
 		{
 			ITextEditor editor = SD.GetActiveViewContentService<ITextEditor>();
-			if (editor != null) {
+			ResolveResult resolveResult = GetResolveResult(editor, Owner);
-				Run(editor, editor.Caret.Offset);
+			Run(resolveResult);
-			}
 		}
 		
-		public void Run(ITextEditor editor, int caretOffset)
+		public static ResolveResult GetResolveResult(ITextEditor editor, object owner)
 		{
-			var location = editor.Document.GetLocation(caretOffset);
+			if (owner is IUnresolvedTypeDefinition || owner is IUnresolvedMember) {
-			var resolveResult = SD.ParserService.Resolve(editor, location);
+				return GetResolveResultFromUnresolvedEntity((IUnresolvedEntity)owner);
-			RunImpl(editor, editor.Caret.Offset, resolveResult);
+			} else if (editor != null) {
+				return SD.ParserService.Resolve(editor, editor.Caret.Location);
+			} else {
+				return ErrorResolveResult.UnknownError;
+			}
 		}
 		
-		protected abstract void RunImpl(ITextEditor editor, int caretOffset, ResolveResult symbol);
+		static ResolveResult GetResolveResultFromUnresolvedEntity(IUnresolvedEntity entity)
+		{
+			if (entity.UnresolvedFile == null)
+				return ErrorResolveResult.UnknownError;
+			ICompilation compilation = SD.ParserService.GetCompilationForFile(FileName.Create(entity.UnresolvedFile.FileName));
+			var context = new SimpleTypeResolveContext(compilation.MainAssembly);
+			if (entity is IUnresolvedMember) {
+				var member = ((IUnresolvedMember)entity).Resolve(context);
+				if (member != null) {
+					return new MemberResolveResult(null, member);
+				} else {
+					return ErrorResolveResult.UnknownError;
+				}
+			} else { // IUnresolvedTypeDefinition
+				var type = ((IUnresolvedTypeDefinition)entity).Resolve(context);
+				return new TypeResolveResult(type);
+			}
+		}
 		
 		protected IEntity GetEntity(ResolveResult symbol)
 		{

src/Main/Base/Project/Src/Project/CompilableProject.cs

@@ -224,12 +224,9 @@ namespace ICSharpCode.SharpDevelop.Project
 			if (e.PropertyName == "TargetFrameworkVersion")
 				CreateItemsListFromMSBuild();
 			if (!isLoading) {
-				if (reparseReferencesSensitiveProperties.Contains(e.PropertyName)) {
+				bool reparseReferences = reparseReferencesSensitiveProperties.Contains(e.PropertyName);
-					Reparse(true, false);
+				bool reparseCode = reparseCodeSensitiveProperties.Contains(e.PropertyName);
-				}
+				Reparse(reparseReferences, reparseCode);
-				if (reparseCodeSensitiveProperties.Contains(e.PropertyName)) {
-					Reparse(false, true);
-				}
 			}
 		}
 		
@@ -238,6 +235,8 @@ namespace ICSharpCode.SharpDevelop.Project
 			lock (SyncRoot) {
 				if (parseProjectContentContainer == null)
 					return; // parsing hasn't started yet; no need to re-parse
+				parseProjectContentContainer.SetAssemblyName(this.AssemblyName);
+				parseProjectContentContainer.SetLocation(this.OutputAssemblyFullPath);
 				if (references) {
 					parseProjectContentContainer.ReparseReferences();
 				}

src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs

@@ -52,7 +52,7 @@ namespace ICSharpCode.SharpDevelop
 		/// This method is thread-safe.
 		/// </summary>
 		/// <returns>Returns a new ambience object (ambience objects are never reused to ensure their thread-safety).
-		/// Never returns null, in case of errors the <see cref="CSharpAmbience"/> is used.</returns>
+		/// Never returns null, in case of errors the <see cref="DefaultAmbience"/> is used.</returns>
 		public static IAmbience GetCurrentAmbience()
 		{
 			if (UseProjectAmbienceIfPossible) {

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

@@ -52,7 +52,7 @@ namespace ICSharpCode.SharpDevelop.Parser
 			if (project == null)
 				throw new ArgumentNullException("project");
 			this.project = project;
-			this.projectContent = initialProjectContent.SetAssemblyName(project.AssemblyName);
+			this.projectContent = initialProjectContent.SetAssemblyName(project.AssemblyName).SetLocation(project.OutputAssemblyFullPath);
 			
 			this.cacheFileName = GetCacheFileName(FileName.Create(project.FileName));
 			
@@ -240,6 +240,30 @@ namespace ICSharpCode.SharpDevelop.Parser
 			}
 		}
 		
+		public void SetAssemblyName(string newAssemblyName)
+		{
+			lock (lockObj) {
+				if (!disposed) {
+					if (projectContent.FullAssemblyName == newAssemblyName)
+						return;
+					projectContent = projectContent.SetAssemblyName(newAssemblyName);
+					SD.ParserService.InvalidateCurrentSolutionSnapshot();
+				}
+			}
+		}
+		
+		public void SetLocation(string newLocation)
+		{
+			lock (lockObj) {
+				if (!disposed) {
+					if (projectContent.Location == newLocation)
+						return;
+					projectContent = projectContent.SetLocation(newLocation);
+					SD.ParserService.InvalidateCurrentSolutionSnapshot();
+				}
+			}
+		}
+		
 		public void SetCompilerSettings(object compilerSettings)
 		{
 			lock (lockObj) {