From cd717467f090b6b81588f587faed3d595d47a1c2 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 25 Aug 2016 19:48:57 +0300
Subject: [PATCH] Nested classes are no more allowed inside any anonymous
 objects or local classes #KT-13510 Fixed (cherry picked from commit 5c3ec6c)

---
 .../jetbrains/kotlin/resolve/ModifiersChecker.java    |  2 +-
 compiler/testData/diagnostics/tests/inner/kt6026.kt   |  3 ++-
 .../tests/objects/nestedClassInAnonymousObject.kt     | 11 +++++++++++
 .../tests/objects/nestedClassInAnonymousObject.txt    | 10 ++++++++++
 .../kotlin/checkers/DiagnosticsTestGenerated.java     |  6 ++++++
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.kt
 create mode 100644 compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.txt

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
index 404238a504f..a2e80e18283 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
@@ -94,7 +94,7 @@ public class ModifiersChecker {
         DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
         if (!(containingDeclaration instanceof ClassDescriptor)) return false;
         ClassDescriptor containingClass = (ClassDescriptor) containingDeclaration;
-        return containingClass.isInner() || containingClass.getContainingDeclaration() instanceof FunctionDescriptor;
+        return containingClass.isInner() || DescriptorUtils.isLocal(containingClass);
     }
 
     @NotNull
diff --git a/compiler/testData/diagnostics/tests/inner/kt6026.kt b/compiler/testData/diagnostics/tests/inner/kt6026.kt
index e55d6048968..af574e2006b 100644
--- a/compiler/testData/diagnostics/tests/inner/kt6026.kt
+++ b/compiler/testData/diagnostics/tests/inner/kt6026.kt
@@ -1,7 +1,8 @@
 // KT-6026 Exception on instantiating a nested class in an anonymous object
 
 val oo = object {
-    class Nested
+    // Forbidden in KT-13510
+    <!NESTED_CLASS_NOT_ALLOWED!>class Nested<!>
 
     fun f1() = Nested(<!TOO_MANY_ARGUMENTS!>11<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.kt b/compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.kt
new file mode 100644
index 00000000000..bf6a6d54f3d
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.kt
@@ -0,0 +1,11 @@
+class X {
+    val foo = object {
+        <!NESTED_CLASS_NOT_ALLOWED!>class Foo<!>
+    }
+
+    fun test() {
+        object {
+            <!NESTED_CLASS_NOT_ALLOWED!>class Foo<!>
+        }
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.txt b/compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.txt
new file mode 100644
index 00000000000..afdd93ed92d
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.txt
@@ -0,0 +1,10 @@
+package
+
+public final class X {
+    public constructor X()
+    public final val foo: kotlin.Any
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 035a4d76685..ef7e8d683a6 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -12510,6 +12510,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("nestedClassInAnonymousObject.kt")
+            public void testNestedClassInAnonymousObject() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/nestedClassInAnonymousObject.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("objectInsideFun.kt")
             public void testObjectInsideFun() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/objectInsideFun.kt");