Skip to content

Commit

Permalink
refactor(semantic): tweak comment argument type
Browse files Browse the repository at this point in the history
  • Loading branch information
lucab committed Jul 10, 2024
1 parent b632c04 commit 4ace4de
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions crates/oxc_semantic/src/jsdoc/builder.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::BTreeMap;

use oxc_ast::{AstKind, CommentKind, Trivias};
use oxc_ast::{AstKind, Comment, Trivias};
use oxc_span::{GetSpan, Span};
use rustc_hash::FxHashSet;

Expand Down Expand Up @@ -32,7 +32,7 @@ impl<'a> JSDocBuilder<'a> {
.trivias
.comments()
.filter(|comment| !self.leading_comments_seen.contains(&comment.span.start))
.filter_map(|comment| self.parse_if_jsdoc_comment(comment.kind, comment.span))
.filter_map(|comment| self.parse_if_jsdoc_comment(comment))
.collect::<Vec<_>>();

JSDocFinder::new(self.attached_docs, not_attached_docs)
Expand Down Expand Up @@ -129,7 +129,7 @@ impl<'a> JSDocBuilder<'a> {
}

self.leading_comments_seen.insert(comment.span.start);
if let Some(jsdoc) = self.parse_if_jsdoc_comment(comment.kind, comment.span) {
if let Some(jsdoc) = self.parse_if_jsdoc_comment(comment) {
leading_jsdoc_comments.push(jsdoc);
}
}
Expand All @@ -144,20 +144,20 @@ impl<'a> JSDocBuilder<'a> {
true
}

fn parse_if_jsdoc_comment(&self, kind: CommentKind, comment_span: Span) -> Option<JSDoc<'a>> {
if !kind.is_multi_line() {
fn parse_if_jsdoc_comment(&self, comment: &Comment) -> Option<JSDoc<'a>> {
if !comment.kind.is_multi_line() {
return None;
}

// Inside of marker: /*CONTENT*/ => CONTENT
let comment_content = comment_span.source_text(self.source_text);
let comment_content = comment.span.source_text(self.source_text);
// Should start with "*"
if !comment_content.starts_with('*') {
return None;
}

// Remove the very first `*`
let jsdoc_span = Span::new(comment_span.start + 1, comment_span.end);
let jsdoc_span = Span::new(comment.span.start + 1, comment.span.end);
Some(JSDoc::new(&comment_content[1..], jsdoc_span))
}
}
Expand Down

0 comments on commit 4ace4de

Please sign in to comment.