From 132afcb96d72b72d04d223c8aa0ea9610ec45cb9 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Fri, 20 Jul 2012 20:22:29 +0200
Subject: [PATCH 1/7] add Debugger AddIn dependency on ILSpy AddIn - should fix
 http://community.sharpdevelop.net/forums/t/16050.aspx

---
 src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
index 79c009707e..ece8436682 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
@@ -6,6 +6,7 @@
 	
 	<Manifest>
 		<Identity name = "ICSharpCode.Debugger"/>
+		<Dependency addin="ICSharpCode.ILSpyAddIn" />
 	</Manifest>
 	
 	<Runtime>

From 43bbdbe1c6c145c74f67c4c3e2c1ce481c184100 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sun, 22 Jul 2012 23:37:44 +0200
Subject: [PATCH 2/7] fix bug MouseHoverLogic to make it easier to show
 Diff-Tooltip in editor: start MouseHover already on MouseEnter

---
 .../Rendering/MouseHoverLogic.cs              | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs
index 1f6f79d745..25d025b249 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs
@@ -30,25 +30,35 @@ namespace ICSharpCode.AvalonEdit.Rendering
 			this.target = target;
 			this.target.MouseLeave += MouseHoverLogicMouseLeave;
 			this.target.MouseMove += MouseHoverLogicMouseMove;
+			this.target.MouseEnter += MouseHoverLogicMouseEnter;
 		}
-	
+		
 		void MouseHoverLogicMouseMove(object sender, MouseEventArgs e)
 		{
-			Point newPosition = e.GetPosition(this.target);
-			Vector mouseMovement = mouseHoverStartPoint - newPosition;
+			Vector mouseMovement = mouseHoverStartPoint - e.GetPosition(this.target);
 			if (Math.Abs(mouseMovement.X) > SystemParameters.MouseHoverWidth
 			    || Math.Abs(mouseMovement.Y) > SystemParameters.MouseHoverHeight)
 			{
-				StopHovering();
-				mouseHoverStartPoint = newPosition;
-				mouseHoverLastEventArgs = e;
-				mouseHoverTimer = new DispatcherTimer(SystemParameters.MouseHoverTime, DispatcherPriority.Background,
-				                                      OnMouseHoverTimerElapsed, this.target.Dispatcher);
-				mouseHoverTimer.Start();
+				StartHovering(e);
 			}
 			// do not set e.Handled - allow others to also handle MouseMove
 		}
-	
+		
+		void MouseHoverLogicMouseEnter(object sender, MouseEventArgs e)
+		{
+			StartHovering(e);
+			// do not set e.Handled - allow others to also handle MouseEnter
+		}
+		
+		void StartHovering(MouseEventArgs e)
+		{
+			StopHovering();
+			mouseHoverStartPoint = e.GetPosition(this.target);
+			mouseHoverLastEventArgs = e;
+			mouseHoverTimer = new DispatcherTimer(SystemParameters.MouseHoverTime, DispatcherPriority.Background, OnMouseHoverTimerElapsed, this.target.Dispatcher);
+			mouseHoverTimer.Start();
+		}
+		
 		void MouseHoverLogicMouseLeave(object sender, MouseEventArgs e)
 		{
 			StopHovering();
@@ -116,6 +126,7 @@ namespace ICSharpCode.AvalonEdit.Rendering
 			if (!disposed) {
 				this.target.MouseLeave -= MouseHoverLogicMouseLeave;
 				this.target.MouseMove -= MouseHoverLogicMouseMove;
+				this.target.MouseEnter -= MouseHoverLogicMouseEnter;
 			}
 			disposed = true;
 		}

From 326d2410fe35f4e0977f1df6cb057ca2cfe11152 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Mon, 23 Jul 2012 19:13:38 +0200
Subject: [PATCH 3/7] use highlighting customizations in Diff-Tooltip

---
 .../AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs     |  7 +++----
 .../AvalonEdit.AddIn/Src/DiffControl.xaml          |  2 +-
 .../AvalonEdit.AddIn/Src/DiffControl.xaml.cs       | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
index fbf2af3dc1..05da508e74 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
@@ -8,11 +8,11 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
-
 using ICSharpCode.AvalonEdit.Document;
 using ICSharpCode.AvalonEdit.Editing;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Rendering;
+using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Widgets.MyersDiff;
 
@@ -220,11 +220,10 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				}
 				
 				DiffControl differ = new DiffControl();
-				differ.editor.SyntaxHighlighting = editor.SyntaxHighlighting;
+				differ.CopyEditorSettings(editor);
 				differ.editor.HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden;
 				differ.editor.VerticalScrollBarVisibility = ScrollBarVisibility.Hidden;
 				differ.editor.Document.Text = oldText;
-				differ.Background = Brushes.White;
 				
 				if (oldText == string.Empty) {
 					differ.editor.Visibility = Visibility.Collapsed;
@@ -248,7 +247,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				
 				tooltip.Child = new Border() {
 					Child = differ,
-					BorderBrush = Brushes.Black,
+					BorderBrush = editor.TextArea.Foreground,
 					BorderThickness = new Thickness(1)
 				};
 				
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
index b6da3f749d..b0e246c920 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
@@ -3,7 +3,7 @@
              xmlns:sd="http://icsharpcode.net/sharpdevelop/core"
              xmlns:ae="http://icsharpcode.net/sharpdevelop/avalonedit"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	<StackPanel Orientation="Vertical">
+	<StackPanel Orientation="Vertical" Background="White">
 		<ToolBar ToolBarTray.IsLocked="True" ToolBar.OverflowMode="Never">
 			<Button x:Name="revertButton"
 				Content="{sd:Localize AddIns.Subversion.Revert}"
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
index 35b60d4ce3..2e159ff63b 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
@@ -10,8 +10,12 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
+
+using ICSharpCode.AvalonEdit.AddIn.Options;
+using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Rendering;
 using ICSharpCode.Core.Presentation;
+using ICSharpCode.SharpDevelop;
 
 namespace ICSharpCode.AvalonEdit.AddIn
 {
@@ -39,5 +43,15 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				editor.Copy();
 			}
 		}
+		
+		public void CopyEditorSettings(TextEditor source)
+		{
+			string language = source.SyntaxHighlighting != null ? source.SyntaxHighlighting.Name : null;
+			editor.TextArea.TextView.LineTransformers.RemoveWhere(x => x is HighlightingColorizer);
+			editor.TextArea.TextView.LineTransformers.Insert(0, new CustomizableHighlightingColorizer(source.SyntaxHighlighting.MainRuleSet, CustomizedHighlightingColor.FetchCustomizations(language)));
+			CustomizableHighlightingColorizer.ApplyCustomizationsToDefaultElements(editor, CustomizedHighlightingColor.FetchCustomizations(language));
+			HighlightingOptions.ApplyToRendering(editor, CustomizedHighlightingColor.FetchCustomizations(language));
+			editor.TextArea.TextView.Redraw(); // manually redraw if default elements didn't change but customized highlightings did
+		}
 	}
 }
