move OutputPad to WPF based on AvalonEdit

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LinkElementGenerator.cs

@@ -57,7 +57,7 @@ namespace ICSharpCode.AvalonEdit.Rendering
 			this.RequireControlModifierForClick = options.RequireControlModifierForHyperlinkClick;
 		}
 		
-		Match GetMatch(int startOffset, out int matchOffset)
+		protected Match GetMatch(int startOffset, out int matchOffset)
 		{
 			int endOffset = CurrentContext.VisualLine.LastDocumentLine.EndOffset;
 			StringSegment relevantText = CurrentContext.GetText(startOffset, endOffset - startOffset);

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineLinkText.cs

@@ -51,7 +51,7 @@ namespace ICSharpCode.AvalonEdit.Rendering
 			return base.CreateTextRun(startVisualColumn, context);
 		}
 		
-		bool LinkIsClickable()
+		protected bool LinkIsClickable()
 		{
 			if (NavigateUri == null)
 				return false;

src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs

@@ -4,13 +4,19 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
+using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
-using System.Windows.Forms;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
 
+using ICSharpCode.AvalonEdit;
+using ICSharpCode.AvalonEdit.Rendering;
 using ICSharpCode.Core;
-using ICSharpCode.Core.WinForms;
+using ICSharpCode.Core.Presentation;
 using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using ICSharpCode.SharpDevelop.Project;
 
@@ -41,10 +47,106 @@ namespace ICSharpCode.SharpDevelop.Gui
 			WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).CreatePad();
 		}
 		
-		//TextEditorControl textEditorControl = new TextEditorControl();
+		#region MessageViewLinkElementGenerator
-		RichTextBox textEditorControl = new RichTextBox();
+		enum LinkType { CSharp, NUnit, Cpp }
-		Panel myPanel = new Panel();
+		
-		ToolStrip toolStrip;
+		class MessageViewLinkElementGenerator : LinkElementGenerator
+		{
+			LinkType type;
+			
+			public MessageViewLinkElementGenerator(LinkType type)
+				: base(GetRegex(type))
+			{
+				this.type = type;
+				RequireControlModifierForClick = false;
+			}
+			
+			protected override Uri GetUriFromMatch(Match match)
+			{
+				return new Uri(match.Groups[1].Value.Trim());
+			}
+			
+			public override VisualLineElement ConstructElement(int offset)
+			{
+				int matchOffset;
+				Match m = GetMatch(offset, out matchOffset);
+				if (m.Success && matchOffset == offset) {
+					Uri uri = GetUriFromMatch(m);
+					if (uri == null)
+						return null;
+					VisualLineMessageViewLinkText linkText = new VisualLineMessageViewLinkText(CurrentContext.VisualLine, m.Length);
+					linkText.NavigateUri = uri;
+					linkText.RequireControlModifierForClick = this.RequireControlModifierForClick;
+					linkText.Line = int.Parse(m.Groups[2].Value);
+					if (type == LinkType.CSharp)
+						linkText.Column = int.Parse(m.Groups[3].Value);
+					return linkText;
+				} else {
+					return null;
+				}
+			}
+			
+			static Regex GetRegex(LinkType type)
+			{
+				switch (type) {
+					case CompilerMessageView.LinkType.CSharp:
+						return new Regex(@"\b(\w:[/\\].*?)\((\d+),(\d+)\)");
+					case CompilerMessageView.LinkType.NUnit:
+						return new Regex(@"\b(\w:[/\\].*?):line\s(\d+)?\r?$");
+					case CompilerMessageView.LinkType.Cpp:
+						return new Regex(@"\b(\w:[/\\].*?)\((\d+)\)");
+					default:
+						throw new Exception("Invalid value for LinkType");
+				}
+			}
+			
+			public static void RegisterGenerators(TextView textView)
+			{
+				textView.ElementGenerators.Add(new MessageViewLinkElementGenerator(LinkType.CSharp));
+				textView.ElementGenerators.Add(new MessageViewLinkElementGenerator(LinkType.NUnit));
+				textView.ElementGenerators.Add(new MessageViewLinkElementGenerator(LinkType.Cpp));
+			}
+		}
+		
+		class VisualLineMessageViewLinkText : VisualLineLinkText
+		{
+			/// <summary>
+			/// Creates a visual line text element with the specified length.
+			/// It uses the <see cref="ITextRunConstructionContext.VisualLine"/> and its
+			/// <see cref="VisualLineElement.RelativeTextOffset"/> to find the actual text string.
+			/// </summary>
+			public VisualLineMessageViewLinkText(VisualLine parentVisualLine, int length) : base(parentVisualLine, length)
+			{
+				this.RequireControlModifierForClick = false;
+			}
+			
+			public int Line { get; set; }
+			public int Column { get; set; }
+			
+			protected override void OnMouseDown(System.Windows.Input.MouseButtonEventArgs e)
+			{
+				if (e.ChangedButton == MouseButton.Left && !e.Handled && LinkIsClickable() && NavigateUri.IsFile) {
+					FileService.JumpToFilePosition(NavigateUri.LocalPath, Line, Column);
+					e.Handled = true;
+				}
+			}
+			
+			protected override VisualLineText CreateInstance(int length)
+			{
+				return new VisualLineMessageViewLinkText(ParentVisualLine, length) {
+					NavigateUri = this.NavigateUri,
+					Line = this.Line,
+					Column = this.Column,
+					TargetName = this.TargetName,
+					RequireControlModifierForClick = this.RequireControlModifierForClick
+				};
+			}
+		}
+		#endregion
+		
+		TextEditor textEditor = new TextEditor();
+		DockPanel panel = new DockPanel();
+		ToolBar toolStrip;
 		
 		List<MessageViewCategory> messageCategories = new List<MessageViewCategory>();
 		
