Markup hiding for italics, bold, code, and kbd tags

markdown-mode.el

@@ -2095,6 +2095,10 @@ START and END delimit region to propertize."
 
 ;;; Markup Hiding
 
+(defconst markdown-markup-properties
+  '(face markdown-markup-face invisible markdown-markup)
+  "List of properties and values to apply to markup.")
+
 (defcustom markdown-hide-markup nil
   "Determines whether markup in the buffer will be hidden.
 When set to nil, all markup is displayed in the buffer as it
@@ -2497,12 +2501,12 @@ See `font-lock-syntactic-face-function' for details."
                                        (2 markdown-markup-face)
                                        (3 markdown-metadata-value-face)))
     (markdown-match-hr . markdown-header-delimiter-face)
-    (markdown-match-code . ((1 markdown-markup-face)
+    (markdown-match-code . ((1 markdown-markup-properties)
                             (2 markdown-inline-code-face)
-                            (3 markdown-markup-face)))
-    (,markdown-regex-kbd . ((1 markdown-markup-face)
+                            (3 markdown-markup-properties)))
+    (,markdown-regex-kbd . ((1 markdown-markup-properties)
                             (2 markdown-inline-code-face)
-                            (3 markdown-markup-face)))
+                            (3 markdown-markup-properties)))
     (markdown-fontify-angle-uris)
     (,markdown-regex-list . (2 markdown-list-face))
     (,markdown-regex-footnote . ((1 markdown-markup-face)          ; [^
@@ -2524,12 +2528,12 @@ See `font-lock-syntactic-face-function' for details."
     (markdown-match-math-double . ((1 markdown-markup-face prepend)
                                    (2 markdown-math-face append)
                                    (3 markdown-markup-face prepend)))
-    (markdown-match-bold . ((1 markdown-markup-face prepend)
+    (markdown-match-bold . ((1 markdown-markup-properties prepend)
                             (2 markdown-bold-face append)
-                            (3 markdown-markup-face prepend)))
-    (markdown-match-italic . ((1 markdown-markup-face prepend)
+                            (3 markdown-markup-properties prepend)))
+    (markdown-match-italic . ((1 markdown-markup-properties prepend)
                               (2 markdown-italic-face append)
-                              (3 markdown-markup-face prepend)))
+                              (3 markdown-markup-properties prepend)))
     (markdown-fontify-plain-uris)
     (,markdown-regex-email . markdown-link-face)
     (,markdown-regex-line-break . (1 markdown-line-break-face prepend))

tests/markdown-test.el

@@ -1871,6 +1871,58 @@ the opening bracket of [^2], and then subsequent functions would kill [^2])."
     (should (string-equal (buffer-string) "   -   [X] item\n   -   [ ] "))
     (should (= (point) 28))))
 
+;;; Markup hiding tests:
+
+(ert-deftest test-markdown-markup-hiding/italics-1 ()
+  "Test hiding markup for italics."
+  (markdown-test-file "inline.text"
+    (goto-char 9)
+    (should (looking-at "\*italic\*"))
+    (markdown-test-range-has-property (point) (point) 'invisible 'markdown-markup)
+    (should-not (invisible-p (point)))
+    (should-not (invisible-p (+ 1 (point))))
+    (markdown-toggle-markup-hiding t)
+    (should (invisible-p (point)))
+    (should-not (invisible-p (+ 1 (point))))))
+
+(ert-deftest test-markdown-markup-hiding/bold-1 ()
+  "Test hiding markup for bold."
+  (markdown-test-file "inline.text"
+    (goto-char 27)
+    (should (looking-at "\*\*bold\*\*"))
+    (markdown-test-range-has-property (point) (1+ (point)) 'invisible 'markdown-markup)
+    (should-not (invisible-p (point)))
+    (should-not (invisible-p (+ 1 (point))))
+    (should-not (invisible-p (+ 2 (point))))
+    (markdown-toggle-markup-hiding t)
+    (should (invisible-p (point)))
+    (should (invisible-p (+ 1 (point))))
+    (should-not (invisible-p (+ 2 (point))))))
+
+(ert-deftest test-markdown-markup-hiding/code-1 ()
+  "Test hiding markup for inline code."
+  (markdown-test-file "inline.text"
+    (goto-char 45)
+    (should (looking-at "`code`"))
+    (markdown-test-range-has-property (point) (point) 'invisible 'markdown-markup)
+    (should-not (invisible-p (point)))
+    (should-not (invisible-p (1+ (point))))
+    (markdown-toggle-markup-hiding t)
+    (should (invisible-p (point)))
+    (should-not (invisible-p (1+ (point))))))
+
+(ert-deftest test-markdown-markup-hiding/kbd-1 ()
+  "Test hiding markup for <kbd> tags."
+  (markdown-test-string "<kbd>C-c C-x C-m</kbd>"
+    (markdown-test-range-has-property (point) (+ 4 (point)) 'invisible 'markdown-markup)
+    (should-not (invisible-p (point))) ;; part of <kbd>
+    (should-not (invisible-p (+ 4 (point)))) ;; part of <kbd>
+    (should-not (invisible-p (+ 5 (point)))) ;; inside <kbd>
+    (markdown-toggle-markup-hiding t)
+    (should (invisible-p (point))) ;; part of <kbd>
+    (should (invisible-p (+ 4 (point)))) ;; part of <kbd>
+    (should-not (invisible-p (+ 5 (point)))))) ;; inside <kbd>
+
 ;;; Font lock tests:
 
 (ert-deftest test-markdown-font-lock/italics-1 ()