From 7628fa1608e0ea21fe10533ee1c514997379df05 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 15 Sep 2016 10:43:50 +0300 Subject: [PATCH] Checked that KT-13766 Fixed by some changes in resolve #KT-13766 Fixed --- .../editor/optimizeImports/KT13766.kt | 22 +++++++++++++++++++ .../editor/optimizeImports/KT13766.kt.after | 22 +++++++++++++++++++ .../imports/OptimizeImportsTestGenerated.java | 6 +++++ 3 files changed, 50 insertions(+) create mode 100644 idea/testData/editor/optimizeImports/KT13766.kt create mode 100644 idea/testData/editor/optimizeImports/KT13766.kt.after diff --git a/idea/testData/editor/optimizeImports/KT13766.kt b/idea/testData/editor/optimizeImports/KT13766.kt new file mode 100644 index 00000000000..a25f759bc9c --- /dev/null +++ b/idea/testData/editor/optimizeImports/KT13766.kt @@ -0,0 +1,22 @@ +import java.util.* + +class Outer { + + private abstract class Base { + + protected sealed class Sealed { + object OOO : Sealed() + } + + typealias OOO = Sealed.OOO + } + + private class Derived : Base() { + + fun foo(): Sealed { + ArrayList() + return OOO + } + + } +} \ No newline at end of file diff --git a/idea/testData/editor/optimizeImports/KT13766.kt.after b/idea/testData/editor/optimizeImports/KT13766.kt.after new file mode 100644 index 00000000000..0aa6138df89 --- /dev/null +++ b/idea/testData/editor/optimizeImports/KT13766.kt.after @@ -0,0 +1,22 @@ +import java.util.ArrayList + +class Outer { + + private abstract class Base { + + protected sealed class Sealed { + object OOO : Sealed() + } + + typealias OOO = Sealed.OOO + } + + private class Derived : Base() { + + fun foo(): Sealed { + ArrayList() + return OOO + } + + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java index d76e707dfb4..c5a5aa0f2ef 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java @@ -155,6 +155,12 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest { doTest(fileName); } + @TestMetadata("KT13766.kt") + public void testKT13766() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KT13766.kt"); + doTest(fileName); + } + @TestMetadata("KT9875.kt") public void testKT9875() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KT9875.kt");