@@ -67,7 +169,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			WorkbenchSingleton.DebugAssertMainThread();
 			if (selectedCategory < 0) {
-				textEditorControl.Text = "";
+				textEditor.Text = "";
 			} else {
 				lock (messageCategories[selectedCategory].SyncRoot) {
 					// accessing a categories' text takes its lock - but we have to take locks in the same
@@ -106,7 +208,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public override object Control {
 			get {
-				return myPanel;
+				return panel;
 			}
 		}
 		
@@ -116,38 +218,28 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			AddCategory(TaskService.BuildMessageViewCategory);
 			
-			myPanel.SuspendLayout();
+			textEditor.IsReadOnly = true;
-			textEditorControl.Dock = DockStyle.Fill;
-			textEditorControl.BorderStyle = BorderStyle.FixedSingle;
-			textEditorControl.BackColor = SystemColors.Window;
-			textEditorControl.LinkClicked += delegate(object sender, LinkClickedEventArgs e) {
-				FileService.OpenFile("browser://" + e.LinkText);
-			};
-			
-			// auto-scrolling on RichTextBox only works when HideSelection=false.
-			// See comments to http://weblogs.asp.net/jdanforth/archive/2004/01/23/62026.aspx
-			textEditorControl.HideSelection = false;
-			
-			textEditorControl.ReadOnly = true;
 			
-			textEditorControl.ContextMenuStrip = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu");
+			textEditor.ContextMenu = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu");
 			
 			properties = (Properties)PropertyService.Get(OutputWindowOptionsPanel.OutputWindowsProperty, new Properties());
 			
-			textEditorControl.Font = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", WinFormsResourceService.DefaultMonospacedFont.ToString()).ToString());
+			var font = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", Core.WinForms.WinFormsResourceService.DefaultMonospacedFont.ToString()).ToString());
+			
+			textEditor.FontFamily = new FontFamily(font.FontFamily.Name);
+			textEditor.FontSize = Math.Round(font.Size * 96.0 / 72.0);
 			properties.PropertyChanged += new PropertyChangedEventHandler(PropertyChanged);
 			
-			//textEditorControl.ActiveTextAreaControl.TextArea.DoubleClick += TextEditorControlDoubleClick;
+			MessageViewLinkElementGenerator.RegisterGenerators(textEditor.TextArea.TextView);
-			textEditorControl.DoubleClick += TextEditorControlDoubleClick;
+			textEditor.TextArea.TextView.ElementGenerators.OfType<LinkElementGenerator>().ForEach(x => x.RequireControlModifierForClick = false);
 			
-			toolStrip = ToolbarService.CreateToolStrip(this, "/SharpDevelop/Pads/CompilerMessageView/Toolbar");
+			toolStrip = ToolBarService.CreateToolBar(panel, this, "/SharpDevelop/Pads/CompilerMessageView/Toolbar");
-			toolStrip.Stretch   = true;
+			toolStrip.SetValue(DockPanel.DockProperty, Dock.Top);
-			toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
 			
-			myPanel.Controls.AddRange(new Control[] { textEditorControl, toolStrip} );
+			panel.Children.Add(toolStrip);
+			panel.Children.Add(textEditor);
 			
 			SetWordWrap();
-			myPanel.ResumeLayout(false);
 			DisplayActiveCategory();
 			ProjectService.SolutionLoaded += SolutionLoaded;
 		}
@@ -162,12 +254,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		void SetWordWrap()
 		{
 			bool wordWrap = this.WordWrap;
-			textEditorControl.WordWrap = wordWrap;
+			textEditor.WordWrap = wordWrap;
-			if (wordWrap) {
-				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedVertical;
-			} else {
-				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedBoth;
-			}
 		}
 		
 		#region Category handling
@@ -277,15 +364,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 				text = b.ToString();
 			}
 			
