From 635f65e23d09eb1164c8e9791ecb2a1639dde5e3 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 12 Mar 2013 11:49:40 +0400 Subject: [PATCH] Optimize import removes reference to invoke extension function. Add test. #KT-3398 Fixed --- .../multifile/InvokeFunction/InvokeFunction_after.kt | 7 +++++++ .../optimizeImports/multifile/InvokeFunction/main.kt | 7 +++++++ .../optimizeImports/multifile/InvokeFunction/myClass.kt | 6 ++++++ .../importOptimizer/OptimizeImportsMultiFileTest.java | 4 ++++ 4 files changed, 24 insertions(+) create mode 100644 idea/testData/editor/optimizeImports/multifile/InvokeFunction/InvokeFunction_after.kt create mode 100644 idea/testData/editor/optimizeImports/multifile/InvokeFunction/main.kt create mode 100644 idea/testData/editor/optimizeImports/multifile/InvokeFunction/myClass.kt diff --git a/idea/testData/editor/optimizeImports/multifile/InvokeFunction/InvokeFunction_after.kt b/idea/testData/editor/optimizeImports/multifile/InvokeFunction/InvokeFunction_after.kt new file mode 100644 index 00000000000..bc08f1a55fb --- /dev/null +++ b/idea/testData/editor/optimizeImports/multifile/InvokeFunction/InvokeFunction_after.kt @@ -0,0 +1,7 @@ +import test1.MyClass +import test1.invoke + +fun foo() { + val s = MyClass() + s() +} diff --git a/idea/testData/editor/optimizeImports/multifile/InvokeFunction/main.kt b/idea/testData/editor/optimizeImports/multifile/InvokeFunction/main.kt new file mode 100644 index 00000000000..bc08f1a55fb --- /dev/null +++ b/idea/testData/editor/optimizeImports/multifile/InvokeFunction/main.kt @@ -0,0 +1,7 @@ +import test1.MyClass +import test1.invoke + +fun foo() { + val s = MyClass() + s() +} diff --git a/idea/testData/editor/optimizeImports/multifile/InvokeFunction/myClass.kt b/idea/testData/editor/optimizeImports/multifile/InvokeFunction/myClass.kt new file mode 100644 index 00000000000..b2d178bd500 --- /dev/null +++ b/idea/testData/editor/optimizeImports/multifile/InvokeFunction/myClass.kt @@ -0,0 +1,6 @@ +package test1 + +public class MyClass { +} + +public fun MyClass.invoke() {} diff --git a/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsMultiFileTest.java b/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsMultiFileTest.java index 9bd8bfb8a86..bbb8d2d6d45 100644 --- a/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsMultiFileTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsMultiFileTest.java @@ -38,6 +38,10 @@ public class OptimizeImportsMultiFileTest extends CodeInsightTestCase { doTest(getTestName(false) + "/main.kt", getTestName(false) + "/myClass.kt"); } + public void testInvokeFunction() throws Exception { + doTest(getTestName(false) + "/main.kt", getTestName(false) + "/myClass.kt"); + } + public void doTest(String... fileNames) throws Exception { configureByFiles(null, fileNames); invokeFormatFile();