1 files changed, 18 insertions, 3 deletions
diff --git a/std/zig/tokenizer.zig b/std/zig/tokenizer.zig
index 9f5712fa99..92a0fbc5d5 100644
--- a/std/zig/tokenizer.zig
+++ b/std/zig/tokenizer.zig
@@ -260,6 +260,7 @@ pub const Tokenizer = struct {
         Slash,
         LineCommentStart,
         LineComment,
+        DocCommentStart,
         DocComment,
         Zero,
         IntegerLiteral,
@@ -840,8 +841,7 @@ pub const Tokenizer = struct {
                 },
                 State.LineCommentStart => switch (c) {
                     '/' => {
-                        result.id = Token.Id.DocComment;
-                        state = State.DocComment;
+                        state = State.DocCommentStart;
                     },
                     '\n' => break,
                     else => {
@@ -849,6 +849,20 @@ pub const Tokenizer = struct {
                         self.checkLiteralCharacter();
                     },
                 },
+                State.DocCommentStart => switch (c) {
+                    '/' => {
+                        state = State.LineComment;
+                    },
+                    '\n' => {
+                        result.id = Token.Id.DocComment;
+                        break;
+                    },
+                    else => {
+                        state = State.DocComment;
+                        result.id = Token.Id.DocComment;
+                        self.checkLiteralCharacter();
+                    },
+                },
                 State.LineComment, State.DocComment => switch (c) {
                     '\n' => break,
                     else => self.checkLiteralCharacter(),
@@ -938,7 +952,7 @@ pub const Tokenizer = struct {
                 State.LineComment => {
                     result.id = Token.Id.LineComment;
                 },
-                State.DocComment => {
+                State.DocComment, State.DocCommentStart => {
                     result.id = Token.Id.DocComment;
                 },
 
@@ -1213,6 +1227,7 @@ test "tokenizer - line comment and doc comment" {
     testTokenize("// /", []Token.Id{Token.Id.LineComment});
     testTokenize("/// a", []Token.Id{Token.Id.DocComment});
     testTokenize("///", []Token.Id{Token.Id.DocComment});
+    testTokenize("////", []Token.Id{Token.Id.LineComment});
 }
 
 test "tokenizer - line comment followed by identifier" {