-			//NativeMethods.SetWindowRedraw(textEditorControl.Handle, false);
+			if (clear)
-			if (clear) {
+				textEditor.Text = text;
-				textEditorControl.Text = text;
+			else
-			} else {
+				textEditor.AppendText(text);
-				textEditorControl.SelectionStart = textEditorControl.TextLength;
+			
-				textEditorControl.SelectedText = text;
+			textEditor.ScrollToEnd();
-			}
-			//NativeMethods.SetWindowRedraw(textEditorControl.Handle, true);
-			textEditorControl.SelectionStart = textEditorControl.TextLength;
 		}
 		
 		public void SelectCategory(string categoryName)
@@ -305,8 +389,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				MessageViewCategory category = (MessageViewCategory)messageCategories[i];
 				if (category.Category == categoryName) {
 					selectedCategory = i;
-					textEditorControl.Text = StringParser.Parse(text);
+					textEditor.Text = StringParser.Parse(text);
-					//textEditorControl.Refresh();
 					OnSelectedCategoryIndexChanged(EventArgs.Empty);
 					break;
 				}
@@ -324,35 +407,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		#endregion
 		
-		/// <summary>
-		/// Occurs when the mouse pointer is over the control and a
-		/// mouse button is pressed.
-		/// </summary>
-		void TextEditorControlDoubleClick(object sender, EventArgs e)
-		{
-			string fullText = textEditorControl.Text;
-			// Any text?
-			if (fullText.Length > 0) {
-				//int line = textEditorControl.ActiveTextAreaControl.Caret.Line;
-				//string textLine = TextUtilities.GetLineAsString(textEditorControl.Document, line);
-				Point clickPos = textEditorControl.PointToClient(System.Windows.Forms.Control.MousePosition);
-				int index = textEditorControl.GetCharIndexFromPosition(clickPos);
-				int start = index;
-				// find start of current line
-				while (--start > 0 && fullText[start - 1] != '\n');
-				// find end of current line
-				while (++index < fullText.Length && fullText[index] != '\n');
-				
-				string textLine = fullText.Substring(start, index - start);
-				
-				FileLineReference lineReference = OutputTextLineParser.GetFileLineReference(textLine);
-				if (lineReference != null) {
-					// Open matching file.
-					FileService.JumpToFilePosition(lineReference.FileName, lineReference.Line, lineReference.Column);
-				}
-			}
-		}
-		
 		/// <summary>
 		/// Changes wordwrap settings if that property has changed.
 		/// </summary>
@@ -360,10 +414,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			if (e.Key == "WordWrap") {
 				SetWordWrap();
-				ToolbarService.UpdateToolbar(toolStrip);
 			}
 			if (e.Key == "DefaultFont") {
-				textEditorControl.Font = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", WinFormsResourceService.DefaultMonospacedFont.ToString()).ToString());
+				var font = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", Core.WinForms.WinFormsResourceService.DefaultMonospacedFont.ToString()).ToString());
+				
+				textEditor.FontFamily = new FontFamily(font.FontFamily.Name);
+				textEditor.FontSize = Math.Round(font.Size * 96.0 / 72.0);
 			}
 		}
 		
@@ -393,8 +449,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public bool EnableCopy {
 			get {
-				//return textEditorControl.ActiveTextAreaControl.TextArea.ClipboardHandler.EnableCopy;
+				return textEditor.SelectionLength > 0;
-				return textEditorControl.SelectionLength > 0;
 			}
 		}
 		
