From 55acf310f8e070b006ea5a8d6360fdc1be181e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Santos?= <fabiosantosart@gmail.com>
Date: Thu, 15 Mar 2018 18:31:13 +0000
Subject: [PATCH 1/3] close #2946 by ensuring let and const aren't put out of
 blocks

---
 lib/compress.js         |  9 ++++++++-
 test/compress/blocks.js | 27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/compress.js b/lib/compress.js
index 886a4b5b..5aa4c517 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3115,11 +3115,18 @@ merge(Compressor.prototype, {
         return self;
     });
 
+    function can_be_extracted_from_if_block(node) {
+        return !(
+            node instanceof AST_Const ||
+            node instanceof AST_Let
+        );
+    }
+
     OPT(AST_BlockStatement, function(self, compressor){
         tighten_body(self.body, compressor);
         switch (self.body.length) {
           case 1:
-            if (!compressor.has_directive("use strict") && compressor.parent() instanceof AST_If
+            if (!compressor.has_directive("use strict") && compressor.parent() instanceof AST_If && can_be_extracted_from_if_block(self.body[0])
                 || can_be_evicted_from_block(self.body[0])) {
                 return self.body[0];
             }
diff --git a/test/compress/blocks.js b/test/compress/blocks.js
index 46533e9d..7f506285 100644
--- a/test/compress/blocks.js
+++ b/test/compress/blocks.js
@@ -187,3 +187,30 @@ issue_1672_if_strict: {
     expect_stdout: true
     node_version: ">=6"
 }
+
+issue_2946_else_const: {
+    input: {
+        if (1) {
+            const x = 6;
+        } else {
+            const y = 12;
+        }
+        if (2) {
+            let z = 24;
+        } else {
+            let w = 48;
+        }
+    }
+    expect: {
+        if (1) {
+            const x = 6;
+        } else {
+            const y = 12;
+        }
+        if (2) {
+            let z = 24;
+        } else {
+            let w = 48;
+        }
+    }
+}

From f4e1a23de7acec612143e79f53ad20a29e4ed414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Santos?= <fabiosantosart@gmail.com>
Date: Thu, 15 Mar 2018 18:40:06 +0000
Subject: [PATCH 2/3] make sure classes don't have their surrounding blocks
 removed too

---
 lib/compress.js         |  3 ++-
 test/compress/blocks.js | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/compress.js b/lib/compress.js
index 5aa4c517..a9dcda90 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3118,7 +3118,8 @@ merge(Compressor.prototype, {
     function can_be_extracted_from_if_block(node) {
         return !(
             node instanceof AST_Const ||
-            node instanceof AST_Let
+            node instanceof AST_Let ||
+            node instanceof AST_Class
         );
     }
 
diff --git a/test/compress/blocks.js b/test/compress/blocks.js
index 7f506285..009640ee 100644
--- a/test/compress/blocks.js
+++ b/test/compress/blocks.js
@@ -200,6 +200,11 @@ issue_2946_else_const: {
         } else {
             let w = 48;
         }
+        if (3) {
+            class X {}
+        } else {
+            class Y {}
+        }
     }
     expect: {
         if (1) {
@@ -212,5 +217,10 @@ issue_2946_else_const: {
         } else {
             let w = 48;
         }
+        if (3) {
+            class X {}
+        } else {
+            class Y {}
+        }
     }
 }

From 9fe8edc3f67aa59c9eb22cf20c322cbe2e5a63ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Santos?= <fabiosantosart@gmail.com>
Date: Thu, 15 Mar 2018 20:11:21 +0000
Subject: [PATCH 3/3] fix code style

---
 lib/compress.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/compress.js b/lib/compress.js
index a9dcda90..497eb85d 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3127,7 +3127,9 @@ merge(Compressor.prototype, {
         tighten_body(self.body, compressor);
         switch (self.body.length) {
           case 1:
-            if (!compressor.has_directive("use strict") && compressor.parent() instanceof AST_If && can_be_extracted_from_if_block(self.body[0])
+            if (!compressor.has_directive("use strict")
+                && compressor.parent() instanceof AST_If
+                && can_be_extracted_from_if_block(self.body[0])
                 || can_be_evicted_from_block(self.body[0])) {
                 return self.body[0];
             }