From 150dc61917cf664a2a18d9d3113d4fa203a115e4 Mon Sep 17 00:00:00 2001
From: Roman Blum <roman1blum@gmail.com>
Date: Wed, 20 May 2015 13:22:30 +0200
Subject: [PATCH 1/3] fix border for TextEditor

---
 .../ICSharpCode.AvalonEdit/TextEditor.xaml      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.xaml b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.xaml
index da738e09b02..4893f0f4e35 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.xaml
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.xaml
@@ -3,14 +3,17 @@
 	xmlns:AvalonEdit="clr-namespace:ICSharpCode.AvalonEdit"
 	xmlns:editing="clr-namespace:ICSharpCode.AvalonEdit.Editing"
 >
-	<Style TargetType="{x:Type AvalonEdit:TextEditor}">
-		<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-		<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-		<Setter Property="FlowDirection" Value="LeftToRight"/> <!-- AvalonEdit does not support RTL, so ensure we use LTR by default -->
+    <Style TargetType="{x:Type AvalonEdit:TextEditor}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="FlowDirection" Value="LeftToRight"/> <!-- AvalonEdit does not support RTL, so ensure we use LTR by default -->
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type AvalonEdit:TextEditor}">
-					<ScrollViewer
+                    <Border BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+                        Focusable="False">
+                        <ScrollViewer
 						Focusable="False"
 						Name="PART_ScrollViewer"
 						CanContentScroll="True"
@@ -21,9 +24,9 @@
 						HorizontalContentAlignment="Left"
 						Background="{TemplateBinding Background}"
 						Padding="{TemplateBinding Padding}"
-						BorderBrush="{TemplateBinding BorderBrush}"
-						BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderThickness="0"
 					/>
+                    </Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="WordWrap"
 						         Value="True">

From a49d3db8ce3167c87f187170527b12838952c805 Mon Sep 17 00:00:00 2001
From: Roman Blum <roman1blum@gmail.com>
Date: Wed, 20 May 2015 13:22:48 +0200
Subject: [PATCH 2/3] make TextEditor MVVM-friendly

---
 .../ICSharpCode.AvalonEdit/TextEditor.cs      | 57 +++++++++++++++++--
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.cs
index 91e183d46da..a247af69cb9 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.cs
@@ -75,17 +75,62 @@ protected TextEditor(TextArea textArea)
 			
 			SetCurrentValue(OptionsProperty, textArea.Options);
 			SetCurrentValue(DocumentProperty, new TextDocument());
+
+            TextChanged += TextEditor_TextChanged;
 		}
-		
-		#if !DOTNET4
+
+        #region Make TextEditor MVVM-friendly
+
+        /// <summary>
+        /// Occurs when the text has changed.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TextEditor_TextChanged(object sender, EventArgs e)
+        {
+            DocumentText = Text;
+        }
+
+        /// <summary>
+        /// Gets or sets the DocumentText (set a Binding to this Property to support MVVM)
+        /// </summary>
+        public string DocumentText
+        {
+            get { return (string)GetValue(DocumentTextProperty); }
+            set { SetValue(DocumentTextProperty, value); }
+        }
+
+        /// <summary>
+        /// The dependency propety of the Document Text.
+        /// </summary>
+        public static readonly DependencyProperty DocumentTextProperty =
+            DependencyProperty.Register("DocumentText", typeof(string), typeof(TextEditor),
+                new PropertyMetadata(new PropertyChangedCallback(OnDocumentTextChanged)));
+
+        /// <summary>
+        /// Is called when the Text property has changed.
+        /// </summary>
+        /// <param name="d"></param>
+        /// <param name="e"></param>
+        private static void OnDocumentTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            TextEditor textEditor = d as TextEditor;
+            string documentText = e.NewValue as string;
+            if (textEditor.Text != documentText)
+                textEditor.Text = documentText;
+        }
+
+        #endregion
+
+#if !DOTNET4
 		void SetCurrentValue(DependencyProperty property, object value)
 		{
 			SetValue(property, value);
 		}
