Merge pull request #9033 from mono/dev/david/fix959380

Fix 959380: TextMate tagger does not work with extensions (VS compat issue)

Author: David Karlaš

main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/TextMate/CustomRepositoryService.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TextMate.Core.Hosting;
+using Mono.Addins;
+using MonoDevelop.TextEditor;
 
 namespace Microsoft.VisualStudio.TextMate.VSMac
 {
@@ -21,6 +21,10 @@ sealed class CustomRepositoryService : ICustomRepositoryService
 			{
 				(starterKitPath, Path.Combine (starterKitPath, "TextMate.cache"))
 			};
+			foreach (var node in AddinManager.GetExtensionNodes<TextMateRepositoryExtensionNode> ("/MonoDevelop/Ide/Editor/TextMate")) {
+				var path = node.Addin.GetFilePath(node.FolderPath);
+				collectionPaths.Add ((path, Path.Combine (path, "TextMate.cache")));
+			}
 
 			return Task.FromResult<IList<(string, string)>> (collectionPaths);
 		}

main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/Properties/MonoDevelop.TextEditor.addin.xml

@@ -336,4 +336,8 @@
 	</Extension>
 
 -->
+	<ExtensionPoint path = "/MonoDevelop/Ide/Editor/TextMate" name = "TextMate folder">
+		<Description>TextMate folder with syntax highlighting definitions, code snippets and syntax color themes</Description>
+		<ExtensionNode name="Repository" type="MonoDevelop.TextEditor.TextMateRepositoryExtensionNode"/>
+	</ExtensionPoint>
 </ExtensionModel>

main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/RepositoryExtensionNode.cs

@@ -0,0 +1,11 @@
+using System;
+using Mono.Addins;
+
+namespace MonoDevelop.TextEditor
+{
+	internal class TextMateRepositoryExtensionNode : ExtensionNode
+	{
+		[NodeAttribute ("folderPath")]
+		public string FolderPath { get; set; }
+	}
+}

main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs

@@ -126,9 +126,9 @@ public void Dispose ()
 			("Preprocessor Keyword", "Preprocessor"),
 			("Operator", "Keyword(Operator)"),
 			("Literal", "Number"),
-			("Markup Attribute", ""),
-			("Markup Attribute Value", ""),
-			("Markup Node", ""),
+			("Markup Attribute", "Xml Attribute"),
+			("Markup Attribute Value", "Xml Attribute Value"),
+			("Markup Node", "Xml Name"),
 			("String", "String"),
 			("Type", "User Types"),
 			("Number", "Number"),