Commit 4b226286e8

Isaac Freund <ifreund@ifreund.xyz>
2021-02-17 00:03:39
zig fmt: get rid of Space.no_comment
Using this in its current state would be a bug as it could cause line comments to be deleted or a `// zig fmt: (on|off)` directive to be missed. Removing it doesn't currently cause any test failures, if a reason for its continued existence is discovered in the future another solution will have to be found.
master
1 parent 895fb2b
Changed files (1)
lib
std
zig
render.zig
lib/std/zig/render.zig
@@ -1924,8 +1924,6 @@ const Space = enum {
     /// Additionally consume the next token if it is a semicolon.
     /// In either case, a newline will be inserted afterwards.
     semicolon,
-    /// Skips writing the possible line comment after the token.
-    no_comment,
 };
 
 fn renderToken(ais: *Ais, tree: ast.Tree, token_index: ast.TokenIndex, space: Space) Error!void {
@@ -1937,8 +1935,6 @@ fn renderToken(ais: *Ais, tree: ast.Tree, token_index: ast.TokenIndex, space: Sp
 
     try ais.writer().writeAll(lexeme);
 
-    if (space == .no_comment) return;
-
     const comment = try renderComments(ais, tree, token_start + lexeme.len, token_starts[token_index + 1]);
     switch (space) {
         .none => {},
@@ -1962,8 +1958,6 @@ fn renderToken(ais: *Ais, tree: ast.Tree, token_index: ast.TokenIndex, space: Sp
         } else if (!comment) {
             try ais.insertNewline();
         },
-
-        .no_comment => unreachable,
     }
 }
 
@@ -2064,12 +2058,7 @@ fn renderDocComments(ais: *Ais, tree: ast.Tree, end_token: ast.TokenIndex) Error
     try renderExtraNewlineToken(ais, tree, first_tok);
 
     while (token_tags[tok] == .doc_comment) : (tok += 1) {
-        if (first_tok < end_token) {
-            try renderToken(ais, tree, tok, .newline);
-        } else {
-            try renderToken(ais, tree, tok, .no_comment);
-            try ais.insertNewline();
-        }
+        try renderToken(ais, tree, tok, .newline);
     }
 }