\ No newline at end of file

From 02449aa2b7d44380d9f9271b1a0210c2f1e2e39d Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Mon, 23 Jul 2012 20:57:34 +0200
Subject: [PATCH 4/7] implement escape rules in StringParser

---
 .../Src/Services/StringParser/StringParser.cs        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs b/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs
index d2acec8711..7534438791 100644
--- a/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs
+++ b/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs
@@ -38,6 +38,16 @@ namespace ICSharpCode.Core
 			return dict;
 		}
 		
+		/// <summary>
+		/// Escapes all occurrences of '${' to '${$}{'.
+		/// </summary>
+		public static string Escape(string input)
+		{
+			if (input == null)
+				throw new ArgumentNullException("input");
+			return input.Replace("${", "${$}{");
+		}
+		
 		/// <summary>
 		/// Expands ${xyz} style property values.
 		/// </summary>
@@ -153,6 +163,8 @@ namespace ICSharpCode.Core
 		{
 			if (propertyName == null)
 				throw new ArgumentNullException("propertyName");
+			if (propertyName == "$")
+				return "$";
 			
 			if (customTags != null) {
 				foreach (StringTagPair pair in customTags) {

From edd9edc3ba3c43159f34d12acf82051a9dcffc8c Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Tue, 24 Jul 2012 20:06:33 +0200
Subject: [PATCH 5/7] allow colors from referenced rulesets to be customized

---
 .../Src/ExpressionHighlightRenderer.cs        |  8 +-
 .../Src/Options/HighlightingOptions.xaml.cs   | 78 ++++++++++++++++---
 .../Src/Options/NamedColorHighlightingItem.cs | 15 +++-
 .../Highlighting/HighlightingManager.cs       | 11 ++-
 .../Highlighting/IHighlightingDefinition.cs   | 11 +++
 .../Highlighting/Resources/CSharp-Mode.xshd   |  2 +
 .../Highlighting/Resources/ModeV2.xsd         |  8 ++
 .../Highlighting/Resources/VBNET-Mode.xshd    |  2 +
 .../Highlighting/Resources/XmlDoc.xshd        |  8 +-
 .../Highlighting/Xshd/V2Loader.cs             | 12 +++
 .../Xshd/XmlHighlightingDefinition.cs         | 15 +++-
 .../Highlighting/Xshd/XshdProperty.cs         | 38 +++++++++
 .../ICSharpCode.AvalonEdit.csproj             |  1 +
 13 files changed, 184 insertions(+), 25 deletions(-)
 create mode 100644 src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdProperty.cs

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ExpressionHighlightRenderer.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ExpressionHighlightRenderer.cs
index 925d18ecfe..4c6d2768cf 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ExpressionHighlightRenderer.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ExpressionHighlightRenderer.cs
@@ -22,8 +22,8 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		Pen borderPen;
 		Brush backgroundBrush;
 		TextView textView;
-		readonly Color borderColor = Color.FromArgb(52, 30, 130, 255);	//Color.FromArgb(180, 70, 230, 70))
-		readonly Color fillColor = Color.FromArgb(22, 30, 130, 255); 	//Color.FromArgb(40, 60, 255, 60)
+		public readonly Color DefaultBorderColor = Color.FromArgb(52, 30, 130, 255);	//Color.FromArgb(180, 70, 230, 70))
+		public readonly Color DefaultFillColor = Color.FromArgb(22, 30, 130, 255); 	//Color.FromArgb(40, 60, 255, 60)
 		readonly int borderThickness = 1;
 		readonly int cornerRadius = 1;
 		
@@ -45,8 +45,8 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			if (textView == null)
 				throw new ArgumentNullException("textView");
 			this.textView = textView;
-			this.borderPen = new Pen(new SolidColorBrush(borderColor), borderThickness);
-			this.backgroundBrush = new SolidColorBrush(fillColor);
+			this.borderPen = new Pen(new SolidColorBrush(DefaultBorderColor), borderThickness);
+			this.backgroundBrush = new SolidColorBrush(DefaultFillColor);
 			this.borderPen.Freeze();
 			this.backgroundBrush.Freeze();
 			this.textView.BackgroundRenderers.Add(this);
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
index 5d5892aaf3..ccdffa66bf 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
@@ -171,7 +171,6 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 					from name in typeof(HighlightingManager).Assembly.GetManifestResourceNames().AsParallel()
 					where name.StartsWith(typeof(HighlightingManager).Namespace + ".Resources.", StringComparison.OrdinalIgnoreCase)
 					&& name.EndsWith(".xshd", StringComparison.OrdinalIgnoreCase)
-					&& !name.EndsWith("XmlDoc.xshd", StringComparison.OrdinalIgnoreCase)
 					select LoadBuiltinXshd(name)
 				).Concat(
 					ICSharpCode.Core.AddInTree.BuildItems<AddInTreeSyntaxMode>(SyntaxModeDoozer.Path, null, false).AsParallel()
@@ -187,7 +186,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 			
 			languageComboBox.Items.Clear();
 			languageComboBox.Items.Add(new XshdSyntaxDefinition { Name = "All languages" });
-			foreach (XshdSyntaxDefinition def in allSyntaxDefinitions)
+			foreach (XshdSyntaxDefinition def in allSyntaxDefinitions.Where(d => !d.Name.Equals("XmlDoc", StringComparison.OrdinalIgnoreCase)))
 				languageComboBox.Items.Add(def);
 			if (allSyntaxDefinitions.Count > 0)
 				languageComboBox.SelectedIndex = 0;
@@ -210,7 +209,9 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 					if (def == null) {
 						throw new InvalidOperationException("Expected that all XSHDs are registered in default highlighting manager; but highlighting definition was not found");
 					} else {
-						foreach (XshdColor namedColor in xshd.Elements.OfType<XshdColor>()) {
+						var visitor = new ColorVisitor(allSyntaxDefinitions);
+						xshd.AcceptElements(visitor);
+						foreach (XshdColor namedColor in visitor.foundColors) {
 							if (namedColor.ExampleText != null) {
 								IHighlightingItem item = new NamedColorHighlightingItem(defaultText, namedColor) { ParentDefinition = def };
 								item = new CustomizedHighlightingItem(customizationList, item, xshd.Name);
@@ -225,6 +226,60 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 			}
 		}
 		
+		class ColorVisitor : IXshdVisitor
+		{
+			internal readonly List<XshdColor> foundColors = new List<XshdColor>();
+			readonly HashSet<XshdSyntaxDefinition> visitedDefinitons = new HashSet<XshdSyntaxDefinition>();
+			IList<XshdSyntaxDefinition> allSyntaxDefinitions;
+			
+			public ColorVisitor(IList<XshdSyntaxDefinition> allSyntaxDefinitions)
+			{
+				this.allSyntaxDefinitions = allSyntaxDefinitions;
+			}
+			
+			public object VisitRuleSet(XshdRuleSet ruleSet)
+			{
+				ruleSet.AcceptElements(this);
+				return null;
+			}
+			
+			public object VisitColor(XshdColor color)
+			{
+				foundColors.Add(color);
+				return null;
+			}
+			
+			public object VisitKeywords(XshdKeywords keywords)
+			{
+				return keywords.ColorReference.AcceptVisitor(this);
+			}
+			
+			public object VisitSpan(XshdSpan span)
+			{
+				if (span.RuleSetReference.InlineElement != null)
+					return span.RuleSetReference.AcceptVisitor(this);
+				XshdSyntaxDefinition definition = allSyntaxDefinitions.SingleOrDefault(def => def.Name == span.RuleSetReference.ReferencedDefinition);
+				if (definition != null && visitedDefinitons.Add(definition))
+					foundColors.AddRange(definition.Elements.OfType<XshdColor>());
+				return null;
+			}
+			
+			public object VisitImport(XshdImport import)
+			{
+				if (import.RuleSetReference.InlineElement != null)
+					return import.RuleSetReference.AcceptVisitor(this);
+				XshdSyntaxDefinition definition = allSyntaxDefinitions.SingleOrDefault(def => def.Name == import.RuleSetReference.ReferencedDefinition);
+				if (definition != null && visitedDefinitons.Add(definition))
+					foundColors.AddRange(definition.Elements.OfType<XshdColor>());
+				return null;
+			}
+			
+			public object VisitRule(XshdRule rule)
+			{
+				return rule.ColorReference.AcceptVisitor(this);
+			}
+		}
+		
 		void CreateDefaultEntries(string language, out IHighlightingItem defaultText, IList<IHighlightingItem> items)
 		{
 			// Create entry for "default text/background"
@@ -597,16 +652,15 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 		static readonly MultiDictionary<string, string> mapping = new MultiDictionary<string, string>(StringComparer.Ordinal) {
 			{ "Brace Matching (Rectangle)", BracketHighlightRenderer.BracketHighlight },
 			{ "Collapsible Text", FoldingTextMarkers },
-			{ "Comment", "XML.Comment" },
 			{ "Comment", "VBNET.Comment" },
 			{ "Comment", "C#.Comment" },
 			{ "Compiler Error", ErrorPainter.ErrorColorName },
 			{ "CSS Comment", "CSS.Comment" },
 			{ "CSS Keyword", "" },
-			{ "CSS Property Name", "" },
-			{ "CSS Property Value", "" },
-			{ "CSS Selector", "" },
-			{ "CSS String Value", "" },
+			{ "CSS Property Name", "CSS.Property" },
+			{ "CSS Property Value", "CSS.Value" },
+			{ "CSS Selector", "CSS.Selector" },
+			{ "CSS String Value", "CSS.String" },
 			{ "Excluded Code", "" },
 			{ "HTML Attribute Value", "" },
 			{ "HTML Attribute", "" },
@@ -687,10 +741,10 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 			{ "XAML Name", "" },
 			{ "XAML Text", "" },
 			{ "XML Attribute Quotes", "" },
-			{ "XML Attribute Value", "XML." },
-			{ "XML Attribute", "" },
-			{ "XML CData Section", "" },
-			{ "XML Comment", "" },
+			{ "XML Attribute Value", "XML.AttributeValue" },
+			{ "XML Attribute", "XML.AttributeName" },
+			{ "XML CData Section", "XML.CData" },
+			{ "XML Comment", "XML.Comment" },
 			{ "XML Delimiter", "" },
 			{ "XML Doc Comment", "" },
 			{ "XML Doc Tag", "" },
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs
index 5ecfa112c0..75890d92b2 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs
@@ -2,13 +2,15 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-
 using ICSharpCode.AvalonEdit.Editing;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
+using ICSharpCode.Core;
 
 namespace ICSharpCode.AvalonEdit.AddIn.Options
 {
@@ -127,7 +129,16 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 		
 		public void ShowExample(TextArea exampleTextArea)
 		{
-			exampleTextArea.Document.Text = color.ExampleText;
+			exampleTextArea.Document.Text = StringParser.Parse(color.ExampleText, GetXshdProperties().ToArray());
+		}
+		
+		IEnumerable<StringTagPair> GetXshdProperties()
+		{
+			IHighlightingDefinition2 def = ParentDefinition as IHighlightingDefinition2;
+			if (def == null)
+				yield break;
+			foreach (var p in def.Properties)
+				yield return new StringTagPair(p.Key, p.Value);
 		}
 		
 		event System.ComponentModel.PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged { add {} remove {} }
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs
index 8c86206007..c38a71295a 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs
@@ -20,7 +20,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 	/// </remarks>
 	public class HighlightingManager : IHighlightingDefinitionReferenceResolver
 	{
-		sealed class DelayLoadedHighlightingDefinition : IHighlightingDefinition
+		sealed class DelayLoadedHighlightingDefinition : IHighlightingDefinition2
 		{
 			readonly object lockObj = new object();
 			readonly string name;
@@ -104,6 +104,15 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 			{
 				return this.Name;
 			}
+			
+			public IDictionary<string, string> Properties {
+				get {
+					var def = GetDefinition() as IHighlightingDefinition2;
+					if (def != null)
+						return def.Properties;
+					return null;
+				}
+			}
 		}
 		
 		readonly object lockObj = new object();
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs
index 03eb631b58..7489fb8188 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs
@@ -40,4 +40,15 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 		/// </summary>
 		IEnumerable<HighlightingColor> NamedHighlightingColors { get; }
 	}
+	
+	/// <summary>
+	/// Extension of IHighlightingDefinition to avoid breaking changes in the API.
+	/// </summary>
+	public interface IHighlightingDefinition2 : IHighlightingDefinition
+	{
+		/// <summary>
+		/// Gets the list of properties.
+		/// </summary>
+		IDictionary<string, string> Properties { get; }
+	}
 }
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
index 5c56d04118..cea3101957 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
@@ -27,6 +27,8 @@
 	<Color name="TrueFalse" fontWeight="bold" foreground="DarkCyan" exampleText="b = false; a = true;" />
 	<Color name="TypeKeywords" fontWeight="bold" foreground="DarkCyan" exampleText="if (x is int) { a = x as int; type = typeof(int); size = sizeof(int); c = new object(); }"/>
 	
+	<Property name="DocCommentMarker" value="///" />
+	
 	<RuleSet name="CommentMarkerSet">
 		<Keywords fontWeight="bold" foreground="Red">
 			<Word>TODO</Word>
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV2.xsd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV2.xsd
index f4f9fce1ea..53cd376e26 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV2.xsd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV2.xsd
@@ -50,6 +50,13 @@
 		</xsd:complexType>
 	</xsd:element>
 	
+	<xsd:element name="Property">
+		<xsd:complexType>
+			<xsd:attribute name="name" type="xsd:string" use="required" />
+			<xsd:attribute name="value" type="xsd:string" use="required" />
+		</xsd:complexType>
+	</xsd:element>
+	
 	<!-- Regular expression -->
 	<xsd:simpleType name="regex">
 		<xsd:restriction base="xsd:string"/>
@@ -135,6 +142,7 @@
 	<xsd:element name="SyntaxDefinition">
 		<xsd:complexType>
 			<xsd:choice minOccurs="1" maxOccurs="unbounded">
+				<xsd:element ref="Property"/>
 				<xsd:element ref="Color"/>
 				<xsd:element ref="RuleSet"/>
 			</xsd:choice>
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/VBNET-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/VBNET-Mode.xshd
index 3487615593..b22555a29e 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/VBNET-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/VBNET-Mode.xshd
@@ -18,6 +18,8 @@
 	<Color name="FunctionKeywords" foreground="Blue" exampleText="CInt(a)" />
 	<Color name="ContextKeywords" foreground="Blue" exampleText="Declare Unicode Sub SomeMethod" />
 	
+	<Property name="DocCommentMarker" value="'''" />
+	
 	<RuleSet ignoreCase="true">
 		<Span color="String">
 			<Begin>"</Begin>
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd
index 0b76b92a49..e4303de6af 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <SyntaxDefinition name="XmlDoc" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008">
-	<Color name="XmlString" foreground="Silver" fontWeight="bold" />
-	<Color name="DocComment" foreground="Gray" />
-	<Color name="XmlPunctuation" fontWeight="bold" />
-	<Color name="KnownDocTags" fontWeight="bold" />
+	<Color name="XmlString" foreground="Silver" fontWeight="bold" exampleText="${DocCommentMarker} &lt;exception cref=&quot;System.Exception&quot; /&gt;" />
+	<Color name="DocComment" foreground="Gray" exampleText="${DocCommentMarker} &lt;exception cref=&quot;System.Exception&quot; /&gt;" />
+	<Color name="XmlPunctuation" fontWeight="bold" exampleText="${DocCommentMarker} &lt;exception cref=&quot;System.Exception&quot; /&gt;" />
+	<Color name="KnownDocTags" fontWeight="bold" exampleText="${DocCommentMarker} &lt;exception cref=&quot;System.Exception&quot; /&gt;" />
 	
 	<RuleSet name="DocCommentSet">
 		<Span color="DocComment">
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V2Loader.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V2Loader.cs
index b13c1417b5..93519ae958 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V2Loader.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V2Loader.cs
@@ -64,6 +64,9 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 					case "RuleSet":
 						c.Add(ParseRuleSet(reader));
 						break;
+					case "Property":
+						c.Add(ParseProperty(reader));
+						break;
 					case "Color":
 						c.Add(ParseNamedColor(reader));
 						break;
@@ -85,6 +88,15 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 			}
 		}
 		
+		static XshdElement ParseProperty(XmlReader reader)
+		{
+			XshdProperty property = new XshdProperty();
+			SetPosition(property, reader);
+			property.Name = reader.GetAttribute("name");
+			property.Value = reader.GetAttribute("value");
+			return property;
+		}
+		
 		static XshdRuleSet ParseRuleSet(XmlReader reader)
 		{
 			XshdRuleSet ruleSet = new XshdRuleSet();
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
index d8bae25056..c5a15cf1e7 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
@@ -5,15 +5,15 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Text.RegularExpressions;
-
 using ICSharpCode.AvalonEdit.Utils;
 
 namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 {
 	[Serializable]
-	sealed class XmlHighlightingDefinition : IHighlightingDefinition
+	sealed class XmlHighlightingDefinition : IHighlightingDefinition2
 	{
 		public string Name { get; private set; }
 		
@@ -37,6 +37,9 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 				throw new HighlightingDefinitionInvalidException("Could not find main RuleSet.");
 			// Translate elements within the rulesets (resolving references and processing imports)
 			xshd.AcceptElements(new TranslateElementVisitor(this, rnev.ruleSets, resolver));
+			
+			foreach (var p in xshd.Elements.OfType<XshdProperty>())
+				propDict.Add(p.Name, p.Value);
 		}
 		
 		#region RegisterNamedElements
@@ -358,6 +361,8 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 		
 		Dictionary<string, HighlightingRuleSet> ruleSetDict = new Dictionary<string, HighlightingRuleSet>();
 		Dictionary<string, HighlightingColor> colorDict = new Dictionary<string, HighlightingColor>();
+		[OptionalField]
+		Dictionary<string, string> propDict = new Dictionary<string, string>();
 		
 		public HighlightingRuleSet MainRuleSet { get; private set; }
 		
@@ -391,5 +396,11 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 		{
 			return this.Name;
 		}
+		
+		public IDictionary<string, string> Properties {
+			get {
+				return propDict;
+			}
+		}
 	}
 }
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdProperty.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdProperty.cs
new file mode 100644
index 0000000000..eb5f2c3ee4
--- /dev/null
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdProperty.cs
@@ -0,0 +1,38 @@
+// 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;
+
+namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
+{
+	/// <summary>
+	/// A property in an Xshd file.
+	/// </summary>
+	[Serializable]
+	public class XshdProperty : XshdElement
+	{
+		/// <summary>
+		/// Gets/sets the name.
+		/// </summary>
+		public string Name { get; set; }
+		
+		/// <summary>
+		/// Gets/sets the value.
+		/// </summary>
+		public string Value { get; set; }
+		
+		/// <summary>
+		/// Creates a new XshdColor instance.
+		/// </summary>
+		public XshdProperty()
+		{
+		}
+		
+		/// <inheritdoc/>
+		public override object AcceptVisitor(IXshdVisitor visitor)
+		{
+			return null;
+//			return visitor.VisitProperty(this);
+		}
+	}
+}
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
index 4b76eeda25..3c8bdf8d74 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
@@ -212,6 +212,7 @@
     <Compile Include="Highlighting\Xshd\XmlHighlightingDefinition.cs" />
     <Compile Include="Highlighting\Xshd\XshdColor.cs" />
     <Compile Include="Highlighting\Xshd\XshdImport.cs" />
+    <Compile Include="Highlighting\Xshd\XshdProperty.cs" />
     <Compile Include="Highlighting\Xshd\XshdReference.cs" />
     <Compile Include="Highlighting\Xshd\XshdElement.cs" />
     <Compile Include="Highlighting\Xshd\XshdKeywords.cs" />

From 0da19d4e3b07f3925059c3da2d37be4248654350 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Wed, 1 Aug 2012 21:58:02 +0200
Subject: [PATCH 6/7] add support for customized colors to SearchResultsPad

---
 .../Src/AvalonEditSyntaxHighlighterAdapter.cs | 86 +++++++++++++++++++
 .../Src/AvalonEditorControlService.cs         | 14 +++
 .../Src/CustomizableHighlightingColorizer.cs  |  2 +-
 .../Project/Engine/SearchManager.cs           | 12 ++-
 .../Project/Gui/ResultsTreeView.xaml          |  1 +
 .../Project/Gui/SearchNode.cs                 | 12 +++
 .../Project/Gui/SearchResultNode.cs           | 22 ++++-
 .../Highlighting/HighlightedInlineBuilder.cs  | 36 ++++++++
 .../Highlighting/HighlightedLine.cs           |  4 +
 .../Highlighting/IHighlighter.cs              |  5 ++
 .../Src/Editor/IEditorControlService.cs       |  7 ++
 .../Project/Src/Editor/ISyntaxHighlighter.cs  | 10 +++
 .../Src/Editor/Search/SearchResultMatch.cs    | 14 ++-
 .../Src/Editor/Search/SearchResultsPad.cs     | 16 ++--
 .../FindReferencesAndRenameHelper.cs          | 14 ++-
 15 files changed, 223 insertions(+), 32 deletions(-)

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditSyntaxHighlighterAdapter.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditSyntaxHighlighterAdapter.cs
index dedbc04857..4c5ff8dad1 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditSyntaxHighlighterAdapter.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditSyntaxHighlighterAdapter.cs
@@ -49,5 +49,91 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				return null;
 			return CustomizableHighlightingColorizer.CustomizeColor(name, CustomizedHighlightingColor.FetchCustomizations(highlighting.Name));
 		}
+		
+		public HighlightedInlineBuilder BuildInlines(int lineNumber)
+		{
+			HighlightedInlineBuilder builder = new HighlightedInlineBuilder(textEditor.Document.GetText(textEditor.Document.GetLineByNumber(lineNumber)));
+			IHighlighter highlighter = textEditor.GetService(typeof(IHighlighter)) as IHighlighter;
+			if (highlighter != null) {
+				HighlightedLine highlightedLine = highlighter.HighlightLine(lineNumber);
+				int startOffset = highlightedLine.DocumentLine.Offset;
+				// copy only the foreground and background colors
+				foreach (HighlightedSection section in highlightedLine.Sections) {
+					if (section.Color.Foreground != null) {
+						builder.SetForeground(section.Offset - startOffset, section.Length, section.Color.Foreground.GetBrush(null));
+					}
+					if (section.Color.Background != null) {
+						builder.SetBackground(section.Offset - startOffset, section.Length, section.Color.Background.GetBrush(null));
+					}
+				}
+			}
+			return builder;
+		}
+		
+		public HighlightingColor DefaultTextColor {
+			get {
+				return GetNamedColor(CustomizableHighlightingColorizer.DefaultTextAndBackground);
+			}
+		}
+	}
+	
+	public class DocumentSyntaxHighlighter : ISyntaxHighlighter
+	{
+		IDocument document;
+		IHighlighter highlighter;
+		string highlightingName;
+		
+		public DocumentSyntaxHighlighter(IDocument document, IHighlighter highlighter, string highlightingName)
+		{
+			if (document == null)
+				throw new ArgumentNullException("document");
+			this.document = document;
+			this.highlighter = highlighter;
+			this.highlightingName = highlightingName;
+		}
+		
+		public IEnumerable<string> GetSpanColorNamesFromLineStart(int lineNumber)
+		{
+			if (highlighter != null) {
+				// delayed evaluation doesn't cause a problem here: GetSpanStack is called immediately,
+				// only the where/select portian is evaluated later. But that won't be a problem because the
+				// HighlightingSpan instance shouldn't change once it's in use.
+				return from span in highlighter.GetSpanStack(lineNumber - 1)
+					where span.SpanColor != null && span.SpanColor.Name != null
+					select span.SpanColor.Name;
+			} else {
+				return Enumerable.Empty<string>();
+			}
+		}
+		
+		public HighlightingColor GetNamedColor(string name)
+		{
+			return CustomizableHighlightingColorizer.CustomizeColor(name, CustomizedHighlightingColor.FetchCustomizations(highlightingName));
+		}
+		
+		public HighlightedInlineBuilder BuildInlines(int lineNumber)
+		{
+			HighlightedInlineBuilder builder = new HighlightedInlineBuilder(document.GetLine(lineNumber).Text);
+			if (highlighter != null) {
+				HighlightedLine highlightedLine = highlighter.HighlightLine(lineNumber);
+				int startOffset = highlightedLine.DocumentLine.Offset;
+				// copy only the foreground and background colors
+				foreach (HighlightedSection section in highlightedLine.Sections) {
+					if (section.Color.Foreground != null) {
+						builder.SetForeground(section.Offset - startOffset, section.Length, section.Color.Foreground.GetBrush(null));
+					}
+					if (section.Color.Background != null) {
+						builder.SetBackground(section.Offset - startOffset, section.Length, section.Color.Background.GetBrush(null));
+					}
+				}
+			}
+			return builder;
+		}
+		
+		public HighlightingColor DefaultTextColor {
+			get {
+				return GetNamedColor(CustomizableHighlightingColorizer.DefaultTextAndBackground);
+			}
+		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditorControlService.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditorControlService.cs
index 63c879f656..d0ba3b7e5d 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditorControlService.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditorControlService.cs
@@ -2,7 +2,10 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
+using System.IO;
 using ICSharpCode.AvalonEdit.AddIn.Options;
+using ICSharpCode.AvalonEdit.Document;
+using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Editor.AvalonEdit;
 
@@ -24,5 +27,16 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			control = editor;
 			return new CodeCompletionEditorAdapter(editor);
 		}
+		
+		public ISyntaxHighlighter CreateHighlighter(IDocument document, string fileName)
+		{
+			var def = HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(fileName));
+			var doc = document.GetService(typeof(TextDocument)) as TextDocument;
+			if (def == null || doc == null)
+				return null;
+			var baseHighlighter = new DocumentHighlighter(doc, def.MainRuleSet);
+			var highlighter = new CustomizableHighlightingColorizer.CustomizingHighlighter(CustomizedHighlightingColor.FetchCustomizations(def.Name), baseHighlighter);
+			return new DocumentSyntaxHighlighter(document, highlighter, def.Name);
+		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CustomizableHighlightingColorizer.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CustomizableHighlightingColorizer.cs
index 7cd9817fa0..c240093ba2 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CustomizableHighlightingColorizer.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CustomizableHighlightingColorizer.cs
@@ -136,7 +136,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			return new CustomizingHighlighter(customizations, base.CreateHighlighter(textView, document));
 		}
 		
-		sealed class CustomizingHighlighter : IHighlighter
+		internal sealed class CustomizingHighlighter : IHighlighter
 		{
 			readonly IEnumerable<CustomizedHighlightingColor> customizations;
 			readonly IHighlighter baseHighlighter;
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchManager.cs b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchManager.cs
index 4bc9bae531..520d5e9d94 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchManager.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchManager.cs
@@ -16,6 +16,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Editor.AvalonEdit;
 using ICSharpCode.SharpDevelop.Editor.Search;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
@@ -196,7 +197,7 @@ namespace SearchAndReplace
 				
 				var source = DocumentUtilitites.GetTextSource(buffer);
 				TextDocument document = null;
-				DocumentHighlighter highlighter = null;
+				ISyntaxHighlighter highlighter = null;
 				int offset = 0;
 				int length = source.TextLength;
 				if (Target == SearchTarget.CurrentSelection && Selection != null) {
@@ -209,15 +210,12 @@ namespace SearchAndReplace
 					if (document == null) {
 						document = new TextDocument(source);
 						var highlighting = HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(fileName));
-						if (highlighting != null)
-							highlighter = new DocumentHighlighter(document, highlighting.MainRuleSet);
-						else
-							highlighter = null;
+						highlighter = EditorControlService.Instance.CreateHighlighter(new AvalonEditDocumentAdapter(document, null), fileName);
 					}
 					var start = document.GetLocation(result.Offset).ToLocation();
 					var end = document.GetLocation(result.Offset + result.Length).ToLocation();
 					var builder = SearchResultsPad.CreateInlineBuilder(start, end, document, highlighter);
-					results.Add(new AvalonEditSearchResultMatch(fileName, start, end, result.Offset, result.Length, builder, result));
+					results.Add(new AvalonEditSearchResultMatch(fileName, start, end, result.Offset, result.Length, builder, highlighter.DefaultTextColor, result));
 				}
 				if (results.Count > 0)
 					return new SearchedFile(fileName, results);
@@ -317,7 +315,7 @@ namespace SearchAndReplace
 				if (result != null) {
 					var start = document.OffsetToPosition(result.Offset);
 					var end = document.OffsetToPosition(result.EndOffset);
-					return new AvalonEditSearchResultMatch(file, start, end, result.Offset, result.Length, null, result);
+					return new AvalonEditSearchResultMatch(file, start, end, result.Offset, result.Length, null, null, result);
 				}
 				return null;
 			}
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Gui/ResultsTreeView.xaml b/src/AddIns/Misc/SearchAndReplace/Project/Gui/ResultsTreeView.xaml
index 5887c54bac..61b28cafbf 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Gui/ResultsTreeView.xaml
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Gui/ResultsTreeView.xaml
@@ -6,6 +6,7 @@
 	<TreeView.ItemContainerStyle>
 		<Style TargetType="{x:Type TreeViewItem}">
 			<Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+			<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
 		</Style>
 	</TreeView.ItemContainerStyle>
 	
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchNode.cs b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchNode.cs
index 284a776150..ae5b5b8937 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchNode.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchNode.cs
@@ -23,6 +23,18 @@ namespace SearchAndReplace
 			}
 		}
 		
