fix(es): Fix various bugs. (#1664)

swc_ecma_codegen: - Emit comments of `BytePos(0)`. (#1657) swc_ecma_transforms_compat: - `classes`: Optimize class expresssions. (#1660)
swc-project · May 9, 2021 · b0b0709 · b0b0709
1 parent 4d013d9
commit b0b0709
Show file tree

Hide file tree

Showing 22 changed files with 251 additions and 155 deletions.
diff --git a/ecmascript/codegen/Cargo.toml b/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.52.4"
+version = "0.52.5"
 
 [dependencies]
 bitflags = "1"

diff --git a/ecmascript/codegen/src/comments.rs b/ecmascript/codegen/src/comments.rs
@@ -55,11 +55,7 @@ impl<'a> Emitter<'a> {
         write_comments!(self, prefix_space, &cmts)
     }
 
-    pub(super) fn emit_leading_comments_of_pos(&mut self, mut pos: BytePos, is_hi: bool) -> Result {
-        if pos == BytePos(0) {
-            return Ok(());
-        }
-
+    pub(super) fn emit_leading_comments(&mut self, mut pos: BytePos, is_hi: bool) -> Result {
         if is_hi {
             pos = pos - BytePos(1)
         }
@@ -71,4 +67,13 @@ impl<'a> Emitter<'a> {
 
         write_comments!(self, false, comments.take_leading(pos))
     }
+
+    pub(super) fn emit_leading_comments_of_span(&mut self, span: Span, is_hi: bool) -> Result {
+        if span.is_dummy() {
+            return Ok(());
+        }
+
+        let pos = if is_hi { span.hi } else { span.lo };
+        self.emit_leading_comments(pos, is_hi)
+    }
 }
diff --git a/ecmascript/codegen/src/decl.rs b/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(), false)?;
+        self.emit_leading_comments_of_span(node.span(), 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(), false)?;
+        self.emit_leading_comments_of_span(node.span(), 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(), false)?;
+        self.emit_leading_comments_of_span(node.span, 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(), false)?;
+        self.emit_leading_comments_of_span(node.span(), false)?;
 
         emit!(node.name);