@@ -412,8 +467,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public bool EnableSelectAll {
 			get {
-				//return textEditorControl.ActiveTextAreaControl.TextArea.ClipboardHandler.EnableSelectAll;
+				return textEditor.Document.TextLength > 0;
-				return textEditorControl.TextLength > 0;
 			}
 		}
 		
@@ -423,8 +477,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public void Copy()
 		{
-			//textEditorControl.ActiveTextAreaControl.TextArea.ClipboardHandler.Copy(null, null);
+			textEditor.Copy();
-			textEditorControl.Copy();
 		}
 		
 		public void Paste()
@@ -437,8 +490,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public void SelectAll()
 		{
-			//textEditorControl.ActiveTextAreaControl.TextArea.ClipboardHandler.SelectAll(null, null);
+			textEditor.SelectAll();
-			textEditorControl.SelectAll();
 		}
 		#endregion
 	}

src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageViewToolbarCommands.cs

@@ -2,9 +2,11 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Windows.Forms;
+using System.Windows.Controls;
 using ICSharpCode.Core;
-using ICSharpCode.Core.WinForms;
+using ICSharpCode.Core.Presentation;
+
+//using ICSharpCode.Core.WinForms;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
@@ -15,26 +17,28 @@ namespace ICSharpCode.SharpDevelop.Gui
 		protected override void OnOwnerChanged(EventArgs e)
 		{
 			base.OnOwnerChanged(e);
-			ToolBarComboBox toolbarItem = (ToolBarComboBox)base.ComboBox;
+			comboBox = (ComboBox)base.ComboBox;
-			comboBox = toolbarItem.ComboBox;
 			SetItems();
 			CompilerMessageView.Instance.MessageCategoryAdded         += new EventHandler(CompilerMessageViewMessageCategoryAdded);
 			CompilerMessageView.Instance.SelectedCategoryIndexChanged += new EventHandler(CompilerMessageViewSelectedCategoryIndexChanged);
 			comboBox.SelectedIndex = 0;
-			comboBox.SelectedIndexChanged += new EventHandler(ComboBoxSelectedIndexChanged);
+			comboBox.SelectionChanged += new SelectionChangedEventHandler(ComboBoxSelectionChanged);
 		}
+
 		void CompilerMessageViewSelectedCategoryIndexChanged(object sender, EventArgs e)
 		{
 			if (comboBox.SelectedIndex != CompilerMessageView.Instance.SelectedCategoryIndex) {
 				comboBox.SelectedIndex = CompilerMessageView.Instance.SelectedCategoryIndex;
 			}
 		}
-		void ComboBoxSelectedIndexChanged(object sender, EventArgs e)
+		
+		void ComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
 			if (comboBox.SelectedIndex != CompilerMessageView.Instance.SelectedCategoryIndex) {
 				CompilerMessageView.Instance.SelectedCategoryIndex = comboBox.SelectedIndex;
 			}
 		}
+		
 		void CompilerMessageViewMessageCategoryAdded(object sender, EventArgs e)
 		{
 			SetItems();
@@ -46,6 +50,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			foreach (MessageViewCategory category in CompilerMessageView.Instance.MessageCategories) {
 				comboBox.Items.Add(StringParser.Parse(category.DisplayCategory));
 			}
+			comboBox.SelectedIndex = 0;
 		}
 		
 		public override void Run()
@@ -66,8 +71,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 	
 	public class ToggleMessageViewWordWrap : AbstractCheckableMenuCommand
 	{
-		ToolBarCheckBox checkBox;
+
-		
 		public override bool IsChecked {
 			get {
 				return CompilerMessageView.Instance.WordWrap;
@@ -76,12 +80,5 @@ namespace ICSharpCode.SharpDevelop.Gui
 				CompilerMessageView.Instance.WordWrap = value;
 			}
 		}
-		
-		public override object Owner {
-			set {
-				base.Owner = value;
-				checkBox = (ToolBarCheckBox)Owner;
-			}
-		}
 	}
 }

src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/OutputTextLineParser.cs

@@ -80,7 +80,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			FileLineReference result = null;
 			
 			if (lineText != null) {
-				Match match = Regex.Match(lineText, "\\sin\\s([^<>|\"]*?):line\\s(\\d+)?\\r?$", regexOptions);
+				Match match = Regex.Match(lineText, @"\b(\w:[/\\].*?):line\s(\d+)?\r?$", regexOptions);
 				while (match.Success) {
 					try	{
 						int line = Convert.ToInt32(match.Groups[2].Value);