+		bool isSelected;
+		
+		public bool IsSelected {
+			get { return isSelected; }
+			set {
+				if (isSelected != value) {
+					isSelected = value;
+					OnPropertyChanged("IsSelected");
+				}
+			}
+		}
+		
 		IEnumerable<SearchNode> children;
 		
 		public IEnumerable<SearchNode> Children {
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchResultNode.cs b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchResultNode.cs
index 2f515b41ab..8ce41b8cc7 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchResultNode.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchResultNode.cs
@@ -56,6 +56,12 @@ namespace SearchAndReplace
 			LoggingService.Debug("Creating text for search result (" + location.Line + ", " + location.Column + ") ");
 			
 			TextBlock textBlock = new TextBlock();
+			if (result.DefaultTextColor != null && !IsSelected) {
+				if (result.DefaultTextColor.Background != null)
+					textBlock.Background = result.DefaultTextColor.Background.GetBrush(null);
+				if (result.DefaultTextColor.Foreground != null)
+					textBlock.Foreground = result.DefaultTextColor.Foreground.GetBrush(null);
+			}
 			textBlock.FontFamily = new FontFamily(EditorControlService.GlobalOptions.FontFamily);
 
 			textBlock.Inlines.Add("(" + location.Line + ", " + location.Column + ")\t");
@@ -64,7 +70,13 @@ namespace SearchAndReplace
 			if (displayText != null) {
 				textBlock.Inlines.Add(displayText);
 			} else if (result.Builder != null) {
-				textBlock.Inlines.AddRange(result.Builder.CreateRuns());
+				HighlightedInlineBuilder builder = result.Builder;
+				if (IsSelected) {
+					builder = builder.Clone();
+					builder.SetForeground(0, builder.Text.Length, null);
+					builder.SetBackground(0, builder.Text.Length, null);
+				}
+				textBlock.Inlines.AddRange(builder.CreateRuns());
 			}
 			
 			if (showFileName) {
@@ -78,6 +90,14 @@ namespace SearchAndReplace
 			return textBlock;
 		}
 		
+		protected override void OnPropertyChanged(string propertyName)
+		{
+			base.OnPropertyChanged(propertyName);
+			if (propertyName == "IsSelected") {
+				InvalidateText();
+			}
+		}
+		
 		public override void ActivateItem()
 		{
 			FileService.JumpToFilePosition(anchor.FileName, anchor.Location.Line, anchor.Location.Column);
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedInlineBuilder.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedInlineBuilder.cs
index 0e82d2966b..da1fac04b7 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedInlineBuilder.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedInlineBuilder.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Media;
@@ -24,6 +25,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 		sealed class HighlightingState
 		{
 			internal Brush Foreground;
+			internal Brush Background;
 			internal FontFamily Family;
 			internal FontWeight? Weight;
 			internal FontStyle? Style;
@@ -32,6 +34,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 			{
 				return new HighlightingState {
 					Foreground = this.Foreground,
+					Background = this.Background,
 					Family = this.Family,
 					Weight = this.Weight,
 					Style = this.Style
@@ -70,6 +73,13 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 			stateChanges.Add(new HighlightingState());
 		}
 		
+		HighlightedInlineBuilder(string text, int[] offsets, HighlightingState[] states)
+		{
+			this.text = text;
+			stateChangeOffsets.AddRange(offsets);
+			stateChanges.AddRange(states);
+		}
+		
 		/// <summary>
 		/// Gets the text.
 		/// </summary>
@@ -96,6 +106,8 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 				HighlightingState state = stateChanges[i];
 				if (color.Foreground != null)
 					state.Foreground = color.Foreground.GetBrush(null);
+				if (color.Background != null)
+					state.Background = color.Background.GetBrush(null);
 				if (color.FontStyle != null)
 					state.Style = color.FontStyle;
 				if (color.FontWeight != null)
@@ -115,6 +127,18 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 			}
 		}
 		
+		/// <summary>
+		/// Sets the background brush on the specified text segment.
+		/// </summary>
+		public void SetBackground(int offset, int length, Brush brush)
+		{
+			int startIndex = GetIndexForOffset(offset);
+			int endIndex = GetIndexForOffset(offset + length);
+			for (int i = startIndex; i < endIndex; i++) {
+				stateChanges[i].Background = brush;
+			}
+		}
+		
 		/// <summary>
 		/// Sets the font weight on the specified text segment.
 		/// </summary>
@@ -164,6 +188,8 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 				HighlightingState state = stateChanges[i];
 				if (state.Foreground != null)
 					r.Foreground = state.Foreground;
+				if (state.Background != null)
+					r.Background = state.Background;
 				if (state.Weight != null)
 					r.FontWeight = state.Weight.Value;
 				if (state.Family != null)
@@ -174,5 +200,15 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 			}
 			return runs;
 		}
