fix and babel8

babel · Oct 12, 2022 · 6deee84 · 6deee84
1 parent 0cf343d
commit 6deee84
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 992 deletions.
diff --git a/packages/babel-generator/src/printer.ts b/packages/babel-generator/src/printer.ts
@@ -3,7 +3,6 @@ import type { Loc } from "./buffer";
 import * as n from "./node";
 import type * as t from "@babel/types";
 import {
-  isProperty,
   isFunction,
   isStatement,
   isClassBody,
@@ -1018,20 +1017,19 @@ class Printer {
           hasLoc = false;
 
           if (len === 1) {
+            const shouldSkipNewline =
+              !isStatement(node) &&
+              !isClassBody(parent) &&
+              !isTSInterfaceBody(parent);
+
             if (type === COMMENT_TYPE.LEADING) {
               this._printComment(
                 comment,
-                (!isStatement(node) && !isProperty(node)) ||
-                  isFunction(parent, { body: node })
+                shouldSkipNewline || isFunction(parent, { body: node })
                   ? COMMENT_SKIP_NEWLINE.SKIP_ALL
                   : COMMENT_SKIP_NEWLINE.DEFAULT,
               );
-            } else if (
-              type === COMMENT_TYPE.TRAILING &&
-              !isStatement(node) &&
-              !isClassBody(parent) &&
-              !isTSInterfaceBody(parent)
-            ) {
+            } else if (type === COMMENT_TYPE.TRAILING && shouldSkipNewline) {
               this._printComment(comment, COMMENT_SKIP_NEWLINE.SKIP_ALL);
             } else {
               this._printComment(comment, COMMENT_SKIP_NEWLINE.DEFAULT);