enh: add span to Interpolation

phoenix-ru · Nov 22, 2023 · b0b7466 · b0b7466
1 parent b7127fc
commit b0b7466
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 29 deletions.
diff --git a/crates/fervid/src/parser/core.rs b/crates/fervid/src/parser/core.rs
@@ -285,6 +285,7 @@ fn parse_interpolation_node(input: &str) -> IResult<&str, Node> {
             value: parsed,
             template_scope: 0,
             patch_flag: false,
+            span: DUMMY_SP
         }),
     ))
 }

diff --git a/crates/fervid_codegen/src/components/mod.rs b/crates/fervid_codegen/src/components/mod.rs
@@ -885,6 +885,7 @@ mod tests {
                                 value: js("one"),
                                 template_scope: 0,
                                 patch_flag: true,
+                                span: DUMMY_SP
                             }),
                         ],
                         template_scope: 0,

diff --git a/crates/fervid_codegen/src/elements/mod.rs b/crates/fervid_codegen/src/elements/mod.rs
@@ -528,6 +528,7 @@ mod tests {
                         value: js("true"),
                         template_scope: 0,
                         patch_flag: false,
+                        span: DUMMY_SP
                     }),
                     Node::Text(" bye!".into(), DUMMY_SP),
                 ],
@@ -557,6 +558,7 @@ mod tests {
                         value: js("true"),
                         template_scope: 0,
                         patch_flag: false,
+                        span: DUMMY_SP
                     }),
                     Node::Element(ElementNode {
                         starting_tag: StartingTag {

diff --git a/crates/fervid_codegen/src/interpolation/mod.rs b/crates/fervid_codegen/src/interpolation/mod.rs
@@ -1,37 +1,11 @@
 use fervid_core::{Interpolation, VueImports};
-use swc_core::{
-    common::DUMMY_SP,
-    ecma::ast::{CallExpr, Callee, Expr, ExprOrSpread, Ident},
-};
+use swc_core::ecma::ast::{CallExpr, Callee, Expr, ExprOrSpread, Ident};
 
 use crate::context::CodegenContext;
 
 impl CodegenContext {
-    pub fn generate_interpolation(
-        &mut self,
-        interpolation: &Interpolation
-    ) -> Expr {    
-        // This is using a string with value if transformation failed
-        // let (transformed, has_js_bindings) =
-        //     // Polyfill
-        //     parse_js(value)
-        //         .and_then(|mut expr| {
-        //             let has_js = transform_scoped(&mut expr, &self.scope_helper, scope_to_use);
-        //             Ok((expr, has_js))
-        //         })
-        //         .unwrap_or_else(|_| {
-        //             (
-        //                 Box::new(Expr::Lit(Lit::Str(Str {
-        //                     span,
-        //                     value: FervidAtom::from(value),
-        //                     raw: None,
-        //                 }))),
-        //                 false,
-        //             )
-        //         });
-
-        // TODO Span
-        let span = DUMMY_SP;
+    pub fn generate_interpolation(&mut self, interpolation: &Interpolation) -> Expr {
+        let span = interpolation.span;
 
         // toDisplayString(transformed)
         Expr::Call(CallExpr {

diff --git a/crates/fervid_core/src/structs.rs b/crates/fervid_core/src/structs.rs
@@ -103,6 +103,7 @@ pub struct Interpolation {
     pub value: Box<Expr>,
     pub template_scope: u32,
     pub patch_flag: bool,
+    pub span: Span
 }
 
 /// Starting tag represents [`ElementNode`]'s tag name and attributes

diff --git a/crates/fervid_parser/src/template.rs b/crates/fervid_parser/src/template.rs
@@ -163,6 +163,7 @@ impl SfcParser<'_, '_, '_> {
                     value: parsed_interpolation,
                     template_scope: 0,
                     patch_flag: false,
+                    span: interpolation_span
                 })),
                 Err(expr_err) => self.errors.push(expr_err.into()),
             }