+		
+		/// <summary>
+		/// Clones this HighlightedInlineBuilder.
+		/// </summary>
+		public HighlightedInlineBuilder Clone()
+		{
+			return new HighlightedInlineBuilder(this.text,
+			                                    stateChangeOffsets.ToArray(), 
+			                                    stateChanges.Select(sc => sc.Clone()).ToArray());
+		}
 	}
 }
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs
index 31c225140a..2e2241619f 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs
@@ -49,6 +49,10 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 		/// </summary>
 		public IList<HighlightedSection> Sections { get; private set; }
 		
+		/// <summary>
+		/// Gets the default color of all text outside a <see cref="HighlightedSection"/>.
+		/// </summary>
+		public HighlightingColor DefaultTextColor { get; set; }
 		
 		sealed class HtmlElement : IComparable<HtmlElement>
 		{
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlighter.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlighter.cs
index 9207fcea45..0a1b9e0521 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlighter.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlighter.cs
@@ -32,4 +32,9 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 		/// <returns>A <see cref="HighlightedLine"/> line object that represents the highlighted sections.</returns>
 		HighlightedLine HighlightLine(int lineNumber);
 	}
+	
+	public interface IHighlighter2
+	{
+		
+	}
 }
diff --git a/src/Main/Base/Project/Src/Editor/IEditorControlService.cs b/src/Main/Base/Project/Src/Editor/IEditorControlService.cs
index aeea909e15..9cbe060a8d 100644
--- a/src/Main/Base/Project/Src/Editor/IEditorControlService.cs
+++ b/src/Main/Base/Project/Src/Editor/IEditorControlService.cs
@@ -3,6 +3,7 @@
 
 using System;
 using ICSharpCode.AvalonEdit;
