Reimplemented CodeEditorView.ShowHelp()

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

@@ -221,26 +221,16 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		public void ShowHelp()
 		{
 			// Resolve expression at cursor and show help
-			#warning Reimplement ShowHelp()
-			/*
-			TextArea textArea = this.TextArea;
-			IExpressionFinder expressionFinder = ParserService.GetExpressionFinder(this.Adapter.FileName);
-			if (expressionFinder == null)
-				return;
-			string textContent = this.Text;
-			ExpressionResult expressionResult = expressionFinder.FindFullExpression(textContent, textArea.Caret.Offset);
-			string expression = expressionResult.Expression;
-			if (expression != null && expression.Length > 0) {
-				ResolveResult result = ParserService.Resolve(expressionResult, textArea.Caret.Line, textArea.Caret.Column, this.Adapter.FileName, textContent);
-				TypeResolveResult trr = result as TypeResolveResult;
-				if (trr != null) {
-					HelpProvider.ShowHelp(trr.ResolvedClass);
-				}
-				MemberResolveResult mrr = result as MemberResolveResult;
-				if (mrr != null) {
-					HelpProvider.ShowHelp(mrr.ResolvedMember);
-				}
-			}*/
+			var compilation = SD.ParserService.GetCompilationForFile(FileName);
+			var result = SD.ParserService.Resolve(Adapter, TextArea.Caret.Location, compilation);
+			TypeResolveResult trr = result as TypeResolveResult;
+			if (trr != null && trr.Type.GetDefinition() != null) {
+				HelpProvider.ShowHelp(trr.Type.GetDefinition());
+			}
+			MemberResolveResult mrr = result as MemberResolveResult;
+			if (mrr != null) {
+				HelpProvider.ShowHelp(mrr.Member);
+			}
 		}
 		#endregion
 		

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

@@ -2090,10 +2090,10 @@
 		             tooltip = "${res:AddIns.HtmlHelp2.Search}"
 		             class   = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.GoSearch"/>
 		
-		<ToolbarItem id      = "URLComboBox"
-		             type    = "Custom"
+		<ToolbarItem id      = "UrlComboBox"
+		             type    = "Builder"
 		             tooltip = "${res:AddIns.HtmlHelp2.EnterURL}"
-		             class   = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.UrlComboBox"/>
+		             class   = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.UrlComboBoxBuilder"/>
 		
 		<ToolbarItem id      = "NewWindow"
 		             icon    = "Icons.16x16.BrowserWindow"

src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/BrowserCommands.cs

@@ -2,7 +2,9 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -59,19 +61,23 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
 		}
 	}
 	
-	#warning Reimplement URL combo box
-	/*
-	public class UrlComboBox : AbstractComboBoxCommand
+	public class UrlComboBoxBuilder : IMenuItemBuilder
 	{
-		protected override void OnOwnerChanged(EventArgs e)
+		public IEnumerable<object> BuildItems(Codon codon, object parameter)
 		{
-			base.OnOwnerChanged(e);
-			ToolBarComboBox toolbarItem = (ToolBarComboBox)base.ComboBox;
-			toolbarItem.ComboBox.Width *= 3;
-			((HtmlViewPane)toolbarItem.Caller).SetUrlComboBox(toolbarItem.ComboBox);
+			ToolStripComboBox toolbarItem = new ToolStripComboBox();
+			ComboBox comboBox = toolbarItem.ComboBox;
+			comboBox.Width *= 3;
+			comboBox.DropDownStyle = ComboBoxStyle.DropDown;
+			comboBox.Items.Clear();
+			foreach (string url in PropertyService.GetList<string>("Browser.URLBoxHistory"))
+				comboBox.Items.Add(url);
+			comboBox.AutoCompleteMode   = AutoCompleteMode.Suggest;
+			comboBox.AutoCompleteSource = AutoCompleteSource.HistoryList;
+			((HtmlViewPane)parameter).SetUrlBox(comboBox);
+			return new[] { toolbarItem };
 		}
 	}
-	*/
 	
 	public class NewWindow : AbstractCommand
 	{

src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs

@@ -240,17 +240,6 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
 		
 		Control urlBox;
 		
-		public void SetUrlComboBox(ComboBox comboBox)
-		{
-			SetUrlBox(comboBox);
-			comboBox.DropDownStyle = ComboBoxStyle.DropDown;
-			comboBox.Items.Clear();
-			foreach (string url in PropertyService.GetList<string>("Browser.URLBoxHistory"))
-				comboBox.Items.Add(url);
-			comboBox.AutoCompleteMode      = AutoCompleteMode.Suggest;
-			comboBox.AutoCompleteSource    = AutoCompleteSource.HistoryList;
-		}
-		
 		public void SetUrlBox(Control urlBox)
 		{
 			this.urlBox = urlBox;