From 48b0259d9be33f7d6fcb498540bfc419fc38f60d Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 18 Nov 2016 10:25:16 +0300 Subject: [PATCH] Report error on non-top-level type aliases (unsupported in 1.1). Get rid of nested type aliases in project. Original commit: 4c47d77a9fe986a597c3fd77d0317c1ac1343b6f --- .../incremental/pureKotlin/addMemberTypeAlias/a.kt.new | 2 ++ .../testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt | 3 +++ 2 files changed, 5 insertions(+) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new index 2f651d8a0c9..b1b7bcb0377 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new @@ -3,7 +3,9 @@ package a class Outer { inner class B(x: String) + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias A1 = B + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") private typealias A2 = B fun A1(x: Any) = x diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt index 2f651d8a0c9..6a5080369a0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt @@ -3,7 +3,10 @@ package a class Outer { inner class B(x: String) + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias A1 = B + + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") private typealias A2 = B fun A1(x: Any) = x