+using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.SharpDevelop.Editor.AvalonEdit;
 
 namespace ICSharpCode.SharpDevelop.Editor
@@ -14,6 +15,7 @@ namespace ICSharpCode.SharpDevelop.Editor
 	{
 		ITextEditor CreateEditor(out object control);
 		ITextEditorOptions GlobalOptions { get; }
+		ISyntaxHighlighter CreateHighlighter(IDocument document, string fileName);
 	}
 	
 	/// <summary>
@@ -91,6 +93,11 @@ namespace ICSharpCode.SharpDevelop.Editor
 					return "Consolas";
 				}
 			}
+			
+			public ISyntaxHighlighter CreateHighlighter(IDocument document, string fileName)
+			{
+				return null;
+			}
 		}
 	}
 }
diff --git a/src/Main/Base/Project/Src/Editor/ISyntaxHighlighter.cs b/src/Main/Base/Project/Src/Editor/ISyntaxHighlighter.cs
index c91941de16..30ea587c5d 100644
--- a/src/Main/Base/Project/Src/Editor/ISyntaxHighlighter.cs
+++ b/src/Main/Base/Project/Src/Editor/ISyntaxHighlighter.cs
@@ -23,6 +23,16 @@ namespace ICSharpCode.SharpDevelop.Editor
 		/// Retrieves the HighlightingColor with the specified name. Returns null if no color matching the name is found.
 		/// </summary>
 		HighlightingColor GetNamedColor(string name);
