diff --git a/test/highlight/rust/comment/in b/test/highlight/rust/comment/in
deleted file mode 100644
index 65128cba5..000000000
--- a/test/highlight/rust/comment/in
+++ /dev/null
@@ -1,117 +0,0 @@
-//! # Hello World
-//!
-//! ```shell
-//! $ cargo install
-//! ```
-//!
-//! ```
-//! # use foo;
-//! foo::bar("Hello world");
-//! ```
-
-//!! ```
-//!! foo::bar("Hello world");
-//!! ```
-
-//// ```
-//// foo::bar("Hello world");
-//// ```
-
-// ```
-// foo::bar("Hello world");
-// ```
-
-// make sure the color does not break
-/// ```
-/// # use foo;
-/// foo::bar("Hello world");
-/// ```
-fn bar(s: &str) {
-    println!("{}", s);
-}
-
-    /// ```shell
-    /// $ cargo install
-    /// ```
-    ///
-    /// ```edition2018,no_run
-    /// # use foo;
-    /// foo::bar("Hello world");
-    /// ```
-    ///
-    /// ```
-    /// # use foo;
-    /// foo::bar("Hello world");
-    /// ```
-
-    //!! ```
-    //!! foo::bar("Hello world");
-    //!! ```
-
-    //// ```
-    //// foo::bar("Hello world");
-    //// ```
-
-    // ```
-    // foo::bar("Hello world");
-    // ```
-
-    /**
-     * ```shell
-     * $ cargo install
-     * ```
-     *
-     * ```edition2018,no_run
-     * # use foo;
-     * foo::bar("Hello world");
-     * ```
-     */
-
-    /**
-     ```
-     # use foo;
-     foo::bar("Hello world");
-     ```
-     */
-
-    /***
-     * ```
-     * foo::bar("Hello world");
-     * ```
-     */
-
-    /*
-     * ```
-     * foo::bar("Hello world");
-     * ```
-     */
-
-    //! ```
-    //! // not hidden #
-    //! #![feature(x)]
-    //! # // hidden #
-    //! # #![feature(x)]
-    //! ```
-
-    /**
-     * ```
-     * // not hidden #
-     * #![feature(x)]
-     * # // hidden #
-     * # #![feature(x)]
-     * ```
-     */
-
-    /// ```
-    /// println!("empty line");
-    ///
-    /// println!("continue line");
-    /// ```
-
-    /**
-     * ```
-     * println!("empty line");
-     *
-     * println!("continue line");
-     * ```
-     */
diff --git a/test/highlight/rust/comment/cmd b/test/highlight/rust/comment0/cmd
similarity index 100%
rename from test/highlight/rust/comment/cmd
rename to test/highlight/rust/comment0/cmd
diff --git a/test/highlight/rust/comment0/in b/test/highlight/rust/comment0/in
new file mode 100644
index 000000000..88298fed5
--- /dev/null
+++ b/test/highlight/rust/comment0/in
@@ -0,0 +1,8 @@
+// make sure the color does not break
+/// ```
+/// # use foo;
+/// foo::bar("Hello world");
+/// ```
+fn bar(s: &str) {
+    println!("{}", s);
+}
diff --git a/test/highlight/rust/comment/rc b/test/highlight/rust/comment0/rc
similarity index 100%
rename from test/highlight/rust/comment/rc
rename to test/highlight/rust/comment0/rc
diff --git a/test/highlight/rust/comment0/script b/test/highlight/rust/comment0/script
new file mode 100644
index 000000000..9de740ab3
--- /dev/null
+++ b/test/highlight/rust/comment0/script
@@ -0,0 +1,7 @@
+ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": "/" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/ make sure the color does not break" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "use" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " foo;\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "foo" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "::" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"Hello world\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "fn" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "s" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ": &" }, { "face": { "fg": "yellow", "bg": "default", "attributes": [] }, "contents": "str" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ") {\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "println!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"{}\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ", s);\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "}\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
diff --git a/test/highlight/rust/doc_comment_hidden/cmd b/test/highlight/rust/doc_comment_hidden/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden/cmd
@@ -0,0 +1 @@
+
diff --git a/test/highlight/rust/doc_comment_hidden/in b/test/highlight/rust/doc_comment_hidden/in
new file mode 100644
index 000000000..37cc3c31c
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden/in
@@ -0,0 +1,15 @@
+    //! ```
+    //! // not hidden #
+    //! #![feature(x)]
+    //! # // hidden #
+    //! # #![feature(x)]
+    //! ```
+
+    /**
+     * ```
+     * // not hidden #
+     * #![feature(x)]
+     * # // hidden #
+     * # #![feature(x)]
+     * ```
+     */
diff --git a/test/highlight/rust/doc_comment_hidden/rc b/test/highlight/rust/doc_comment_hidden/rc
new file mode 100644
index 000000000..64064c258
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/highlight/rust/doc_comment_hidden/script b/test/highlight/rust/doc_comment_hidden/script
new file mode 100644
index 000000000..5ae5f5406
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden/script
@@ -0,0 +1,7 @@
+ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": " " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "   " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// not hidden #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#![feature(x)]" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// hidden #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#![feature(x)]" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/**\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// not hidden #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": " #![feature(x)]" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": " #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// hidden #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": " #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#![feature(x)]" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     */" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
diff --git a/test/highlight/rust/doc_comment_hidden_with_empty_line/cmd b/test/highlight/rust/doc_comment_hidden_with_empty_line/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden_with_empty_line/cmd
@@ -0,0 +1 @@
+
diff --git a/test/highlight/rust/doc_comment_hidden_with_empty_line/in b/test/highlight/rust/doc_comment_hidden_with_empty_line/in
new file mode 100644
index 000000000..163b64241
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden_with_empty_line/in
@@ -0,0 +1,13 @@
+    /// ```
+    /// println!("empty line");
+    ///
+    /// println!("continue line");
+    /// ```
+
+    /**
+     * ```
+     * println!("empty line");
+     *
+     * println!("continue line");
+     * ```
+     */
diff --git a/test/highlight/rust/doc_comment_hidden_with_empty_line/rc b/test/highlight/rust/doc_comment_hidden_with_empty_line/rc
new file mode 100644
index 000000000..64064c258
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden_with_empty_line/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/highlight/rust/doc_comment_hidden_with_empty_line/script b/test/highlight/rust/doc_comment_hidden_with_empty_line/script
new file mode 100644
index 000000000..5e4cf3f6c
--- /dev/null
+++ b/test/highlight/rust/doc_comment_hidden_with_empty_line/script
@@ -0,0 +1,7 @@
+ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": " " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "   " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "println!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"empty line\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "println!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"continue line\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/**\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "println!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"empty line\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "println!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"continue line\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     */" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
diff --git a/test/highlight/rust/inner_block_comment1/cmd b/test/highlight/rust/inner_block_comment1/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/highlight/rust/inner_block_comment1/cmd
@@ -0,0 +1 @@
+
diff --git a/test/highlight/rust/inner_block_comment1/in b/test/highlight/rust/inner_block_comment1/in
new file mode 100644
index 000000000..ad255bddd
--- /dev/null
+++ b/test/highlight/rust/inner_block_comment1/in
@@ -0,0 +1,11 @@
+    /***
+     * ```
+     * foo::bar("Hello world");
+     * ```
+     */
+
+    /*
+     * ```
+     * foo::bar("Hello world");
+     * ```
+     */
diff --git a/test/highlight/rust/inner_block_comment1/rc b/test/highlight/rust/inner_block_comment1/rc
new file mode 100644
index 000000000..64064c258
--- /dev/null
+++ b/test/highlight/rust/inner_block_comment1/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/highlight/rust/inner_block_comment1/script b/test/highlight/rust/inner_block_comment1/script
new file mode 100644
index 000000000..6a5a3d0ee
--- /dev/null
+++ b/test/highlight/rust/inner_block_comment1/script
@@ -0,0 +1,7 @@
+ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": " " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "   " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/***\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * ```\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * foo::bar(\"Hello world\");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * ```\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     */" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/*\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * ```\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * foo::bar(\"Hello world\");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * ```\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     */" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
diff --git a/test/highlight/rust/inner_block_doc_comment1/cmd b/test/highlight/rust/inner_block_doc_comment1/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/highlight/rust/inner_block_doc_comment1/cmd
@@ -0,0 +1 @@
+
diff --git a/test/highlight/rust/inner_block_doc_comment1/in b/test/highlight/rust/inner_block_doc_comment1/in
new file mode 100644
index 000000000..1ede5fc22
--- /dev/null
+++ b/test/highlight/rust/inner_block_doc_comment1/in
@@ -0,0 +1,17 @@
+    /**
+     * ```shell
+     * $ cargo install
+     * ```
+     *
+     * ```edition2018,no_run
+     * # use foo;
+     * foo::bar("Hello world");
+     * ```
+     */
+
+    /**
+     ```
+     # use foo;
+     foo::bar("Hello world");
+     ```
+     */
diff --git a/test/highlight/rust/inner_block_doc_comment1/rc b/test/highlight/rust/inner_block_doc_comment1/rc
new file mode 100644
index 000000000..64064c258
--- /dev/null
+++ b/test/highlight/rust/inner_block_doc_comment1/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/highlight/rust/inner_block_doc_comment1/script b/test/highlight/rust/inner_block_doc_comment1/script
new file mode 100644
index 000000000..ece62ee73
--- /dev/null
+++ b/test/highlight/rust/inner_block_doc_comment1/script
@@ -0,0 +1,7 @@
+ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": " " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "   " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/**\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * ```shell\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * $ cargo install\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * ```\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     * " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```edition2018" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "," }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "no_run" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": " #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "use" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " foo;\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "foo" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "::" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"Hello world\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     *" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     */" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/**\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "     #" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "use" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " foo;\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "     " }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "foo" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "::" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"Hello world\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "     " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "     */" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
diff --git a/test/highlight/rust/inner_line_doc_comment1/cmd b/test/highlight/rust/inner_line_doc_comment1/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/highlight/rust/inner_line_doc_comment1/cmd
@@ -0,0 +1 @@
+
diff --git a/test/highlight/rust/inner_line_doc_comment1/in b/test/highlight/rust/inner_line_doc_comment1/in
new file mode 100644
index 000000000..988cc7063
--- /dev/null
+++ b/test/highlight/rust/inner_line_doc_comment1/in
@@ -0,0 +1,13 @@
+    /// ```shell
+    /// $ cargo install
+    /// ```
+    ///
+    /// ```edition2018,no_run
+    /// # use foo;
+    /// foo::bar("Hello world");
+    /// ```
+    ///
+    /// ```
+    /// # use foo;
+    /// foo::bar("Hello world");
+    /// ```
diff --git a/test/highlight/rust/inner_line_doc_comment1/rc b/test/highlight/rust/inner_line_doc_comment1/rc
new file mode 100644
index 000000000..64064c258
--- /dev/null
+++ b/test/highlight/rust/inner_line_doc_comment1/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/highlight/rust/inner_line_doc_comment1/script b/test/highlight/rust/inner_line_doc_comment1/script
new file mode 100644
index 000000000..fc014de35
--- /dev/null
+++ b/test/highlight/rust/inner_line_doc_comment1/script
@@ -0,0 +1,7 @@
+ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": " " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "   /// ```shell\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "    /// $ cargo install\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "    /// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```edition2018" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "," }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "no_run" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "use" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " foo;\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "foo" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "::" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"Hello world\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "use" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " foo;\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "foo" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "::" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"Hello world\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "///" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
diff --git a/test/highlight/rust/line_comment1/cmd b/test/highlight/rust/line_comment1/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/highlight/rust/line_comment1/cmd
@@ -0,0 +1 @@
+
diff --git a/test/highlight/rust/line_comment1/in b/test/highlight/rust/line_comment1/in
new file mode 100644
index 000000000..97d87cedf
--- /dev/null
+++ b/test/highlight/rust/line_comment1/in
@@ -0,0 +1,11 @@
+    //!! ```
+    //!! foo::bar("Hello world");
+    //!! ```
+
+    //// ```
+    //// foo::bar("Hello world");
+    //// ```
+
+    // ```
+    // foo::bar("Hello world");
+    // ```
diff --git a/test/highlight/rust/line_comment1/rc b/test/highlight/rust/line_comment1/rc
new file mode 100644
index 000000000..64064c258
--- /dev/null
+++ b/test/highlight/rust/line_comment1/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/highlight/rust/line_comment1/script b/test/highlight/rust/line_comment1/script
new file mode 100644
index 000000000..0eb3f2f4a
--- /dev/null
+++ b/test/highlight/rust/line_comment1/script
@@ -0,0 +1,7 @@
+ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": " " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "   " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! foo::bar(\"Hello world\");" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//// foo::bar(\"Hello world\");" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// foo::bar(\"Hello world\");" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
diff --git a/test/highlight/rust/outer_block_doc_comment0/cmd b/test/highlight/rust/outer_block_doc_comment0/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/highlight/rust/outer_block_doc_comment0/cmd
@@ -0,0 +1 @@
+
diff --git a/test/highlight/rust/outer_block_doc_comment0/in b/test/highlight/rust/outer_block_doc_comment0/in
new file mode 100644
index 000000000..f17230bc3
--- /dev/null
+++ b/test/highlight/rust/outer_block_doc_comment0/in
@@ -0,0 +1,14 @@
+//! # Hello World
+//!
+//! ```shell
+//! $ cargo install
+//! ```
+//!
+//! ```
+//! # use foo;
+//! foo::bar("Hello world");
+//! ```
+
+//!! ```
+//!! foo::bar("Hello world");
+//!! ```
diff --git a/test/highlight/rust/outer_block_doc_comment0/rc b/test/highlight/rust/outer_block_doc_comment0/rc
new file mode 100644
index 000000000..64064c258
--- /dev/null
+++ b/test/highlight/rust/outer_block_doc_comment0/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/highlight/rust/comment/script b/test/highlight/rust/outer_block_doc_comment0/script
similarity index 72%
rename from test/highlight/rust/comment/script
rename to test/highlight/rust/outer_block_doc_comment0/script
index c86b0139b..7792c6384 100644
--- a/test/highlight/rust/comment/script
+++ b/test/highlight/rust/outer_block_doc_comment0/script
@@ -1,5 +1,5 @@
 ui_out '{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }'
-ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": "/" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/! # Hello World" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//! ```shell\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//! $ cargo install\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "use" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " foo;\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "foo" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "::" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"Hello world\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! foo::bar(\"Hello world\");" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//// foo::bar(\"Hello world\");" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// foo::bar(\"Hello world\");" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "// make sure the color does not break" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": ["final_fg","final_bg"] }, "contents": "/" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "/! # Hello World" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//! ```shell\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//! $ cargo install\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "#" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "use" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " foo;\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "green", "bg": "default", "attributes": [] }, "contents": "foo" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "::" }, { "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "bar" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "(" }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "\"Hello world\"" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": ");\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "magenta", "bg": "default", "attributes": [] }, "contents": "```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! foo::bar(\"Hello world\");" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }], [{ "face": { "fg": "cyan", "bg": "default", "attributes": [] }, "contents": "//!! ```" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }'
 ui_out '{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }'
 ui_out '{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }'
 ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }'