Merge pull request #17647 from Snuffleupagus/babel-rm-empty-nodes

Remove empty, top-level, nodes in the Babel plugin
mozilla · Feb 12, 2024 · d742daf · d742daf
2 parents 5cfaff5 + 14ef0b4
commit d742daf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/external/builder/babel-plugin-pdfjs-preprocessor.mjs b/external/builder/babel-plugin-pdfjs-preprocessor.mjs
@@ -84,11 +84,13 @@ function babelPluginPDFJSPreprocessor(babel, ctx) {
           if (t.isBooleanLiteral(node.test)) {
             // if (true) stmt1; => stmt1
             // if (false) stmt1; else stmt2; => stmt2
-            path.replaceWith(
-              node.test.value === true
-                ? node.consequent
-                : node.alternate || t.emptyStatement()
-            );
+            if (node.test.value === true) {
+              path.replaceWith(node.consequent);
+            } else if (node.alternate) {
+              path.replaceWith(node.alternate);
+            } else {
+              path.remove(node);
+            }
           }
         },
       },

diff --git a/external/builder/fixtures_esprima/ifs-expected.js b/external/builder/fixtures_esprima/ifs-expected.js
@@ -7,11 +7,12 @@ if ('test') {
 {
   "1";
 }
-;
 {
   "2";
 }
-;
 if ('1') {
   "1";
 }
+function f1() {
+  "1";
+}
diff --git a/external/builder/fixtures_esprima/ifs.js b/external/builder/fixtures_esprima/ifs.js
@@ -23,3 +23,12 @@ if (true && false) {
 if (true && false || '1') {
   "1";
 }
+
+function f1() {
+  if (true) {
+    "1";
+  }
+  if (false) {
+    "2";
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,11 +7,12 @@ if ('test') { @@
     {
       "1";
     }
-    ;
     {
       "2";
     }
-    ;
     if ('1') {
       "1";
     }
+    function f1() {
+      "1";
+    }