+		
+		/// <summary>
+		/// Creates a <see cref="HighlightedInlineBuilder"/> for a specified line.
+		/// </summary>
+		HighlightedInlineBuilder BuildInlines(int lineNumber);
+		
+		/// <summary>
+		/// Gets the default text color.
+		/// </summary>
+		HighlightingColor DefaultTextColor { get; }
 	}
 	
 	public static class SyntaxHighligherKnownSpanNames
diff --git a/src/Main/Base/Project/Src/Editor/Search/SearchResultMatch.cs b/src/Main/Base/Project/Src/Editor/Search/SearchResultMatch.cs
index 4fade66fb5..e84b93e9d1 100644
--- a/src/Main/Base/Project/Src/Editor/Search/SearchResultMatch.cs
+++ b/src/Main/Base/Project/Src/Editor/Search/SearchResultMatch.cs
@@ -22,6 +22,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 		Location startLocation;
 		Location endLocation;
 		HighlightedInlineBuilder builder;
+		HighlightingColor defaultTextColor;
 		
 		public FileName FileName {
 			get { return fileName; }
@@ -39,6 +40,10 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 			get { return builder; }
 		}
 		
+		public HighlightingColor DefaultTextColor {
+			get { return defaultTextColor; }
+		}
+		
 		public int StartOffset {
 			get { return offset; }
 		}
