From 952565329b19f5f22d28da568742d616714bba6f Mon Sep 17 00:00:00 2001 From: overlookmotel Date: Thu, 9 May 2024 12:40:48 +0100 Subject: [PATCH] refactor(transformer): remove no-op scopes code (#3210) Remove some code from the transformer which doesn't do anything. --- crates/oxc_transformer/src/lib.rs | 6 +----- crates/oxc_transformer/src/typescript/annotations.rs | 4 ++-- crates/oxc_transformer/src/typescript/mod.rs | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/crates/oxc_transformer/src/lib.rs b/crates/oxc_transformer/src/lib.rs index 22080fc12..380dc07a7 100644 --- a/crates/oxc_transformer/src/lib.rs +++ b/crates/oxc_transformer/src/lib.rs @@ -28,7 +28,6 @@ use oxc_allocator::{Allocator, Vec}; use oxc_ast::{ast::*, Trivias}; use oxc_diagnostics::Error; use oxc_span::SourceType; -// use oxc_syntax::scope::ScopeFlags; use oxc_traverse::{traverse_mut, Traverse, TraverseCtx}; pub use crate::{ @@ -156,10 +155,7 @@ impl<'a> Traverse<'a> for Transformer<'a> { } fn enter_function(&mut self, func: &mut Function<'a>, _ctx: &TraverseCtx<'a>) { - // TODO: Scope flags - // Was a function param: flags: Option, - let flags = None; - self.x0_typescript.transform_function(func, flags); + self.x0_typescript.transform_function(func); } fn enter_jsx_opening_element( diff --git a/crates/oxc_transformer/src/typescript/annotations.rs b/crates/oxc_transformer/src/typescript/annotations.rs index 691502fdb..0464a9bd4 100644 --- a/crates/oxc_transformer/src/typescript/annotations.rs +++ b/crates/oxc_transformer/src/typescript/annotations.rs @@ -8,7 +8,7 @@ use crate::TypeScriptOptions; use oxc_allocator::Vec; use oxc_ast::ast::*; use oxc_span::{Atom, SPAN}; -use oxc_syntax::{operator::AssignmentOperator, scope::ScopeFlags}; +use oxc_syntax::operator::AssignmentOperator; use rustc_hash::FxHashSet; use super::collector::TypeScriptReferenceCollector; @@ -217,7 +217,7 @@ impl<'a> TypeScriptAnnotations<'a> { param.accessibility = None; } - pub fn transform_function(&mut self, func: &mut Function<'a>, _flags: Option) { + pub fn transform_function(&mut self, func: &mut Function<'a>) { func.this_param = None; func.type_parameters = None; func.return_type = None; diff --git a/crates/oxc_transformer/src/typescript/mod.rs b/crates/oxc_transformer/src/typescript/mod.rs index f5666611f..f69c862cb 100644 --- a/crates/oxc_transformer/src/typescript/mod.rs +++ b/crates/oxc_transformer/src/typescript/mod.rs @@ -11,7 +11,6 @@ use serde::Deserialize; use oxc_allocator::Vec; use oxc_ast::ast::*; -use oxc_syntax::scope::ScopeFlags; use oxc_traverse::TraverseCtx; use crate::context::Ctx; @@ -116,8 +115,8 @@ impl<'a> TypeScript<'a> { self.annotations.transform_formal_parameter(param); } - pub fn transform_function(&mut self, func: &mut Function<'a>, flags: Option) { - self.annotations.transform_function(func, flags); + pub fn transform_function(&mut self, func: &mut Function<'a>) { + self.annotations.transform_function(func); } pub fn transform_jsx_opening_element(&mut self, elem: &mut JSXOpeningElement<'a>) {