From 8a3241306bdaad7e07dfc31236b2a93241d51151 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Mon, 17 Oct 2005 09:58:54 +0000
Subject: [PATCH] Fixed SD2-488: Highlighting editor does not work for
 addin-defined syntax modes.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@587 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 data/resources/layouts/Debug.xml              | Bin 18132 -> 18824 bytes
 data/resources/layouts/Default.xml            | Bin 18124 -> 17784 bytes
 .../Project/Src/EditHighlightingPanel.cs      |  13 ++++++++++---
 .../Test/ICSharpCode.TextEditor.Test.csproj   |   2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/data/resources/layouts/Debug.xml b/data/resources/layouts/Debug.xml
index 10a4563edfa88503bbcb65d493762b5867b53c67..4814c247f5812129c651fd95c5a046127e572748 100644
GIT binary patch
delta 250
zcmcc8%h)lQal<nvW<v&}%`cfUnJ1r<44b?_jcxM=wgn=SAFx{~2Q#EFWHN*^<TDg8
zWHS^q6fh(*Br~J}MKT%kfO7c^<&y(B-6uP+T1^&^v6=isR%o(-vdCls2e!=>GP@Wj
z3t5OwcF;GPY$Gc*IY3ciGMAdr=3{bQOq&-dM)6PX1B!l7l$q?H%*I~IkP9?8Z}LT1
zRc0dwqsf7)=93+?Jtns(hD`ot;J|1y+1fA|uFBC^aq<t#s>u^nI3`zE&6)hpOm31r
u+hjjOxyj39RW?sBY-60<W~#E;%Gif#vV$$#WG!X6$qK3hn|GN?2?79{txc8y

delta 181
zcmV;m080OelL6F?0kGx*lm0Xcv+x391Cu}nShJ`GrWBJ-8737(0C@mz0AT=a0BHbY
z07w930BitolYbe7lPnxOlaf9Xldc^Ulh8B<lYBB3laMa1lR!HLlU^P0lcF>nlW-+0
zlR!HLlU^MZv#=h#0+X;FAd?^t29p>)5R<YoQj@SG7_+<~3J;S6GC-3+DH4)2Ad_}7
jB9q)G4zo}+dI6IlG$ga`HB17N4n78x&@~>jUN|Zd{}ep#

diff --git a/data/resources/layouts/Default.xml b/data/resources/layouts/Default.xml
index 7e3631dd961909d910f49aceb19cd261d2118ac2..0ec2b291d198f900202eedfdc07a790185f91430 100644
GIT binary patch
delta 138
zcmV;50CoS&jRE+I0k8%GlkPJHle`=XlNKu?lky!Dlkf`~lb|UEvuXpJ7qbi;<^hxb
zDm(!&lkpr!lf)i6ldv8XlQ<n3li(gQlU^S>lS&^Jlh8#5lV%@Cll&hzlimmhlk6W5
slS&{slkf=!lR6*}lb9ellY$@?lja~elh7a*lQbbXlO7=yvw|T?B^#<TO#lD@

delta 191
zcmey-#dxNdaRVDOqse4WW<zFU2Bpc3Y?_l5WY{+6FwYU6yntPf*@(etvY~{hs0%|S
zLmopSLoP!mLo$O0Ln=cKL&4;O{JxVNSgkg5NIzqoY{4ut*+5B+(Qxua1KCMhI$*tt
z8s3wOWUVHzQW2SaK-OZio1EBWJ~@lY``Fng&yo|E90O!eP!*ZHLe6TkfxOt{A3%N`
lkam-|n0y9EPXW>bylj&d6!<1TkhcOF&S)vV*+9WV6#&WTHlY9j

diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs
index 97ee7fa53c..27fc4787f1 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs
@@ -33,8 +33,6 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 		Button  deleteButton;
 		Button  modifyButton;
 				
-		ResourceSyntaxModeProvider modeProvider;
-		
 		public override bool StorePanelContents()
 		{
 			ICSharpCode.TextEditor.Document.HighlightingManager.Manager.ReloadSyntaxModes();
@@ -128,9 +126,18 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 				userList.Items.Add(new HighlightItem(null, str, node));
 			}
 			
+			ISyntaxModeFileProvider modeProvider;
 			modeProvider = new ResourceSyntaxModeProvider();
 			
-			foreach(SyntaxMode mode in modeProvider.SyntaxModes){
+			foreach(SyntaxMode mode in modeProvider.SyntaxModes) {
+				SchemeNode node = LoadFile(modeProvider.GetSyntaxModeFile(mode), false);
+				if (node == null) continue;
+				builtinList.Items.Add(new HighlightItem(mode, null, node));
+			}
+			
+			modeProvider = new ICSharpCode.SharpDevelop.DefaultEditor.Codons.AddInTreeSyntaxModeProvider();
+			
+			foreach(SyntaxMode mode in modeProvider.SyntaxModes) {
 				SchemeNode node = LoadFile(modeProvider.GetSyntaxModeFile(mode), false);
 				if (node == null) continue;
 				builtinList.Items.Add(new HighlightItem(mode, null, node));
diff --git a/src/Libraries/ICSharpCode.TextEditor/Test/ICSharpCode.TextEditor.Test.csproj b/src/Libraries/ICSharpCode.TextEditor/Test/ICSharpCode.TextEditor.Test.csproj
index 327ba55119..4a1f872339 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Test/ICSharpCode.TextEditor.Test.csproj
+++ b/src/Libraries/ICSharpCode.TextEditor/Test/ICSharpCode.TextEditor.Test.csproj
@@ -31,7 +31,7 @@
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+    <Reference Include="NUnit.Framework" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />