Fix font-lock for inline code inside bold

Related to GH-275.

CHANGES.md

@@ -56,7 +56,8 @@
         load time.  ([GH-273][])
     -   Don't clobber user specified font-lock keywords when toggling
         features.  ([GH-222][])
-    -   Fix font-lock for inline code inside italics.  ([GH-275][])
+    -   Fix font-lock for inline code inside italics and bold.
+        ([GH-275][])
 
   [gh-171]: https://github.com/jrblevin/markdown-mode/issues/171
   [gh-216]: https://github.com/jrblevin/markdown-mode/issues/216

markdown-mode.el

@@ -3722,8 +3722,7 @@ When FACELESS is non-nil, do not return matches where faces have been applied."
                begin begin 'face '(markdown-url-face
                                    markdown-plain-url-face))
               (markdown-range-property-any
-               begin end 'face '(markdown-inline-code-face
-                                 markdown-math-face)))
+               begin end 'face '(markdown-math-face)))
           (progn (goto-char (min (1+ begin) last))
                  (when (< (point) last)
                    (markdown-match-italic last)))

tests/markdown-test.el

@@ -2275,6 +2275,17 @@ See GH-275."
    (should-not (markdown-range-property-any
                 (point-min) (point-max) 'face '(markdown-bold-face)))))
 
+(ert-deftest test-markdown-font-lock/code-in-bold ()
+  "Test inline code inside bold."
+  (markdown-test-string
+   "**text `code` text**"
+   (markdown-test-range-has-face 1 2 markdown-markup-face)
+   (markdown-test-range-has-face 3 18 markdown-bold-face)
+   (markdown-test-range-has-face 8 8 markdown-markup-face)
+   (markdown-test-range-has-face 9 12 markdown-inline-code-face)
+   (markdown-test-range-has-face 13 13 markdown-markup-face)
+   (markdown-test-range-has-face 19 20 markdown-markup-face)))
+
 (ert-deftest test-markdown-font-lock/bold-in-comment ()
   "Test not matching bold in comments."
   (markdown-test-string