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

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));

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" />