fix(swc): Fix bugs

ecmascript/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0/MIT"
 name = "swc_ecmascript"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.29.0"
+version = "0.29.1"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -30,7 +30,7 @@ typescript = ["swc_ecma_transforms/typescript"]
 swc_ecma_ast = {version = "0.42.0", path = "./ast"}
 swc_ecma_codegen = {version = "0.50.0", path = "./codegen", optional = true}
 swc_ecma_dep_graph = {version = "0.20.0", path = "./dep-graph", optional = true}
-swc_ecma_parser = {version = "0.52.0", path = "./parser", optional = true}
+swc_ecma_parser = {version = "0.52.1", path = "./parser", optional = true}
 swc_ecma_transforms = {version = "0.43.0", path = "./transforms", optional = true}
 swc_ecma_utils = {version = "0.33.0", path = "./utils", optional = true}
 swc_ecma_visit = {version = "0.28.0", path = "./visit", optional = true}

ecmascript/codegen/Cargo.toml

@@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 license = "Apache-2.0/MIT"
 name = "swc_ecma_codegen"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.50.2"
+version = "0.50.3"
 
 [dependencies]
 bitflags = "1"

ecmascript/codegen/src/comments.rs

@@ -39,6 +39,7 @@ impl<'a> Emitter<'a> {
         &mut self,
         pos: BytePos,
         prefix_space: bool,
+        _is_hi: bool,
     ) -> Result {
         if pos == BytePos(0) {
             return Ok(());
@@ -54,11 +55,15 @@ impl<'a> Emitter<'a> {
         write_comments!(self, prefix_space, &cmts)
     }
 
-    pub(super) fn emit_leading_comments_of_pos(&mut self, pos: BytePos) -> Result {
+    pub(super) fn emit_leading_comments_of_pos(&mut self, mut pos: BytePos, is_hi: bool) -> Result {
         if pos == BytePos(0) {
             return Ok(());
         }
 
+        if is_hi {
+            pos = pos - BytePos(1)
+        }
+
         let comments = match self.comments {
             Some(ref comments) => comments,
             None => return Ok(()),

ecmascript/codegen/src/decl.rs

@@ -23,7 +23,7 @@ impl<'a> Emitter<'a> {
 
     #[emitter]
     fn emit_class_decl(&mut self, node: &ClassDecl) -> Result {
-        self.emit_leading_comments_of_pos(node.span().lo())?;
+        self.emit_leading_comments_of_pos(node.span().lo(), false)?;
 
         if node.declare {
             keyword!("declare");
@@ -44,7 +44,7 @@ impl<'a> Emitter<'a> {
 
     #[emitter]
     fn emit_fn_decl(&mut self, node: &FnDecl) -> Result {
-        self.emit_leading_comments_of_pos(node.span().lo())?;
+        self.emit_leading_comments_of_pos(node.span().lo(), false)?;
 
         if node.declare {
             keyword!("declare");
@@ -71,7 +71,7 @@ impl<'a> Emitter<'a> {
 
     #[emitter]
     fn emit_var_decl(&mut self, node: &VarDecl) -> Result {
-        self.emit_leading_comments_of_pos(node.span.lo())?;
+        self.emit_leading_comments_of_pos(node.span.lo(), false)?;
 
         if node.declare {
             keyword!("declare");
@@ -90,7 +90,7 @@ impl<'a> Emitter<'a> {
 
     #[emitter]
     fn emit_var_declarator(&mut self, node: &VarDeclarator) -> Result {
-        self.emit_leading_comments_of_pos(node.span().lo())?;
+        self.emit_leading_comments_of_pos(node.span().lo(), false)?;
 
         emit!(node.name);