@@ -56,7 +61,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 			return pattern;
 		}
 		
-		public SearchResultMatch(FileName fileName, Location startLocation, Location endLocation, int offset, int length, HighlightedInlineBuilder builder)
+		public SearchResultMatch(FileName fileName, Location startLocation, Location endLocation, int offset, int length, HighlightedInlineBuilder builder, HighlightingColor defaultTextColor)
 		{
 			this.fileName = fileName;
 			this.startLocation = startLocation;
@@ -64,6 +69,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 			this.offset = offset;
 			this.length = length;
 			this.builder = builder;
+			this.defaultTextColor = defaultTextColor;
 		}
 		
 		/// <summary>
@@ -94,7 +100,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 		}
 		
 		public SimpleSearchResultMatch(FileName fileName, Location position, int offset, string displayText)
-			: base(fileName, position, position, offset, 0, null)
+			: base(fileName, position, position, offset, 0, null, null)
 		{
 			this.displayText = displayText;
 		}
@@ -104,8 +110,8 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 	{
 		ICSharpCode.AvalonEdit.Search.ISearchResult match;
 		
-		public AvalonEditSearchResultMatch(FileName fileName, Location startLocation, Location endLocation, int offset, int length, HighlightedInlineBuilder builder, ICSharpCode.AvalonEdit.Search.ISearchResult match)
-			: base(fileName, startLocation, endLocation, offset, length, builder)
+		public AvalonEditSearchResultMatch(FileName fileName, Location startLocation, Location endLocation, int offset, int length, HighlightedInlineBuilder builder, HighlightingColor defaultTextColor, ICSharpCode.AvalonEdit.Search.ISearchResult match)
+			: base(fileName, startLocation, endLocation, offset, length, builder, defaultTextColor)
 		{
 			this.match = match;
 		}
diff --git a/src/Main/Base/Project/Src/Editor/Search/SearchResultsPad.cs b/src/Main/Base/Project/Src/Editor/Search/SearchResultsPad.cs
index f591491911..153673bfb3 100644
--- a/src/Main/Base/Project/Src/Editor/Search/SearchResultsPad.cs
+++ b/src/Main/Base/Project/Src/Editor/Search/SearchResultsPad.cs
@@ -147,20 +147,14 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
 			return new DummySearchResult { Text = title };
 		}
 		
