@@ -470,17 +470,18 @@ impl<'a> VisitMut for CompilerImpl<'a> {
470470 /// Prevents #1123 for nullish coalescing
471471 fn visit_mut_block_stmt ( & mut self , s : & mut BlockStmt ) {
472472 // Setup phase: Save nullish coalescing vars
473- let old_vars = if self . config . includes . contains ( Features :: NULLISH_COALESCING ) {
474- Some ( self . es2020_nullish_coalescing_vars . take ( ) )
475- } else {
476- None
477- } ;
473+ let old_es2020_nullish_coalescing_vars =
474+ if self . config . includes . contains ( Features :: NULLISH_COALESCING ) {
475+ Some ( self . es2020_nullish_coalescing_vars . take ( ) )
476+ } else {
477+ None
478+ } ;
478479
479480 // Single recursive visit
480481 s. visit_mut_children_with ( self ) ;
481482
482483 // Cleanup phase: Restore nullish coalescing vars
483- if let Some ( old_vars) = old_vars {
484+ if let Some ( old_vars) = old_es2020_nullish_coalescing_vars {
484485 self . es2020_nullish_coalescing_vars = old_vars;
485486 }
486487 }
@@ -491,17 +492,18 @@ impl<'a> VisitMut for CompilerImpl<'a> {
491492 s. test . visit_mut_with ( self ) ;
492493
493494 // Setup phase: Save nullish coalescing vars
494- let old_vars = if self . config . includes . contains ( Features :: NULLISH_COALESCING ) {
495- Some ( self . es2020_nullish_coalescing_vars . take ( ) )
496- } else {
497- None
498- } ;
495+ let old_es2020_nullish_coalescing_vars =
496+ if self . config . includes . contains ( Features :: NULLISH_COALESCING ) {
497+ Some ( self . es2020_nullish_coalescing_vars . take ( ) )
498+ } else {
499+ None
500+ } ;
499501
500502 // Visit consequents
501503 s. cons . visit_mut_with ( self ) ;
502504
503505 // Cleanup phase: Restore nullish coalescing vars
504- if let Some ( old_vars) = old_vars {
506+ if let Some ( old_vars) = old_es2020_nullish_coalescing_vars {
505507 self . es2020_nullish_coalescing_vars = old_vars;
506508 }
507509 }
0 commit comments