-		#endif
-		#endregion
-		
-		/// <inheritdoc/>
+#endif
+        #endregion
+
+        /// <inheritdoc/>
 		protected override System.Windows.Automation.Peers.AutomationPeer OnCreateAutomationPeer()
 		{
 			return new TextEditorAutomationPeer(this);

From 201072b646888037da14db1b2b0faeb233791791 Mon Sep 17 00:00:00 2001
From: Roman Blum <roman1blum@gmail.com>
Date: Wed, 20 May 2015 13:23:15 +0200
Subject: [PATCH 3/3] add SQL to highlighting resources

---
 .../Highlighting/Resources/Resources.cs       |   5 +-
 .../Highlighting/Resources/SQL.xshd           | 220 ++++++++++++++++++
 .../ICSharpCode.AvalonEdit.csproj             |   3 +
 3 files changed, 226 insertions(+), 2 deletions(-)
 create mode 100644 src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/SQL.xshd

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Resources.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Resources.cs
index cb74ab88547..f439a2e7194 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Resources.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Resources.cs
@@ -49,8 +49,9 @@ internal static void RegisterBuiltInHighlightings(HighlightingManager.DefaultHig
 			hlm.RegisterHighlighting("Java", new[] { ".java" }, "Java-Mode.xshd");
 			hlm.RegisterHighlighting("Patch", new[] { ".patch", ".diff" }, "Patch-Mode.xshd");
 			hlm.RegisterHighlighting("PowerShell", new[] { ".ps1", ".psm1", ".psd1" }, "PowerShell.xshd");
-			hlm.RegisterHighlighting("PHP", new[] { ".php" }, "PHP-Mode.xshd");
-			hlm.RegisterHighlighting("TeX", new[] { ".tex" }, "Tex-Mode.xshd");
+            hlm.RegisterHighlighting("PHP", new[] { ".php" }, "PHP-Mode.xshd");
+            hlm.RegisterHighlighting("SQL", new[] { ".sql" }, "SQL.xshd");
+            hlm.RegisterHighlighting("TeX", new[] { ".tex" }, "Tex-Mode.xshd");
 			hlm.RegisterHighlighting("VB", new[] { ".vb" }, "VB-Mode.xshd");
 			hlm.RegisterHighlighting("XML", (".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;" +
 			                                 ".xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;" +
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/SQL.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/SQL.xshd
new file mode 100644
index 00000000000..a8930e7bdc3
--- /dev/null
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/SQL.xshd
@@ -0,0 +1,220 @@
+<?xml version="1.0"?>
+<SyntaxDefinition name="sql" extensions=".sql"
+                  xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008">
+  <Color name="String" foreground="Olive" exampleText="string text = &quot;Hello, World!&quot;"/>
+  <Color name="String2" foreground="#993" exampleText="string text = &quot;Hello, World!&quot;"/>
+  <Color name="Comment" foreground="Green" exampleText="string text = &quot;Hello, World!&quot;"/>
+   <Color name="Punctuation" foreground="Red" exampleText="string text = &quot;Hello, World!&quot;"/>
+  <RuleSet  ignoreCase="true">
+    <Span color="String" multiline="true" >
+      <Begin>'</Begin>
+      <End>'</End>
+
+    </Span>
+
+    <Span color="String2" multiline="true"  >
+      <Begin>"</Begin>
+      <End>"</End>
+    </Span>
+    <!-- span for escape sequences -->
+    <Span  color="Comment" begin="--" end="\n"/>
+    <Span color="Comment"  multiline="true">
+      <Begin>/\*</Begin>
+      <End>\*/</End>
+    </Span>
+
+    <Keywords fontWeight="bold" foreground="Blue" >
+      <Word>ABORT</Word>
+      <Word>BETWEEN</Word>
+      <Word>CRASH</Word>
+      <Word>DIGITS</Word>
+      <Word>ACCEPT</Word>
+      <Word>BINARY_INTEGER</Word>
+      <Word>CREATE</Word>
+      <Word>DISPOSE</Word>
+      <Word>ACCESS</Word>
+      <Word>BODY</Word>
+      <Word>CURRENT</Word>
+      <Word>DISTINCT</Word>
+      <Word>ADD</Word>
+      <Word>BOOLEAN</Word>
+      <Word>CURRVAL</Word>
+      <Word>DO</Word>
+      <Word>ALL</Word>
+      <Word>BY</Word>
+      <Word>CURSOR</Word>
+      <Word>DROP</Word>
+      <Word>ALTER</Word>
+      <Word>CASE</Word>
+      <Word>DATABASE</Word>
+      <Word>ELSE</Word>
+      <Word>AND</Word>
+      <Word>CHAR</Word>
+      <Word>DATA_BASE</Word>
+      <Word>ELSIF</Word>
+      <Word>ANY</Word>
+      <Word>CHAR_BASE</Word>
+      <Word>DATE</Word>
+      <Word>END</Word>
+      <Word>ARRAY</Word>
+      <Word>CHECK</Word>
+      <Word>DBA</Word>
+      <Word>ENTRY</Word>
+      <Word>ARRAYLEN</Word>
+      <Word>CLOSE</Word>
+      <Word>DEBUGOFF</Word>
+      <Word>EXCEPTION</Word>
+      <Word>AS</Word>
+      <Word>CLUSTER</Word>
+      <Word>DEBUGON</Word>
+      <Word>EXCEPTION_INIT</Word>
+      <Word>ASC</Word>
+      <Word>CLUSTERS</Word>
+      <Word>DECLARE</Word>
+      <Word>EXISTS</Word>
+      <Word>ASSERT</Word>
+      <Word>COLAUTH</Word>
+      <Word>DECIMAL</Word>
+      <Word>EXIT</Word>
+      <Word>ASSIGN</Word>
+      <Word>COLUMNS</Word>
+      <Word>DEFAULT</Word>
+      <Word>FALSE</Word>
+      <Word>AT</Word>
+      <Word>COMMIT</Word>
+      <Word>DEFINITION</Word>
+      <Word>FETCH</Word>
+      <Word>AUTHORIZATION</Word>
+      <Word>COMPRESS</Word>
+      <Word>DELAY</Word>
+      <Word>FLOAT</Word>
+      <Word>AVG</Word>
+      <Word>CONNECT</Word>
+      <Word>DELETE</Word>
+      <Word>FOR</Word>
+      <Word>BASE_TABLE</Word>
+      <Word>CONSTANT</Word>
+      <Word>DELTA</Word>
+      <Word>FORM</Word>
+      <Word>BEGIN</Word>
+      <Word>COUNT</Word>
+      <Word>DESC</Word>
+      <Word>FROM</Word>
+      <Word>FUNCTION</Word>
+      <Word>NEW</Word>
+      <Word>RELEASE</Word>
+      <Word>SUM</Word>
+      <Word>GENERIC</Word>
+      <Word>NEXTVAL</Word>
+      <Word>REMR</Word>
+      <Word>TABAUTH</Word>
+      <Word>GOTO</Word>
+      <Word>NOCOMPRESS</Word>
+      <Word>RENAME</Word>
+      <Word>TABLE</Word>
+      <Word>GRANT</Word>
+      <Word>NOT</Word>
+      <Word>RESOURCE</Word>
+      <Word>TABLES</Word>
+      <Word>GROUP</Word>
+      <Word>NULL</Word>
+      <Word>RETURN</Word>
+      <Word>TASK</Word>
+      <Word>HAVING</Word>
+      <Word>NUMBER</Word>
+      <Word>REVERSE</Word>
+      <Word>TERMINATE</Word>
+      <Word>IDENTIFIED</Word>
+      <Word>NUMBER_BASE</Word>
+      <Word>REVOKE</Word>
+      <Word>THEN</Word>
+      <Word>IF</Word>
+      <Word>OF</Word>
+      <Word>ROLLBACK</Word>
+      <Word>TO</Word>
+      <Word>IN</Word>
+      <Word>ON</Word>
+      <Word>ROWID</Word>
+      <Word>TRUE</Word>
+      <Word>INDEX</Word>
+      <Word>OPEN</Word>
+      <Word>ROWLABEL</Word>
+      <Word>TYPE</Word>
+      <Word>INDEXES</Word>
+      <Word>OPTION</Word>
+      <Word>ROWNUM</Word>
+      <Word>UNION</Word>
+      <Word>INDICATOR</Word>
+      <Word>OR</Word>
+      <Word>ROWTYPE</Word>
+      <Word>UNIQUE</Word>
+      <Word>INSERT</Word>
+      <Word>ORDER</Word>
+      <Word>RUN</Word>
+      <Word>UPDATE</Word>
+      <Word>INTEGER</Word>
+      <Word>OTHERS</Word>
+      <Word>SAVEPOINT</Word>
+      <Word>USE</Word>
+      <Word>INTERSECT</Word>
+      <Word>OUT</Word>
+      <Word>SCHEMA</Word>
+      <Word>VALUES</Word>
+      <Word>INTO</Word>
+      <Word>PACKAGE</Word>
+      <Word>SELECT</Word>
+      <Word>VARCHAR</Word>
+      <Word>IS</Word>
+      <Word>PARTITION</Word>
+      <Word>SEPARATE</Word>
+      <Word>VARCHAR2</Word>
+      <Word>LEVEL</Word>
+      <Word>PCTFREE</Word>
+      <Word>SET</Word>
+      <Word>VARIANCE</Word>
+      <Word>LIKE</Word>
+      <Word>POSITIVE</Word>
+      <Word>SIZE</Word>
+      <Word>VIEW</Word>
+      <Word>LIMITED</Word>
+      <Word>PRAGMA</Word>
+      <Word>SMALLINT</Word>
+      <Word>VIEWS</Word>
+      <Word>LOOP</Word>
+      <Word>PRIOR</Word>
+      <Word>SPACE</Word>
+      <Word>WHEN</Word>
+      <Word>MAX</Word>
+      <Word>PRIVATE</Word>
+      <Word>SQL</Word>
+      <Word>WHERE</Word>
+      <Word>MIN</Word>
+      <Word>PROCEDURE</Word>
+      <Word>SQLCODE</Word>
+      <Word>WHILE</Word>
+      <Word>MINUS</Word>
+      <Word>PUBLIC</Word>
+      <Word>SQLERRM</Word>
+      <Word>WITH</Word>
+      <Word>MLSLABEL</Word>
+      <Word>RAISE</Word>
+      <Word>START</Word>
+      <Word>WORK</Word>
+      <Word>MOD</Word>
+      <Word>RANGE</Word>
+      <Word>STATEMENT</Word>
+      <Word>XOR</Word>
+      <Word>MODE</Word>
+      <Word>REAL</Word>
+      <Word>STDDEV</Word>
+      <Word>NATURAL</Word>
+      <Word>RECORD</Word>
+      <Word>SUBTYPE</Word>
+    </Keywords>
+    <Rule color="Punctuation">
+      [?,.;()\[\]{}+\-/%*&lt;&gt;^+~!|&amp;]+
+    </Rule>
+
+  </RuleSet>
+
+</SyntaxDefinition>
\ No newline at end of file
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
index 47582f623d4..3327932311d 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
@@ -448,4 +448,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Highlighting\Resources\MarkDown-Mode.xshd" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Highlighting\Resources\SQL.xshd" />
+  </ItemGroup>
 </Project>
\ No newline at end of file