Recognize when a block comment has been ended inside a string literal (…

…#4312)
rust-lang · Apr 22, 2021 · dac2423 · dac2423
1 parent 58157bb
commit dac2423
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/comment.rs b/src/comment.rs
@@ -1311,6 +1311,9 @@ where
                 char_kind = FullCodeCharKind::InStringCommented;
                 if chr == '"' {
                     CharClassesStatus::BlockComment(deepness)
+                } else if chr == '*' && self.base.peek().map(RichChar::get_char) == Some('/') {
+                    char_kind = FullCodeCharKind::InComment;
+                    CharClassesStatus::BlockCommentClosing(deepness - 1)
                 } else {
                     CharClassesStatus::StringInBlockComment(deepness)
                 }

diff --git a/tests/source/issue-4312.rs b/tests/source/issue-4312.rs
@@ -0,0 +1,8 @@
+fn main() {
+    /* " */
+    println!("Hello, world!");
+    /* abc " */
+    println!("Hello, world!");
+    /* " abc */
+    println!("Hello, world!");
+}
diff --git a/tests/target/issue-4312.rs b/tests/target/issue-4312.rs
@@ -0,0 +1,8 @@
+fn main() {
+    /* " */
+    println!("Hello, world!");
+    /* abc " */
+    println!("Hello, world!");
+    /* " abc */
+    println!("Hello, world!");
+}