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

Author: PeterForstmeier

data/resources/StringResources.resx

@@ -3789,6 +3789,10 @@ Please configure the NAnt executable's location in the SharpDevelop Options.</va
     <value>Could not find type definition at the cursor position.</value>
     <comment>Error message when using Search&gt;Find Base Classes when the cursor is not on a type reference.</comment>
   </data>
+  <data name="ICSharpCode.Refactoring.NoClassOrMemberUnderCursorError" xml:space="preserve">
+    <value>Could not find type definition or type member at the cursor position.</value>
+    <comment>Error message when using Search&gt;Find Base Classes when the cursor is not on a type reference or type member.</comment>
+  </data>
   <data name="ICSharpCode.RubyBinding.SendLineToRubyConsole" xml:space="preserve">
     <value>Send Line to Ruby Console</value>
   </data>
@@ -6473,6 +6477,9 @@ Removed the end part of the original message ", reason '${Message}'" since this
   <data name="SharpDevelop.Refactoring.BaseClassesOf" xml:space="preserve">
     <value>Base classes of ${Name}</value>
   </data>
+  <data name="SharpDevelop.Refactoring.BaseMembersOf" xml:space="preserve">
+    <value>Base members of ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.CannotPerformOperationBecauseOfSyntaxErrors" xml:space="preserve">
     <value>The operation cannot be performed because your source code contains errors:</value>
   </data>
@@ -6525,6 +6532,9 @@ Removed the end part of the original message ", reason '${Message}'" since this
   <data name="SharpDevelop.Refactoring.FindBaseClassesCommand" xml:space="preserve">
     <value>Find base classes</value>
   </data>
+  <data name="SharpDevelop.Refactoring.FindBaseClassesOrMembersCommand" xml:space="preserve">
+    <value>Find base symbols</value>
+  </data>
   <data name="SharpDevelop.Refactoring.FindDerivedClassesCommand" xml:space="preserve">
     <value>Find &amp;derived classes</value>
   </data>
@@ -8182,4 +8192,13 @@ Error while starting:
     <value>This resource is not being used. Its purpose is to test the translation database and has 
 a line break</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.CodeCompletion.TooltipLabel" xml:space="preserve">
+    <value>Tooltip settings</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.CodeCompletion.CommitOnCharacters" xml:space="preserve">
+    <value>Insert selected code completion entry by typing the following characters:</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.CodeCompletion.CommitOnTabEnterOnly" xml:space="preserve">
+    <value>Only insert selected code completion entry by typing &lt;Tab&gt; or &lt;Enter&gt;.</value>
+  </data>
 </root>

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

@@ -74,7 +74,7 @@ static string GeneratePartialClassContextStub(ICodeContext context)
 				return "";
 			var builder = new TypeSystemAstBuilder();
 			MethodDeclaration decl;
-			if (member is IMethod) {
+			if (member.SymbolKind == SymbolKind.Method) {
 				// If it's a method, convert it directly (including parameters + type parameters)
 				decl = (MethodDeclaration)builder.ConvertEntity(member);
 			} else {

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 
 using ICSharpCode.Core;
@@ -115,6 +116,7 @@ bool ShowCompletion(ITextEditor editor, char completionChar, bool ctrlSpace)
 			} else {
 				startPos = caretOffset;
 				if (char.IsLetterOrDigit (completionChar) || completionChar == '_') {
+					if (!CodeCompletionOptions.CompleteWhenTyping) return false;
 					if (startPos > 1 && char.IsLetterOrDigit (completionContext.Document.GetCharAt (startPos - 2)))
 						return false;
 					completionData = cce.GetCompletionData(startPos, false);
@@ -137,7 +139,7 @@ bool ShowCompletion(ITextEditor editor, char completionChar, bool ctrlSpace)
 				return true;
 			}
 
-			if (!ctrlSpace) {
+			if (CodeCompletionOptions.InsightEnabled && !ctrlSpace) {
 				// Method Insight
 				var pce = new CSharpParameterCompletionEngine(
 					completionContext.Document,

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CompletionData.cs

@@ -78,13 +78,14 @@ string ICompletionItem.Text {
 		public IImage Image { get; set; }
 
 		public virtual double Priority {
-			get { return 0; }
+			get { return CodeCompletionDataUsageCache.GetPriority(DisplayText, true); }
 		}
 
 		public virtual void Complete(CompletionContext context)
 		{
 			context.Editor.Document.Replace(context.StartOffset, context.Length, this.CompletionText);
 			context.EndOffset = context.StartOffset + this.CompletionText.Length;
+			CodeCompletionDataUsageCache.IncrementUsage(DisplayText);
 		}
 
 		object fancyContent;

src/AddIns/BackendBindings/WixBinding/Test/DirectoryImport/AddDirectoryTestFixture.cs

@@ -16,16 +16,11 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using ICSharpCode.SharpDevelop.Project;
+using System;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.WixBinding;
 using NUnit.Framework;
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Xml;
 using WixBinding.Tests.PackageFiles;
-using WixBinding.Tests.Utils;
 
 namespace WixBinding.Tests.DirectoryImport
 {

src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeInsertionTests.cs

@@ -21,6 +21,7 @@
 using System.Diagnostics;
 using System.Linq;
 
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
 using NUnit.Framework;
 

src/AddIns/Debugger/Debugger.AddIn/Breakpoints/BreakpointBookmark.cs

@@ -152,6 +152,10 @@ public override string ToString()
 			return string.Format("{0} @{1}", this.FileName, this.LineNumber);
 		}
 
+		public override bool DisplaysTooltip {
+			get { return true; }
+		}
+		
 		public override object CreateTooltipContent()
 		{
 			return new BreakpointEditorPopup(this) {

src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin

@@ -149,20 +149,20 @@
 		          icon="Icons.16x16.Class"
 		          class = "ICSharpCode.AvalonEdit.AddIn.ContextActions.FindDerivedClassesOrOverrides"/>
 
-		<MenuItem id = "FindBaseClasses"
-		          label = "${res:SharpDevelop.Refactoring.FindBaseClassesCommand}"
+		<MenuItem id = "FindBaseClassesOrMembers"
+		          label = "${res:SharpDevelop.Refactoring.FindBaseClassesOrMembersCommand}"
 		          icon="Icons.16x16.Interface"
-		          class = "ICSharpCode.AvalonEdit.AddIn.ContextActions.FindBaseClasses"/>
+		          class = "ICSharpCode.AvalonEdit.AddIn.ContextActions.FindBaseClassesOrMembers"/>
 	</Path>
 
 	<Path name = "/SharpDevelop/EntityContextMenu">
-		<Condition name="SymbolTypeAtCaret" type="type" action="Exclude">
+		<Condition name="SymbolTypeAtCaret" type="type,member" action="Exclude">
 			<Include id="FindDerivedOrOverridesClasses"
 			         insertafter="FindReferences"
 			         item="/SharpDevelop/Workbench/MainMenu/Search/FindDerivedOrOverridesClasses" />
-			<Include id="FindBaseClasses"
+			<Include id="FindBaseClassesOrMembers"
 			         insertafter="FindDerivedOrOverridesClasses"
-			         item="/SharpDevelop/Workbench/MainMenu/Search/FindBaseClasses" />
+			         item="/SharpDevelop/Workbench/MainMenu/Search/FindBaseClassesOrMembers" />
 		</Condition>
 	</Path>
 

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

@@ -569,6 +569,10 @@ void TextAreaTextEntered(object sender, TextCompositionEventArgs e)
 						SD.ParserService.ParseAsync(this.FileName, this.Document.CreateSnapshot()).FireAndForget();
 					} else {
 						if (e.Text.Length == 1) {
+							// disable all code completion bindings when CC is disabled
+							if (!CodeCompletionOptions.EnableCodeCompletion)
+								return;
+							
 							foreach (ICodeCompletionBinding cc in CodeCompletionBindings) {
 								if (cc.HandleKeyPressed(adapter, c))
 									break;

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

@@ -31,16 +31,20 @@
 
 namespace ICSharpCode.AvalonEdit.AddIn.ContextActions
 {
-	public class FindBaseClasses : ResolveResultMenuCommand
+	public class FindBaseClassesOrMembers : ResolveResultMenuCommand
 	{
 		public override void Run(ResolveResult symbol)
 		{
 			IEntity entityUnderCaret = GetSymbol(symbol) as IEntity;
 			if (entityUnderCaret is ITypeDefinition) {
 				MakePopupWithBaseClasses((ITypeDefinition)entityUnderCaret).OpenAtCaretAndFocus();
-			} else {
-				MessageService.ShowError("${res:ICSharpCode.Refactoring.NoClassUnderCursorError}");
+				return;
 			}
+			if (entityUnderCaret is IMember) {
+				MakePopupWithBaseMembers((IMember)entityUnderCaret).OpenAtCaretAndFocus();
+				return;
+			}
+			MessageService.ShowError("${res:ICSharpCode.Refactoring.NoClassOrMemberUnderCursorError}");
 		}
 
 		static ContextActionsPopup MakePopupWithBaseClasses(ITypeDefinition @class)
@@ -49,14 +53,54 @@ static ContextActionsPopup MakePopupWithBaseClasses(ITypeDefinition @class)
 			var popupViewModel = new ContextActionsPopupViewModel();
 			popupViewModel.Title = MenuService.ConvertLabel(StringParser.Parse(
 				"${res:SharpDevelop.Refactoring.BaseClassesOf}", new StringTagPair("Name", @class.Name)));
-			popupViewModel.Actions = BuildListViewModel(baseClassList);
+			popupViewModel.Actions = BuildBaseClassListViewModel(baseClassList);
 			return new ContextActionsPopup { Actions = popupViewModel };
 		}
 
-		static ObservableCollection<ContextActionViewModel> BuildListViewModel(IEnumerable<ITypeDefinition> classList)
+		static ObservableCollection<ContextActionViewModel> BuildBaseClassListViewModel(IEnumerable<ITypeDefinition> classList)
 		{
 			return new ObservableCollection<ContextActionViewModel>(
 				classList.Select(@class => GoToEntityAction.MakeViewModel(@class, null)));
 		}
+		
+		#region Base (overridden) members
+		static ContextActionsPopup MakePopupWithBaseMembers(IMember member)
+		{
+			var baseClassList = member.DeclaringTypeDefinition.GetAllBaseTypeDefinitions().Where(
+				baseClass => baseClass != member.DeclaringTypeDefinition).ToList();
+			var popupViewModel = new ContextActionsPopupViewModel {
+				Title = MenuService.ConvertLabel(StringParser.Parse(
+					"${res:SharpDevelop.Refactoring.BaseMembersOf}",
+					new StringTagPair("Name", member.FullName))
+				                                )};
+			popupViewModel.Actions = BuildBaseMemberListViewModel(member);
+			return new ContextActionsPopup { Actions = popupViewModel };
+		}
+		
+		static ObservableCollection<ContextActionViewModel> BuildBaseMemberListViewModel(IMember member)
+		{
+			var c = new ObservableCollection<ContextActionViewModel>();
+			ObservableCollection<ContextActionViewModel> lastBase = c;
+			
+			IMember thisMember = member;
+			while (thisMember != null) {
+				IMember baseMember = InheritanceHelper.GetBaseMembers(thisMember, true).FirstOrDefault();
+				if (baseMember != null) {
+					// Only allow this base member, if overriding a virtual/abstract member of a class
+					// or implementing a member of an interface.
+					if ((baseMember.DeclaringTypeDefinition.Kind == TypeKind.Interface) || (baseMember.IsOverridable && thisMember.IsOverride)) {
+						var newChild = new ObservableCollection<ContextActionViewModel>();
+						lastBase.Add(GoToEntityAction.MakeViewModel(baseMember, newChild));
+						lastBase = newChild;
+					} else {
+						thisMember = null;
+					}
+				}
+				thisMember = baseMember;
+			}
+			
+			return c;
+		}
+		#endregion
 	}
 }