Basic combination of strikethrough with emphasis.

Author: Sedeniono

Tests/MarkdownTests.cs

@@ -205,6 +205,15 @@ public void NestedWithIncreasingLevel()
     }
 
 
+    [TestMethod()]
+    public void NestedWithStrikethrough()
+    {
+      DoTest("~~*Some test*~~", ("~~*Some test*~~", ClassificationEnum.StrikethroughEmphasisMinor));
+      DoTest("~~**Some test**~~", ("~~**Some test**~~", ClassificationEnum.StrikethroughEmphasisMajor));
+      DoTest("~~***Some test***~~", ("~~***Some test***~~", ClassificationEnum.StrikethroughEmphasisHuge));
+    }
+
+
     [TestMethod()]
     public void MultipleEquallyNested()
     {
@@ -231,7 +240,7 @@ public void MultipleEquallyNested()
       DoTest("***this *is* some ___nested___ test **yet** and __again__***",
         ("***this *is* some ___nested___ test **yet** and __again__***", ClassificationEnum.EmphasisHuge));
 
-      // Not actually nested.
+      // Not actually nested at the start.
       DoTest("*this *is* some ___not nested___ test __beware__*",
         ("*this *is*", ClassificationEnum.EmphasisMinor),
         ("___not nested___", ClassificationEnum.EmphasisHuge),
@@ -260,7 +269,7 @@ public void MultipleEquallyNested()
       DoTest("___this _is_ some ***nested*** test __yet__ and **again**___",
         ("___this _is_ some ***nested*** test __yet__ and **again**___", ClassificationEnum.EmphasisHuge));
 
-      // Not actually nested.
+      // Not actually nested at the start.
       DoTest("_this _is_ some ***not nested*** test **beware**_",
         ("_this _is_", ClassificationEnum.EmphasisMinor),
         ("***not nested***", ClassificationEnum.EmphasisHuge),

VSDoxyHighlighter/ClassificationFormatDefinitions.cs

@@ -265,6 +265,81 @@ public override void Reinitialize()
   }
 
 
+  [Export(typeof(EditorFormatDefinition))]
+  [ClassificationType(ClassificationTypeNames = ClassificationIDs.ID_strikethroughEmphasisMinor)]
+  [Name(ClassificationIDs.ID_strikethroughEmphasisMinor)]
+  [UserVisible(true)]
+  [Order(After = ClassificationDefinitionBase.cPriority)]
+  internal sealed class StrikethroughEmphasisMinorFormat : ClassificationDefinitionBase
+  {
+    [ImportingConstructor]
+    public StrikethroughEmphasisMinorFormat(DefaultColors defaultColors)
+      : base(defaultColors, ClassificationIDs.ID_strikethroughEmphasisMinor, "VSDoxyHighlighter - Strikethrough + emphasis (minor)")
+    {
+    }
+
+    public override void Reinitialize()
+    {
+      base.Reinitialize();
+
+      TextDecorations = new TextDecorationCollection {
+        new TextDecoration(
+          TextDecorationLocation.Strikethrough, null, 0.0, TextDecorationUnit.FontRecommended, TextDecorationUnit.FontRecommended)
+      };
+    }
+  }
+
+
+  [Export(typeof(EditorFormatDefinition))]
+  [ClassificationType(ClassificationTypeNames = ClassificationIDs.ID_strikethroughEmphasisMajor)]
+  [Name(ClassificationIDs.ID_strikethroughEmphasisMajor)]
+  [UserVisible(true)]
+  [Order(After = ClassificationDefinitionBase.cPriority)]
+  internal sealed class StrikethroughEmphasisMajorFormat : ClassificationDefinitionBase
+  {
+    [ImportingConstructor]
+    public StrikethroughEmphasisMajorFormat(DefaultColors defaultColors)
+      : base(defaultColors, ClassificationIDs.ID_strikethroughEmphasisMajor, "VSDoxyHighlighter - Strikethrough + emphasis (major)")
+    {
+    }
+
+    public override void Reinitialize()
+    {
+      base.Reinitialize();
+
+      TextDecorations = new TextDecorationCollection {
+        new TextDecoration(
+          TextDecorationLocation.Strikethrough, null, 0.0, TextDecorationUnit.FontRecommended, TextDecorationUnit.FontRecommended)
+      };
+    }
+  }
+
+
+  [Export(typeof(EditorFormatDefinition))]
+  [ClassificationType(ClassificationTypeNames = ClassificationIDs.ID_strikethroughEmphasisHuge)]
+  [Name(ClassificationIDs.ID_strikethroughEmphasisHuge)]
+  [UserVisible(true)]
+  [Order(After = ClassificationDefinitionBase.cPriority)]
+  internal sealed class StrikethroughEmphasisHugeFormat : ClassificationDefinitionBase
+  {
+    [ImportingConstructor]
+    public StrikethroughEmphasisHugeFormat(DefaultColors defaultColors)
+      : base(defaultColors, ClassificationIDs.ID_strikethroughEmphasisHuge, "VSDoxyHighlighter - Strikethrough + emphasis (huge)")
+    {
+    }
+
+    public override void Reinitialize()
+    {
+      base.Reinitialize();
+
+      TextDecorations = new TextDecorationCollection {
+        new TextDecoration(
+          TextDecorationLocation.Strikethrough, null, 0.0, TextDecorationUnit.FontRecommended, TextDecorationUnit.FontRecommended)
+      };
+    }
+  }
+
+
   [Export(typeof(EditorFormatDefinition))]
   [ClassificationType(ClassificationTypeNames = ClassificationIDs.ID_generic1)]
   [Name(ClassificationIDs.ID_generic1)]
@@ -394,6 +469,18 @@ internal static class CommentClassificationDefinitions
     [Name(ClassificationIDs.ID_strikethrough)]
     private static ClassificationTypeDefinition typeDefinitionForStrikethrough;
 
+    [Export(typeof(ClassificationTypeDefinition))]
+    [Name(ClassificationIDs.ID_strikethroughEmphasisMinor)]
+    private static ClassificationTypeDefinition typeDefinitionForStrikethroughEmphasisMinor;
+
+    [Export(typeof(ClassificationTypeDefinition))]
+    [Name(ClassificationIDs.ID_strikethroughEmphasisMajor)]
+    private static ClassificationTypeDefinition typeDefinitionForStrikethroughEmphasisMajor;
+
+    [Export(typeof(ClassificationTypeDefinition))]
+    [Name(ClassificationIDs.ID_strikethroughEmphasisHuge)]
+    private static ClassificationTypeDefinition typeDefinitionForStrikethroughEmphasisHuge;
+
     [Export(typeof(ClassificationTypeDefinition))]
     [Name(ClassificationIDs.ID_inlineCode)]
     private static ClassificationTypeDefinition typeDefinitionForInlineCode;

VSDoxyHighlighter/CommentClassifier.cs

@@ -47,6 +47,9 @@ public enum ClassificationEnum : uint
     // More classifications that are used by default.
     ParameterClamped = 16,
     EmphasisHuge = 17, // Bold + italic
+    StrikethroughEmphasisMinor = 18, // Italic + strikethrough
+    StrikethroughEmphasisMajor = 19, // Bold + strikethrough
+    StrikethroughEmphasisHuge = 20, // Bold + italic + strikethrough
   }
 
 
@@ -72,6 +75,9 @@ public static class ClassificationIDs
     public const string ID_emphasisMajor = "VSDoxyHighlighter_EmphasisMajor";
     public const string ID_emphasisHuge = "VSDoxyHighlighter_EmphasisHuge";
     public const string ID_strikethrough = "VSDoxyHighlighter_Strikethrough";
+    public const string ID_strikethroughEmphasisMinor = "VSDoxyHighlighter_StrikethroughEmphasisMinor";
+    public const string ID_strikethroughEmphasisMajor = "VSDoxyHighlighter_StrikethroughEmphasisMajor";
+    public const string ID_strikethroughEmphasisHuge = "VSDoxyHighlighter_StrikethroughEmphasisHuge";
     public const string ID_inlineCode = "VSDoxyHighlighter_InlineCode";
     public const string ID_generic1 = "VSDoxyHighlighter_Generic1";
     public const string ID_generic2 = "VSDoxyHighlighter_Generic2";
@@ -92,6 +98,9 @@ public static class ClassificationIDs
         {ClassificationEnum.EmphasisMajor, ID_emphasisMajor},
         {ClassificationEnum.EmphasisHuge, ID_emphasisHuge},
         {ClassificationEnum.Strikethrough, ID_strikethrough},
+        {ClassificationEnum.StrikethroughEmphasisMinor, ID_strikethroughEmphasisMinor},
+        {ClassificationEnum.StrikethroughEmphasisMajor, ID_strikethroughEmphasisMajor},
+        {ClassificationEnum.StrikethroughEmphasisHuge, ID_strikethroughEmphasisHuge},
         {ClassificationEnum.InlineCode, ID_inlineCode},
         {ClassificationEnum.Generic1, ID_generic1},
         {ClassificationEnum.Generic2, ID_generic2},