swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-12-25 06:36:08 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(es/codegen): Emit extra paren emitting AssignExpr (#8413)

Browse Source 
**Related issue:**

 - Closes #8412
This commit is contained in:
Austaras 2023-12-12 13:53:32 +08:00 committed by GitHub
parent f202a2839f
commit dce369336d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 80 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/swc/tests/fixture/issues-8xxx/8412/input/.swcrc Normal file
View File

@ -0,0 +1,16 @@
{
"jsc": {
"externalHelpers": true,
"parser": {
"tsx": true,
"syntax": "typescript"
},
"preserveAllComments": true,
"target": "es5",
"minify": {
"compress": {
"defaults": true
}
}
}
}

12
crates/swc/tests/fixture/issues-8xxx/8412/input/index.js Normal file
View File

@ -0,0 +1,12 @@
export const fn = () => {
let varA;
if (condCheck) {
// a bad comment
varA = "a";
} else {
varA = "b";
}
return objCreator({
varA,
});
};

7
crates/swc/tests/fixture/issues-8xxx/8412/output/index.js Normal file
View File

@ -0,0 +1,7 @@
export var fn = function() {
var varA;
return(// a bad comment
varA = condCheck ? "a" : "b", objCreator({
varA: varA
}));
};

89
crates/swc_ecma_codegen/src/lib.rs
View File

@ -2885,9 +2885,7 @@ where
}
fn has_leading_comment(&self, arg: &Expr) -> bool {
if let Some(cmt) = self.comments {
let span = arg.span();
fn span_has_leading_comment(cmt: &dyn Comments, span: Span) -> bool {
let lo = span.lo;
// see #415
@ -2903,36 +2901,32 @@ where
return true;
}
}
} else {
return false;
false
}
let cmt = if let Some(cmt) = self.comments {
if span_has_leading_comment(cmt, arg.span()) {
return true;
}
cmt
} else {
return false;
};
match arg {
Expr::Call(c) => match &c.callee {
Callee::Super(callee) => {
if let Some(cmt) = self.comments {
let lo = callee.span.lo;
Expr::Call(c) => {
let has_leading = match &c.callee {
Callee::Super(callee) => span_has_leading_comment(cmt, callee.span),
Callee::Import(callee) => span_has_leading_comment(cmt, callee.span),
Callee::Expr(callee) => self.has_leading_comment(callee),
};
if cmt.has_leading(lo) {
return true;
}
}
if has_leading {
return true;
}
Callee::Import(callee) => {
if let Some(cmt) = self.comments {
let lo = callee.span.lo;
if cmt.has_leading(lo) {
return true;
}
}
}
Callee::Expr(callee) => {
if self.has_leading_comment(callee) {
return true;
}
}
},
}
Expr::Member(m) => {
if self.has_leading_comment(&m.obj) {
@ -2941,12 +2935,8 @@ where
}
Expr::SuperProp(m) => {
if let Some(cmt) = self.comments {
let lo = m.span.lo;
if cmt.has_leading(lo) {
return true;
}
if span_has_leading_comment(cmt, m.span) {
return true;
}
}
@ -2971,18 +2961,29 @@ where
}
Expr::Assign(e) => {
if let Some(cmt) = self.comments {
let lo = e.span.lo;
let lo = e.span.lo;
if cmt.has_leading(lo) {
return true;
}
if cmt.has_leading(lo) {
return true;
}
if let Some(e) = e.left.as_expr() {
if self.has_leading_comment(e) {
return true;
}
let has_leading = match &e.left {
PatOrExpr::Expr(e) => self.has_leading_comment(e),
PatOrExpr::Pat(p) => match &**p {
Pat::Expr(e) => self.has_leading_comment(e),
Pat::Ident(i) => span_has_leading_comment(cmt, i.span),
Pat::Array(a) => span_has_leading_comment(cmt, a.span),
Pat::Object(o) => span_has_leading_comment(cmt, o.span),
// TODO: remove after #8333
Pat::Rest(r) => span_has_leading_comment(cmt, r.span),
Pat::Assign(a) => span_has_leading_comment(cmt, a.span),
Pat::Invalid(_) => false,
},
};
if has_leading {
return true;
}
}
@ -3015,7 +3016,7 @@ where
keyword!("return");
if let Some(ref arg) = n.arg {
if let Some(arg) = n.arg.as_deref() {
let need_paren = n
.arg
.as_deref()