From 876d358fe69cf4e8d7a2d0af3d60a9a6649398b3 Mon Sep 17 00:00:00 2001
From: Artem Kobzar <Artem.Kobzar@jetbrains.com>
Date: Thu, 21 Oct 2021 06:40:00 +0000
Subject: [PATCH] fix(KT-46961): add support of nested external enums.

---
 .../IrElementToJsExpressionTransformer.kt     |  7 +++---
 .../semantics/IrBoxJsES6TestGenerated.java    |  5 ++++
 .../ir/semantics/IrBoxJsTestGenerated.java    |  5 ++++
 .../js/test/semantics/BoxJsTestGenerated.java |  5 ++++
 .../testData/box/native/externalNestedEnum.js |  6 +++++
 .../testData/box/native/externalNestedEnum.kt | 24 +++++++++++++++++++
 6 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 js/js.translator/testData/box/native/externalNestedEnum.js
 create mode 100644 js/js.translator/testData/box/native/externalNestedEnum.kt

diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
index bce1c94032e..837945b5b10 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
@@ -88,10 +88,9 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
             assert(fieldParent.isEnumClass) {
                 "${field.render()} in non-external class ${fieldParent.render()}"
             }
-            return JsNameRef(
-                field.getJsNameOrKotlinName().identifier,
-                context.getNameForClass(fieldParent).makeRef()
-            ).withSource(expression, context)
+
+            val receiver = expression.receiver?.accept(this, context) ?: error("Expect expression.receiver to not be null")
+            return JsNameRef(field.getJsNameOrKotlinName().identifier, receiver).withSource(expression, context)
         }
 
         if (fieldParent is IrClass && fieldParent.isInline) {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java
index 23620275cfd..9dd48d88994 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java
@@ -6697,6 +6697,11 @@ public class IrBoxJsES6TestGenerated extends AbstractIrBoxJsES6Test {
             runTest("js/js.translator/testData/box/native/exception.kt");
         }
 
+        @TestMetadata("externalNestedEnum.kt")
+        public void testExternalNestedEnum() throws Exception {
+            runTest("js/js.translator/testData/box/native/externalNestedEnum.kt");
+        }
+
         @TestMetadata("inheritanceFromNativeClass.kt")
         public void testInheritanceFromNativeClass() throws Exception {
             runTest("js/js.translator/testData/box/native/inheritanceFromNativeClass.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java
index 5fe6b97128d..63158b8c56c 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java
@@ -6692,6 +6692,11 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
             runTest("js/js.translator/testData/box/native/exception.kt");
         }
 
+        @TestMetadata("externalNestedEnum.kt")
+        public void testExternalNestedEnum() throws Exception {
+            runTest("js/js.translator/testData/box/native/externalNestedEnum.kt");
+        }
+
         @TestMetadata("inheritanceFromNativeClass.kt")
         public void testInheritanceFromNativeClass() throws Exception {
             runTest("js/js.translator/testData/box/native/inheritanceFromNativeClass.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
index 91348071ba6..8bf8e570358 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
@@ -6382,6 +6382,11 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
             runTest("js/js.translator/testData/box/native/exception.kt");
         }
 
+        @TestMetadata("externalNestedEnum.kt")
+        public void testExternalNestedEnum() throws Exception {
+            runTest("js/js.translator/testData/box/native/externalNestedEnum.kt");
+        }
+
         @TestMetadata("inheritanceFromNativeClass.kt")
         public void testInheritanceFromNativeClass() throws Exception {
             runTest("js/js.translator/testData/box/native/inheritanceFromNativeClass.kt");
diff --git a/js/js.translator/testData/box/native/externalNestedEnum.js b/js/js.translator/testData/box/native/externalNestedEnum.js
new file mode 100644
index 00000000000..b1e0dcb3c26
--- /dev/null
+++ b/js/js.translator/testData/box/native/externalNestedEnum.js
@@ -0,0 +1,6 @@
+var O = {
+    Foo: {
+        A: {},
+        B: {}
+    }
+};
diff --git a/js/js.translator/testData/box/native/externalNestedEnum.kt b/js/js.translator/testData/box/native/externalNestedEnum.kt
new file mode 100644
index 00000000000..c37f0a59a47
--- /dev/null
+++ b/js/js.translator/testData/box/native/externalNestedEnum.kt
@@ -0,0 +1,24 @@
+// KT-46961
+// IGNORE_BACKEND: JS
+
+external object O {
+    enum class Foo {
+        A, B
+    }
+}
+
+fun box(): String {
+    val a = foo(O.Foo.A)
+    val b = foo(O.Foo.B)
+
+    if (a != "!") return "fail1: $a"
+    if (b != "@") return "fail2: $b"
+
+    return "OK"
+}
+
+fun foo(x: O.Foo) = when (x) {
+    O.Foo.A -> "!"
+    O.Foo.B -> "@"
+    else -> ""
+}
\ No newline at end of file