-		public static HighlightedInlineBuilder CreateInlineBuilder(Location startPosition, Location endPosition, TextDocument document, IHighlighter highlighter)
+		public static HighlightedInlineBuilder CreateInlineBuilder(Location startPosition, Location endPosition, TextDocument document, ISyntaxHighlighter highlighter)
 		{
 			if (startPosition.Line >= 1 && startPosition.Line <= document.LineCount) {
-				var matchedLine = document.GetLineByNumber(startPosition.Line);
-				HighlightedInlineBuilder inlineBuilder = new HighlightedInlineBuilder(document.GetText(matchedLine));
+				HighlightedInlineBuilder inlineBuilder;
 				if (highlighter != null) {
-					HighlightedLine highlightedLine = highlighter.HighlightLine(startPosition.Line);
-					int startOffset = highlightedLine.DocumentLine.Offset;
-					// copy only the foreground color
-					foreach (HighlightedSection section in highlightedLine.Sections) {
-						if (section.Color.Foreground != null) {
-							inlineBuilder.SetForeground(section.Offset - startOffset, section.Length, section.Color.Foreground.GetBrush(null));
-						}
-					}
+					inlineBuilder = highlighter.BuildInlines(startPosition.Line);
+				} else {
+					inlineBuilder = new HighlightedInlineBuilder(document.GetText(document.GetLineByNumber(startPosition.Line)));
 				}
 				
 				// now highlight the match in bold
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs
index 1df6f929f5..f06f0aba78 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs
@@ -375,23 +375,21 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			if (list == null) return;
 			List<SearchResultMatch> results = new List<SearchResultMatch>(list.Count);
 			TextDocument document = null;
+			ITextBuffer buffer = null;
 			FileName fileName = null;
-			IHighlighter highlighter = null;
+			ISyntaxHighlighter highlighter = null;
 			foreach (Reference r in list) {
 				var f = new FileName(r.FileName);
 				if (document == null || !f.Equals(fileName)) {
-					document = new TextDocument(DocumentUtilitites.GetTextSource(ParserService.GetParseableFileContent(r.FileName)));
+					buffer = ParserService.GetParseableFileContent(r.FileName);
+					document = new TextDocument(DocumentUtilitites.GetTextSource(buffer));
 					fileName = new FileName(r.FileName);
-					var def = HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(r.FileName));
-					if (def != null)
-						highlighter = new DocumentHighlighter(document, def.MainRuleSet);
-					else
-						highlighter = null;
+					highlighter = EditorControlService.Instance.CreateHighlighter(new AvalonEditDocumentAdapter(document, null), fileName);
 				}
 				var start = document.GetLocation(r.Offset).ToLocation();
 				var end = document.GetLocation(r.Offset + r.Length).ToLocation();
 				var builder = SearchResultsPad.CreateInlineBuilder(start, end, document, highlighter);
-				SearchResultMatch res = new SearchResultMatch(fileName, start, end, r.Offset, r.Length, builder);
+				SearchResultMatch res = new SearchResultMatch(fileName, start, end, r.Offset, r.Length, builder, highlighter.DefaultTextColor);
 				results.Add(res);
 			}
 			SearchResultsPad.Instance.ShowSearchResults(title, results);

From c205964d87e703a3dab87cba21fcec083feb1940 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sat, 4 Aug 2012 18:07:39 +0200
Subject: [PATCH 7/7] fix import/export of nested named colors

---
 .../Src/Options/HighlightingOptions.xaml.cs            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
index ccdffa66bf..d65a04e770 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
@@ -638,7 +638,9 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 				var highlighting = HighlightingManager.Instance.GetDefinition(language);
 				item = null;
 				if (def != null && highlighting != null) {
-					var color = def.Elements.OfType<XshdColor>().FirstOrDefault(i => i.Name == sdKey);
+					var visitor = new ColorVisitor(allSyntaxDefinitions);
+					def.AcceptElements(visitor);
+					var color = visitor.foundColors.FirstOrDefault(i => i.Name == sdKey);
 					if (color != null) {
 						item = new NamedColorHighlightingItem(defaultText, color) { ParentDefinition = highlighting };
 						item = new CustomizedHighlightingItem(customizationList, item, language);
@@ -746,8 +748,10 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 			{ "XML CData Section", "XML.CData" },
 			{ "XML Comment", "XML.Comment" },
 			{ "XML Delimiter", "" },
-			{ "XML Doc Comment", "" },
-			{ "XML Doc Tag", "" },
+			{ "XML Doc Comment", "C#.DocComment" },
+			{ "XML Doc Tag", "C#.KnownDocTags" },
+			{ "XML Doc Comment", "VBNET.DocComment" },
+			{ "XML Doc Tag", "VBNET.KnownDocTags" },
 			{ "XML Name", "" },
 			{ "XML Text", "" },
 		};