chore

Author: magic-akari

crates/swc_ecma_transforms_react/src/jsx/automatic.rs

@@ -4,7 +4,8 @@ use std::iter::once;
 
 use swc_atoms::Atom;
 use swc_common::{
-    errors::HANDLER, util::take::Take, BytePos, Mark, Spanned, SyntaxContext, DUMMY_SP,
+    comments::Comments, errors::HANDLER, sync::Lrc, util::take::Take, BytePos, Mark, Spanned,
+    SyntaxContext, DUMMY_SP,
 };
 use swc_ecma_ast::*;
 use swc_ecma_utils::{prepend_stmt, private_ident, quote_ident, ExprFactory, StmtLike};
@@ -21,12 +22,22 @@ use crate::{
 /// automatically and JSX elements are converted to jsx() and jsxs() calls.
 ///
 /// https://github.com/reactjs/rfcs/blob/createlement-rfc/text/0000-create-element-changes.md
-pub fn automatic(
+pub fn automatic<C>(
     options: AutomaticConfig,
     common: CommonConfig,
     unresolved_mark: Mark,
-    add_pure_comment: Box<dyn Fn(BytePos)>,
-) -> impl Pass + VisitMut {
+    comments: Option<C>,
+) -> impl Pass + VisitMut
+where
+    C: Comments + 'static,
+{
+    let add_pure_comment: Lrc<dyn Fn(BytePos)> = match comments {
+        Some(c) => Lrc::new(move |pos: BytePos| {
+            c.add_pure_comment(pos);
+        }),
+        None => Lrc::new(|_pos| {}),
+    };
+
     visit_mut_pass(Automatic {
         unresolved_mark,
         import_source: options.import_source,
@@ -53,7 +64,7 @@ struct Automatic {
     development: bool,
     throw_if_namespace: bool,
 
-    add_pure_comment: Box<dyn Fn(BytePos)>,
+    add_pure_comment: Lrc<dyn Fn(BytePos)>,
 }
 
 impl Automatic {

crates/swc_ecma_transforms_react/src/jsx/classic.rs

@@ -9,8 +9,8 @@ use bytes_str::BytesStr;
 use once_cell::sync::Lazy;
 use rustc_hash::FxHashMap;
 use swc_common::{
-    errors::HANDLER, sync::Lrc, util::take::Take, BytePos, FileName, Mark, SourceMap, Spanned,
-    DUMMY_SP,
+    comments::Comments, errors::HANDLER, sync::Lrc, util::take::Take, BytePos, FileName, Mark,
+    SourceMap, Spanned, DUMMY_SP,
 };
 use swc_ecma_ast::*;
 use swc_ecma_parser::{parse_file_as_expr, Syntax};
@@ -82,13 +82,23 @@ fn apply_mark(e: &mut Expr, mark: Mark) {
 /// ```js
 /// import React from 'react';
 /// ```
-pub fn classic(
+pub fn classic<C>(
     options: ClassicConfig,
     common: CommonConfig,
     pragma_mark: Mark,
-    add_pure_comment: Box<dyn Fn(BytePos)>,
+    comments: Option<C>,
     cm: Lrc<SourceMap>,
-) -> impl Pass + VisitMut {
+) -> impl Pass + VisitMut
+where
+    C: Comments + 'static,
+{
+    let add_pure_comment: Lrc<dyn Fn(BytePos)> = match comments {
+        Some(c) => Lrc::new(move |pos: BytePos| {
+            c.add_pure_comment(pos);
+        }),
+        None => Lrc::new(|_pos| {}),
+    };
+
     let pragma = parse_expr_for_jsx(&cm, "pragma", options.pragma, pragma_mark);
     let pragma = Lrc::new(pragma);
 
@@ -110,7 +120,7 @@ struct Classic {
     pragma_frag: Lrc<Box<Expr>>,
     throw_if_namespace: bool,
 
-    add_pure_comment: Box<dyn Fn(BytePos)>,
+    add_pure_comment: Lrc<dyn Fn(BytePos)>,
 }
 
 #[cfg(feature = "concurrent")]

crates/swc_ecma_transforms_react/src/jsx/mod.rs

@@ -264,26 +264,15 @@ where
         runtime, common, ..
     } = options;
 
-    type AddPureCommentFn = Box<dyn Fn(swc_common::BytePos)>;
-    let create_add_pure_comment = || -> AddPureCommentFn {
-        match comments.as_ref() {
-            Some(c) => {
-                let c = c.clone();
-                Box::new(move |pos: swc_common::BytePos| {
-                    c.add_pure_comment(pos);
-                })
-            }
-            None => Box::new(|_pos| {}),
-        }
-    };
+
 
     match runtime {
         Runtime::Automatic(config) => (
             Some(automatic(
                 config,
                 common,
                 unresolved_mark,
-                create_add_pure_comment(),
+                comments.clone(),
             )),
             None,
         ),
@@ -293,7 +282,7 @@ where
                 config,
                 common,
                 top_level_mark,
-                create_add_pure_comment(),
+                comments.clone(),
                 cm.clone(),
             )),
         ),

crates/swc_ecma_transforms_react/src/lib.rs

@@ -58,19 +58,6 @@ where
 
     let refresh_options = options.refresh;
 
-    type AddPureCommentFn = Box<dyn Fn(swc_common::BytePos)>;
-    let create_add_pure_comment = || -> AddPureCommentFn {
-        match comments.as_ref() {
-            Some(c) => {
-                let c = c.clone();
-                Box::new(move |pos: swc_common::BytePos| {
-                    c.add_pure_comment(pos);
-                })
-            }
-            None => Box::new(|_pos| {}),
-        }
-    };
-
     (
         jsx_src(development, cm.clone()),
         jsx_self(development),
@@ -86,15 +73,15 @@ where
                 config,
                 options.common,
                 unresolved_mark,
-                create_add_pure_comment(),
+                comments.clone(),
             )
         }),
         classic_config.map(|config| {
             classic(
                 config,
                 options.common,
                 top_level_mark,
-                create_add_pure_comment(),
+                comments.clone(),
                 cm.clone(),
             )
         }),

crates/swc_plugin_proxy/src/comments/plugin_comments_proxy.rs

@@ -150,6 +150,12 @@ impl Comments for PluginCommentsProxy {
             c.add_pure_comment(pos);
         });
     }
+
+    fn for_each(&self, f: &mut dyn FnMut(&Comment)) {
+        swc_common::comments::COMMENTS.with(|c| {
+            c.for_each(f);
+        });
+    }
 }
 
 #[cfg(all(feature = "__plugin_mode", target_arch = "wasm32"))]
@@ -276,4 +282,8 @@ impl Comments for PluginCommentsProxy {
             }
         }
     }
+
+    fn for_each(&self, f: &mut dyn FnMut(&Comment)) {
+        unimplemented!()
+    }
 }