dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(semantic/jsdoc): Handle whitespace absence (#4642)

Browse source 
Follow up for #4632
This commit is contained in:
leaysgur 2024-08-05 02:25:13 +00:00
parent b8e2d9c7ac
commit 6c612d141c
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/oxc_semantic/src/jsdoc/parser/jsdoc_tag.rs
View file

@ -130,15 +130,9 @@ impl<'a> JSDocTag<'a> {
let (type_part, name_comment_content, span_start) = let (type_part, name_comment_content, span_start) =
match utils::find_type_range(self.body_raw) { match utils::find_type_range(self.body_raw) {
Some((t_start, t_end)) => { Some((t_start, t_end)) => {
let c_start = { // There may be, or may not be whitespace
let mut c_start = t_end; // e.g. `@kind {type}name_comment`
// +1 if whitespace let c_start = t_end;
if self.body_raw.as_bytes()[c_start] == b' ' {
c_start += 1;
}
c_start
};
( (
Some(JSDocTagTypePart::new( Some(JSDocTagTypePart::new(
&self.body_raw[t_start..t_end], &self.body_raw[t_start..t_end],
@ -439,7 +433,7 @@ c7 */",
Some(("n7", "n7")), Some(("n7", "n7")),
("c7", "\n\nc7 "), ("c7", "\n\nc7 "),
), ),
("/** @k8 {t8} */", Some(("t8", "{t8}")), None, ("", "")), ("/** @k8 {t8} */", Some(("t8", "{t8}")), None, ("", " ")),
("/** @k9 n9 */", None, Some(("n9", "n9")), ("", " ")), ("/** @k9 n9 */", None, Some(("n9", "n9")), ("", " ")),
("/** @property n[].n10 */", None, Some(("n[].n10", "n[].n10")), ("", " ")), ("/** @property n[].n10 */", None, Some(("n[].n10", "n[].n10")), ("", " ")),
("/** @property n.n11 */", None, Some(("n.n11", "n.n11")), ("", " ")), ("/** @property n.n11 */", None, Some(("n.n11", "n.n11")), ("", " ")),
@ -462,6 +456,7 @@ c7 */",
("- opt", " - opt "), ("- opt", " - opt "),
), ),
("/** @param {t15}ƒa */", Some(("t15", "{t15}")), Some(("ƒa", "ƒa")), ("", " ")), ("/** @param {t15}ƒa */", Some(("t15", "{t15}")), Some(("ƒa", "ƒa")), ("", " ")),
("/** @type{t16}n16*/", Some(("t16", "{t16}")), Some(("n16", "n16")), ("", "")),
] { ] {
let allocator = Allocator::default(); let allocator = Allocator::default();
let semantic = build_semantic(&allocator, source_text); let semantic = build_semantic(&allocator, source_text);
@ -471,15 +466,18 @@ c7 */",
jsdocs.next().unwrap().tags().first().unwrap().type_name_comment(); jsdocs.next().unwrap().tags().first().unwrap().type_name_comment();
assert_eq!( assert_eq!(
type_part.map(|t| (t.parsed(), t.span.source_text(source_text))), type_part.map(|t| (t.parsed(), t.span.source_text(source_text))),
parsed_type_part parsed_type_part,
"type_part failed to assert in {source_text}"
); );
assert_eq!( assert_eq!(
type_name_part.map(|n| (n.parsed(), n.span.source_text(source_text))), type_name_part.map(|n| (n.parsed(), n.span.source_text(source_text))),
parsed_type_name_part parsed_type_name_part,
"type_name_part failed to assert in {source_text}"
); );
assert_eq!( assert_eq!(
(comment_part.parsed().as_str(), comment_part.span.source_text(source_text)), (comment_part.parsed().as_str(), comment_part.span.source_text(source_text)),
parsed_comment_part parsed_comment_part,
"comment_part failed to assert in {source_text}"
); );
} }
} }

5
crates/oxc_semantic/src/jsdoc/parser/utils.rs
View file

@ -71,7 +71,9 @@ pub fn find_type_name_range(s: &str) -> Option<(usize, usize)> {
pub fn find_token_range(s: &str) -> Option<(usize, usize)> { pub fn find_token_range(s: &str) -> Option<(usize, usize)> {
let mut start = None; let mut start = None;
for (idx, ch) in s.char_indices() { for (idx, ch) in s.char_indices() {
if ch.is_whitespace() { // `{` may appear just after `@kind{type}`
// Other syntax characters also can be splitter...?
if ch.is_whitespace() || ch == '{' {
if let Some(start) = start { if let Some(start) = start {
return Some((start, idx)); return Some((start, idx));
} }
@ -150,6 +152,7 @@ t9b: number;
("", None), ("", None),
(" トークン5\n", Some("トークン5")), (" トークン5\n", Some("トークン5")),
("\nk6\nx", Some("k6")), ("\nk6\nx", Some("k6")),
("k7{", Some("k7")),
] { ] {
assert_eq!(find_token_range(actual).map(|(s, e)| &actual[s..e]), expect); assert_eq!(find_token_range(actual).map(|(s, e)| &actual[s..e]), expect);
} }