From e896a1f5ea9121b28098d538a7d8f4e556471d76 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 14 Sep 2017 20:50:25 +0300 Subject: [PATCH] Migration: add check for illegal expect on nested in non-expect class --- .../src/org/jetbrains/kotlin/resolve/ModifiersChecker.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index 419da13562f..55e86b86514 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java @@ -251,6 +251,13 @@ public class ModifiersChecker { descriptor instanceof ClassDescriptor && descriptor.getContainingDeclaration() instanceof ClassDescriptor) { trace.report(WRONG_MODIFIER_TARGET.on(keyword, KtTokens.HEADER_KEYWORD, "nested class")); } + else if (keyword == null && modifierList != null) { + keyword = modifierList.getModifier(EXPECT_KEYWORD); + if (keyword != null && + descriptor instanceof ClassDescriptor && descriptor.getContainingDeclaration() instanceof ClassDescriptor) { + trace.report(WRONG_MODIFIER_TARGET.on(keyword, KtTokens.EXPECT_KEYWORD, "nested class")); + } + } } @NotNull