Apply suggestions from code review

Co-authored-by: overlookmotel <[email protected]>
Signed-off-by: Dunqing <[email protected]>

Author: Dunqing

apps/oxlint/src-js/generated/deserialize.js

@@ -5652,7 +5652,7 @@ function deserializeCommentKind(pos) {
     case 1:
       return "Block";
     case 2:
-      return "MultiLineBlock";
+      return "Block";
     default:
       throw Error(`Unexpected discriminant ${uint8[pos]} for CommentKind`);
   }

crates/oxc_ast/src/ast/comment.rs

@@ -18,6 +18,7 @@ pub enum CommentKind {
     /// Block comment
     Block = 1,
     /// Multiline block comment (contains line breaks)
+    #[estree(rename = "Block")]
     MultilineBlock = 2,
 }
 

crates/oxc_ast/src/generated/derive_estree.rs

@@ -3234,7 +3234,7 @@ impl ESTree for CommentKind {
         match self {
             Self::Line => JsonSafeString("Line").serialize(serializer),
             Self::Block => JsonSafeString("Block").serialize(serializer),
-            Self::MultilineBlock => JsonSafeString("MultiLineBlock").serialize(serializer),
+            Self::MultilineBlock => JsonSafeString("Block").serialize(serializer),
         }
     }
 }

crates/oxc_codegen/src/comment.rs

@@ -1,5 +1,6 @@
 use std::borrow::Cow;
 
+use oxc_syntax::line_terminator::LineTerminatorSplitter;
 use rustc_hash::{FxHashMap, FxHashSet};
 
 use oxc_ast::{Comment, CommentKind, ast::Program};

crates/oxc_linter/src/rules/typescript/prefer_function_type.rs

@@ -159,7 +159,6 @@ fn check_member(member: &TSSignature, node: &AstNode<'_>, ctx: &LintContext<'_>)
 
                     let has_comments = ctx.has_comments_between(interface_decl.span);
 
-                    // TODO:
                     if has_comments {
                         let comments = ctx
                             .comments_range(node_start..node_end)

crates/oxc_parser/src/lexer/comment.rs

@@ -83,10 +83,13 @@ impl<'a> Lexer<'a> {
     /// Section 12.4 Multi Line Comment
     pub(super) fn skip_multi_line_comment(&mut self) -> Kind {
         // If `is_on_new_line` is already set, go directly to faster search which only looks for `*/`
-        // TODO(FIXME): commented out since it doesn't means there is a line break in the comment, while it means the line break is before the comment
-        // if self.token.is_on_new_line() {
-        //     return self.skip_multi_line_comment_after_line_break(self.source.position());
-        // }
+        // We need to identify if comment contains line breaks or not
+        // (`CommentKind::Block` or `CommentKind::MultilineBlock`).
+        // So we have to use the loop below for the first line of the comment even if
+        // `Token`'s `is_on_new_line` flag is already set.
+        // If the loop finds a line break before end of the comment, we then switch to
+        // the faster `skip_multi_line_comment_after_line_break` which searches 
+        // for the end of the comment using `memchr`.
 
         byte_search! {
             lexer: self,

napi/parser/generated/deserialize/js.js

@@ -4211,7 +4211,7 @@ function deserializeCommentKind(pos) {
     case 1:
       return "Block";
     case 2:
-      return "MultiLineBlock";
+      return "Block";
     default:
       throw Error(`Unexpected discriminant ${uint8[pos]} for CommentKind`);
   }

napi/parser/generated/deserialize/js_parent.js

@@ -4944,7 +4944,7 @@ function deserializeCommentKind(pos) {
     case 1:
       return "Block";
     case 2:
-      return "MultiLineBlock";
+      return "Block";
     default:
       throw Error(`Unexpected discriminant ${uint8[pos]} for CommentKind`);
   }

napi/parser/generated/deserialize/js_range.js

@@ -4657,7 +4657,7 @@ function deserializeCommentKind(pos) {
     case 1:
       return "Block";
     case 2:
-      return "MultiLineBlock";
+      return "Block";
     default:
       throw Error(`Unexpected discriminant ${uint8[pos]} for CommentKind`);
   }

napi/parser/generated/deserialize/js_range_parent.js

@@ -5191,7 +5191,7 @@ function deserializeCommentKind(pos) {
     case 1:
       return "Block";
     case 2:
-      return "MultiLineBlock";
+      return "Block";
     default:
       throw Error(`Unexpected discriminant ${uint8[pos]} for CommentKind`);
   }