Merge pull request #104 from lordfanger/html-editor

Support for another HTML editor [release]
madskristensen · Aug 16, 2023 · d72df3e · d72df3e
2 parents dec5b74 + 4448d12
commit d72df3e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/Tagger/RainbowTagger.cs b/src/Tagger/RainbowTagger.cs
@@ -636,6 +636,7 @@ private static AllowanceResolver GetAllowanceResolver(ITextBuffer buffer)
                 "LEGACYRAZORVISUALBASIC" => new RazorAllowanceResolver(),
                 "WEBFORMS" => new RazorAllowanceResolver(),
                 "LEGACYRAZORCSHARP" => new RazorAllowanceResolver(),
+                "HTML-DELEGATION" => new RazorAllowanceResolver(),
                 _ => new DefaultAllowanceResolver()
             };
 

diff --git a/src/Tagger/RainbowTaggerProvider.cs b/src/Tagger/RainbowTaggerProvider.cs
@@ -29,6 +29,7 @@ namespace RainbowBraces
     [ContentType("Razor")]
     [ContentType("LegacyRazorVisualBasic")]
     [ContentType("WebForms")]
+    [ContentType("html-delegation")]
     [TextViewRole(PredefinedTextViewRoles.PrimaryDocument)]
     [TextViewRole(PredefinedTextViewRoles.EmbeddedPeekTextView)]
     [TextViewRole(CustomTextViewRoles.StickyScroll)]
@@ -91,6 +92,7 @@ static bool IsSuportedHtmlTextBufferContentType(IContentType contentType)
             {
                 if (contentType.IsOfType("HTMLProjection")) return true;
                 if (contentType.IsOfType("WebFormsProjection")) return true;
+                if (contentType.IsOfType("html-delegation")) return true;
                 return false;
             }
 
@@ -101,6 +103,7 @@ static bool IsSupportedHtmlContentType(IContentType contentType)
                 if (contentType.IsOfType("CSharp")) return true;
                 if (contentType.IsOfType("WebForms")) return true;
                 if (contentType.IsOfType("LegacyRazorCSharp")) return true;
+                if (contentType.IsOfType("html-delegation")) return true;
                 return false;
             }
         }

diff --git a/src/Tagger/RazorAllowanceResolver.cs b/src/Tagger/RazorAllowanceResolver.cs
@@ -27,9 +27,13 @@ public class RazorAllowanceResolver : DefaultAllowanceResolver
     protected override TagAllowance IsAllowed(IClassificationType tagType)
     {
         // string (eg. interpolated or parameter filling) tag can contain punctuation or inlined C# code and braces without tags are ignored by default (DefaultAllowed = false)
-        if (tagType.IsOfType(PredefinedClassificationTypeNames.String)) return TagAllowance.Ignore; 
-
-        if (General.Instance.XmlTags && tagType.IsOfType("HTML Tag Delimiter")) return TagAllowance.XmlTag;
+        if (tagType.IsOfType(PredefinedClassificationTypeNames.String)) return TagAllowance.Ignore;
+
+        if (General.Instance.XmlTags)
+        {
+            if (tagType.IsOfType("HTML Tag Delimiter")) return TagAllowance.XmlTag;
+            if (tagType.IsOfType("HTML Operator")) return TagAllowance.XmlTag;
+        }
 
         return base.IsAllowed(tagType);
     }
@@ -42,7 +46,11 @@ protected override TagAllowance IsAllowed(ILayeredClassificationType layeredType
         // string (eg. interpolated or parameter filling) tag can contain punctuation or inlined C# code and braces without tags are ignored by default (DefaultAllowed = false)
         if (classification == PredefinedClassificationTypeNames.String) return TagAllowance.Ignore;
 
-        if (General.Instance.XmlTags && layeredType.Classification is "HTML Tag Delimiter") return TagAllowance.XmlTag;
+        if (General.Instance.XmlTags)
+        {
+            if (layeredType.Classification is "HTML Tag Delimiter") return TagAllowance.XmlTag;
+            if (layeredType.Classification is "HTML Operator") return TagAllowance.XmlTag;
+        }
 
         return base.IsAllowed(layeredType);
     }