Skip to content

Commit

Permalink
Fix(prefer-primordials): Ignore TsTypeRef
Browse files Browse the repository at this point in the history
  • Loading branch information
petamoriken committed Sep 9, 2023
1 parent ae1debf commit f87e327
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions src/rules/prefer_primordials.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ struct PreferPrimordialsHandler;

impl Handler for PreferPrimordialsHandler {
fn ident(&mut self, ident: &ast_view::Ident, ctx: &mut Context) {
fn inside_var_decl_lhs_or_member_expr_or_prop(
fn inside_var_decl_lhs_or_member_expr_or_prop_or_type_ref(
orig: ast_view::Node,
node: ast_view::Node,
) -> bool {
Expand All @@ -336,11 +336,14 @@ impl Handler for PreferPrimordialsHandler {
if let Some(kv) = node.to::<ast_view::KeyValueProp>() {
return kv.key.range().contains(&orig.range());
}
if let Some(type_ref) = node.to::<ast_view::TsTypeRef>() {
return type_ref.type_name.range().contains(&orig.range());
}

match node.parent() {
None => false,
Some(parent) => {
inside_var_decl_lhs_or_member_expr_or_prop(orig, parent)
inside_var_decl_lhs_or_member_expr_or_prop_or_type_ref(orig, parent)
}
}
}
Expand All @@ -349,7 +352,7 @@ impl Handler for PreferPrimordialsHandler {
scope.var(&ident.inner.to_id()).is_some()
}

if inside_var_decl_lhs_or_member_expr_or_prop(
if inside_var_decl_lhs_or_member_expr_or_prop_or_type_ref(
ident.as_node(),
ident.as_node(),
) {
Expand Down Expand Up @@ -767,6 +770,15 @@ let a, b, c;
const { indirectEval } = primordials;
indirectEval("console.log('This test should pass.');");
"#,
r#"
function foo(a: Array<any>) {}
"#,
r#"
function foo(): Array<any> {}
"#,
r#"
type p = Promise<void>;
"#,
};
}

Expand Down

0 comments on commit f87e327

Please sign in to comment.