Skip to content

refactor(transformer): rename methods #6190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Oct 1, 2024
Merged

refactor(transformer): rename methods #6190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
refactor(transformer): rename methods (#6190) 
Pure refactor. Rename a few methods when had `file_name` in their name. Convention throughout codebase appears to be `filename` (without the `_`).
  • Loading branch information
@overlookmotel
overlookmotel committed Oct 1, 2024
commit 4c63f0eb11a0a9cf3905085e12cb18062ea418c7
6 changes: 3 additions & 3 deletions crates/oxc_transformer/src/react/jsx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ impl<'a, 'ctx> ReactJsx<'a, 'ctx> {

impl<'a, 'ctx> Traverse<'a> for ReactJsx<'a, 'ctx> {
fn exit_program(&mut self, _program: &mut Program<'a>, ctx: &mut TraverseCtx<'a>) {
self.insert_var_file_name_statement(ctx);
self.insert_filename_var_statement(ctx);
}

fn exit_expression(&mut self, expr: &mut Expression<'a>, ctx: &mut TraverseCtx<'a>) {
Expand All @@ -470,8 +470,8 @@ impl<'a, 'ctx> ReactJsx<'a, 'ctx> {
self.ctx.ast
}

fn insert_var_file_name_statement(&mut self, ctx: &mut TraverseCtx<'a>) {
let Some(declarator) = self.jsx_source.get_var_file_name_declarator() else { return };
fn insert_filename_var_statement(&mut self, ctx: &mut TraverseCtx<'a>) {
let Some(declarator) = self.jsx_source.get_filename_var_declarator() else { return };

// If is a module, add filename statements before `import`s. If script, then after `require`s.
// This is the same behavior as Babel.
Expand Down
8 changes: 4 additions & 4 deletions crates/oxc_transformer/src/react/jsx_source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl<'a, 'ctx> ReactJsxSource<'a, 'ctx> {

impl<'a, 'ctx> Traverse<'a> for ReactJsxSource<'a, 'ctx> {
fn exit_program(&mut self, _program: &mut Program<'a>, _ctx: &mut TraverseCtx<'a>) {
if let Some(stmt) = self.get_var_file_name_statement() {
if let Some(stmt) = self.get_filename_var_statement() {
self.ctx.top_level_statements.insert_statement(stmt);
}
}
Expand Down Expand Up @@ -190,8 +190,8 @@ impl<'a, 'ctx> ReactJsxSource<'a, 'ctx> {
self.ctx.ast.expression_object(SPAN, properties, None)
}

pub fn get_var_file_name_statement(&self) -> Option<Statement<'a>> {
let decl = self.get_var_file_name_declarator()?;
pub fn get_filename_var_statement(&self) -> Option<Statement<'a>> {
let decl = self.get_filename_var_declarator()?;

let var_decl = Statement::VariableDeclaration(self.ctx.ast.alloc_variable_declaration(
SPAN,
Expand All @@ -202,7 +202,7 @@ impl<'a, 'ctx> ReactJsxSource<'a, 'ctx> {
Some(var_decl)
}

pub fn get_var_file_name_declarator(&self) -> Option<VariableDeclarator<'a>> {
pub fn get_filename_var_declarator(&self) -> Option<VariableDeclarator<'a>> {
let filename_var = self.filename_var.as_ref()?;

let var_kind = VariableDeclarationKind::Var;
Expand Down