diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithFqNames.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithFqNames.java index 4eed85888e6..30e11bcfc8e 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithFqNames.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithFqNames.java @@ -1,6 +1,6 @@ class Test { static void test() { new Foo(); - _DefaultPackage.foo(); + TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.java index 852ffc06cc5..5a08c4bdb23 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.java @@ -1,4 +1,4 @@ -import static _DefaultPackage.foo; +import static TestKt.foo; class Test { static void test() { diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithFqNames.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithFqNames.java index 3e30c6c2267..e7b22b1c331 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithFqNames.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithFqNames.java @@ -1,6 +1,6 @@ class Test { static void test() { new source.Foo(); - source.SourcePackage.foo(); + source.TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithImports.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithImports.java index e1ff38b1908..2f4a73c1fbf 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithImports.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/before/usagesWithImports.java @@ -1,5 +1,5 @@ import source.Foo; -import static source.SourcePackage.foo; +import static source.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithFqNames.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithFqNames.java index 42a5fe007f3..3d930cf6c9f 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithFqNames.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithFqNames.java @@ -3,6 +3,6 @@ package target; class Test { static void test() { new Foo(); - TargetPackage.foo(); + TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.java index 0e07fe87e3a..6015ab42f46 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.java @@ -1,6 +1,6 @@ package target; -import static target.TargetPackage.foo; +import static target.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java index 201ecd0a871..bda9a2c0e16 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java @@ -1,11 +1,11 @@ package usages; import target.Foo; -import target.TargetPackage; +import target.TestKt; class Test { static void test() { new Foo(); - TargetPackage.foo(); + TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithImports.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithImports.java index 4301144239c..e51f9857914 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithImports.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/usages/usagesWithImports.java @@ -1,7 +1,7 @@ package usages; import target.Foo; -import static target.TargetPackage.foo; +import static target.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithFqNames.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithFqNames.java index 52c2498143c..e07f576448f 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithFqNames.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithFqNames.java @@ -3,6 +3,6 @@ package target; class Test { static void test() { new source.Foo(); - source.SourcePackage.foo(); + source.TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithImports.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithImports.java index f83a0941af6..811bc3ef183 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithImports.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/target/usagesWithImports.java @@ -1,7 +1,7 @@ package target; import source.Foo; -import static source.SourcePackage.foo; +import static source.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java index 41b1a04ff7d..5df0a0bb6fa 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java @@ -3,6 +3,6 @@ package usages; class Test { static void test() { new source.Foo(); - source.SourcePackage.foo(); + source.TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithImports.java b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithImports.java index 59cb604e2c3..83c3d19096c 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithImports.java +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/before/usages/usagesWithImports.java @@ -1,7 +1,7 @@ package usages; import source.Foo; -import static source.SourcePackage.foo; +import static source.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/after/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/after/JavaUsage.java index aa4fdb9b8a9..63ca95f6d9f 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/after/JavaUsage.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/after/JavaUsage.java @@ -1,8 +1,8 @@ -import newPackage.NewPackagePackage; +import newPackage.StuffKt; class JavaUsage { public static void main(String[] args) { - NewPackagePackage.foo(); - NewPackagePackage.getProp(); + StuffKt.foo(); + StuffKt.getProp(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/before/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/before/JavaUsage.java index 29ef70d83e3..98ed795c480 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/before/JavaUsage.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/before/JavaUsage.java @@ -1,8 +1,8 @@ -import oldPackage.OldPackagePackage; +import oldPackage.StuffKt; class JavaUsage { public static void main(String[] args) { - OldPackagePackage.foo(); - OldPackagePackage.getProp(); + StuffKt.foo(); + StuffKt.getProp(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java index 42e63726b7f..7f368522125 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java @@ -1,9 +1,9 @@ package a; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(new Test()); + DependencyKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java index f555342e625..8224a279512 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - b.BPackage.test(new Test()); + b.DependencyKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java index e8e4faca23a..e87e5362934 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java @@ -1,6 +1,6 @@ package a; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java index 0ecbf9d8547..9a10a9764bd 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - BPackage.test(new a.Test()); + DependencyKt.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java index 4fcac4b9ccb..f319464d00d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - BPackage.test(new Test()); + DependencyKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java index 97cb94a716e..e998c377616 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(new a.Test()); + b.DependencyKt.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java index 07ffddcd61a..795a72fc3ef 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java @@ -4,6 +4,6 @@ import a.Test; class J { void bar() { - BPackage.test(new Test()); + DependencyKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java index 61fad841950..91cfd31fc05 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java @@ -1,6 +1,6 @@ package b; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java index 634998e4f31..e293a60b6e4 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java @@ -1,9 +1,9 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(new a.Test()); + DependencyKt.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java index e9b0c3c2054..526f094888d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java @@ -1,10 +1,10 @@ package c; import a.*; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(new Test()); + DependencyKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java index 4f0834f00e3..1e0035747e4 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - b.BPackage.test(new a.Test()); + b.DependencyKt.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java index b97791089c3..91d17b864b0 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java @@ -1,10 +1,10 @@ package c; import a.Test; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(new Test()); + DependencyKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java index 753ab9f5bff..4eb15aed922 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java @@ -1,6 +1,6 @@ package c; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java index 406cd477c66..4c3188ee313 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - APackage.test(new Test()); + MainKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java index e6de2a349a1..5d59f3f9fc8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java index bb3a452779f..c4360c65289 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java index 302d20b962f..c43743e8b8c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - a.APackage.test(new a.Test()); + a.MainKt.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java index 19dfeee6aec..07787301cf4 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - APackage.test(new Test()); + MainKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java index 8359630a7c3..cedb1b6e2a2 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java index f5e4f7cd9df..e9a49ccdb71 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java @@ -1,10 +1,10 @@ package b; -import a.APackage; +import a.MainKt; import a.Test; class J { void bar() { - APackage.test(new Test()); + MainKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java index 886c6446018..18a79e75b5a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java index 2ec4120b108..5a117dfa359 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - a.APackage.test(new a.Test()); + a.MainKt.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java index 4840be4c1a2..f2a72608252 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - APackage.test(new Test()); + MainKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java index 2412510e6ef..75a32456afb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java index 175bc729366..6e05d69b692 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java @@ -1,10 +1,10 @@ package c; -import a.APackage; +import a.MainKt; import a.Test; class J { void bar() { - APackage.test(new Test()); + MainKt.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java index 6cce377c8a1..6f97f128acf 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java index cd8418019b7..4801f1cf815 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java @@ -1,10 +1,10 @@ package a; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.getTest(new Test()); - BPackage.setTest(new Test(), 0); + DependencyKt.getTest(new Test()); + DependencyKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java index 1f03744b539..4f0d7cb0fb2 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - b.BPackage.getTest(new Test()); - b.BPackage.setTest(new Test(), 0); + b.DependencyKt.getTest(new Test()); + b.DependencyKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java index fca7378ba9c..7abbcc45ab8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java @@ -1,7 +1,7 @@ package a; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java index 004a594849e..e3d8d71bdcf 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - BPackage.getTest(new a.Test()); - BPackage.setTest(new a.Test(), 0); + DependencyKt.getTest(new a.Test()); + DependencyKt.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java index 0e08f403e74..21b4e75556e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - BPackage.getTest(new Test()); - BPackage.setTest(new Test(), 0); + DependencyKt.getTest(new Test()); + DependencyKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java index 4659899092a..c51a9474c3f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.getTest(new a.Test()); - b.BPackage.setTest(new a.Test(), 0); + b.DependencyKt.getTest(new a.Test()); + b.DependencyKt.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java index d09ea04452b..471415a6813 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java @@ -4,7 +4,7 @@ import a.Test; class J { void bar() { - BPackage.getTest(new Test()); - BPackage.setTest(new Test(), 0); + DependencyKt.getTest(new Test()); + DependencyKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java index 5a8c0175fdc..6079b79a472 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java @@ -1,7 +1,7 @@ package b; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java index 51e5af162b9..b22fab7b1b8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java @@ -1,10 +1,10 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.getTest(new a.Test()); - BPackage.setTest(new a.Test(), 0); + DependencyKt.getTest(new a.Test()); + DependencyKt.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java index 45df93fdde9..120ba658b5f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java @@ -1,11 +1,11 @@ package c; import a.*; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.getTest(new Test()); - BPackage.setTest(new Test(), 0); + DependencyKt.getTest(new Test()); + DependencyKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java index e011168da1f..e205c4e953c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java @@ -2,7 +2,7 @@ package c; class J { void bar() { - b.BPackage.getTest(new a.Test()); - b.BPackage.setTest(new a.Test(), 0); + b.DependencyKt.getTest(new a.Test()); + b.DependencyKt.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java index 59d327e57fe..c1945b0f55b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java @@ -1,11 +1,11 @@ package c; import a.Test; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.getTest(new Test()); - BPackage.setTest(new Test(), 0); + DependencyKt.getTest(new Test()); + DependencyKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java index 5a7a9da0eee..d3a0a27255d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java @@ -1,7 +1,7 @@ package c; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java index a44745ede2c..79b7c63bd26 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - APackage.getTest(new Test()); - APackage.setTest(new Test(), 0); + MainKt.getTest(new Test()); + MainKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java index 59cabe5df2e..d1b465c12ed 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java index 75d607c6951..faefb85f1dd 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java @@ -1,7 +1,7 @@ package a; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java index 65595805153..2ef0da0fcc7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - a.APackage.getTest(new a.Test()); - a.APackage.setTest(new a.Test(), 0); + a.MainKt.getTest(new a.Test()); + a.MainKt.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java index 37e46f41a35..8fae7269f3e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - APackage.getTest(new Test()); - APackage.setTest(new Test(), 0); + MainKt.getTest(new Test()); + MainKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java index 18d06a47182..e6c4ec3b175 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java index 38b38c54795..e258941abdf 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java @@ -1,11 +1,11 @@ package b; -import a.APackage; +import a.MainKt; import a.Test; class J { void bar() { - APackage.getTest(new Test()); - APackage.setTest(new Test(), 0); + MainKt.getTest(new Test()); + MainKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java index 02e79b9a244..5c8952ab1c3 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java @@ -1,7 +1,7 @@ package b; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java index f23896101fa..ba56d3a1b5c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java @@ -2,7 +2,7 @@ package c; class J { void bar() { - a.APackage.getTest(new a.Test()); - a.APackage.setTest(new a.Test(), 0); + a.MainKt.getTest(new a.Test()); + a.MainKt.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java index 22c0ee6e592..952b0593dd7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - APackage.getTest(new Test()); - APackage.setTest(new Test(), 0); + MainKt.getTest(new Test()); + MainKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java index b4e3b16f383..6ab31b13769 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java index 0ee5dabc510..6fad7683252 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java @@ -1,11 +1,11 @@ package c; -import a.APackage; +import a.MainKt; import a.Test; class J { void bar() { - APackage.getTest(new Test()); - APackage.setTest(new Test(), 0); + MainKt.getTest(new Test()); + MainKt.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java index da19665a048..3537ebc822d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java @@ -1,7 +1,7 @@ package c; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java index a472510bd94..b0586092f4f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java @@ -1,9 +1,9 @@ package a; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java index d43fc44523a..27bccae2678 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - b.BPackage.test(); + b.DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java index 31f7d50216a..bc3435934da 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java @@ -1,6 +1,6 @@ package a; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java index 4ed21109d58..04aad5babdb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java index 4ed21109d58..04aad5babdb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java index 377df2c11af..63093982a99 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + b.DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java index 4ed21109d58..04aad5babdb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java index 9becc62a457..2014d1abf6b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java @@ -1,6 +1,6 @@ package b; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java index 4509d5b41a7..d95d7beda0c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java @@ -1,9 +1,9 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java index 4509d5b41a7..d95d7beda0c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java @@ -1,9 +1,9 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java index fef0d1afe56..d0739a83600 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - b.BPackage.test(); + b.DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java index 4509d5b41a7..d95d7beda0c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java @@ -1,9 +1,9 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java index 559a10fedb1..03cfe568cea 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java @@ -1,6 +1,6 @@ package c; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java index 2f22a169eb5..9cc12698d1e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java index baff27c159c..77f9552d667 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java index b57b7dd7f37..c6233056a1f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.java index 6be3c9da729..306e286d7f2 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - a.APackage.test(); + a.MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java index 9e1ffdd6c43..9ff24298f83 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java index 8de3725979d..16d5ea19223 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java index 61c6adf877d..a42fea26fff 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java @@ -1,9 +1,9 @@ package b; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java index 14e299706dd..fff2561bd8d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.java index 39488b60ac6..536f29aa244 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - a.APackage.test(); + a.MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java index c60b20ab683..8a7623e7901 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java index d207bf9688c..9926282e10a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java index 0ff087f37cf..4362c98790d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java @@ -1,9 +1,9 @@ package c; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java index 1fb44fda749..91757ea72a4 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java index a472510bd94..b0586092f4f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java @@ -1,9 +1,9 @@ package a; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java index d43fc44523a..27bccae2678 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - b.BPackage.test(); + b.DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java index 31f7d50216a..bc3435934da 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java @@ -1,6 +1,6 @@ package a; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java index 4ed21109d58..04aad5babdb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java index 4ed21109d58..04aad5babdb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java index 377df2c11af..63093982a99 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + b.DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java index 4ed21109d58..04aad5babdb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java index 9becc62a457..2014d1abf6b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java @@ -1,6 +1,6 @@ package b; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java index 4509d5b41a7..d95d7beda0c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java @@ -1,9 +1,9 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java index 4509d5b41a7..d95d7beda0c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java @@ -1,9 +1,9 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java index fef0d1afe56..d0739a83600 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - b.BPackage.test(); + b.DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java index 4509d5b41a7..d95d7beda0c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java @@ -1,9 +1,9 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.test(); + DependencyKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java index 559a10fedb1..03cfe568cea 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java @@ -1,6 +1,6 @@ package c; -import static b.BPackage.test; +import static b.DependencyKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/noImports.java index 2f22a169eb5..9cc12698d1e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/onDemandStaticImport.java index baff27c159c..77f9552d667 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/onDemandStaticImport.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/specificStaticImports.java index b57b7dd7f37..c6233056a1f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/a/specificStaticImports.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/noImports.java index 6be3c9da729..306e286d7f2 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - a.APackage.test(); + a.MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandImport.java index 9e1ffdd6c43..9ff24298f83 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandStaticImport.java index 8de3725979d..16d5ea19223 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/onDemandStaticImport.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificImports.java index 61c6adf877d..a42fea26fff 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificImports.java @@ -1,9 +1,9 @@ package b; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificStaticImports.java index 14e299706dd..fff2561bd8d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/b/specificStaticImports.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/noImports.java index 39488b60ac6..536f29aa244 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/noImports.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - a.APackage.test(); + a.MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandImport.java index c60b20ab683..8a7623e7901 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandStaticImport.java index d207bf9688c..9926282e10a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/onDemandStaticImport.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificImports.java index 0ff087f37cf..4362c98790d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificImports.java @@ -1,9 +1,9 @@ package c; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificStaticImports.java index 1fb44fda749..91757ea72a4 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/before/c/specificStaticImports.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.test; +import static a.MainKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/JavaUsage.java index 8865366fa0c..d46ff50a8d1 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/JavaUsage.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/JavaUsage.java @@ -1,7 +1,7 @@ -import newPackage.NewPackagePackage; +import newPackage.FooKt; class JavaUsage { public static void main(String[] args) { - NewPackagePackage.foo(); + FooKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/JavaUsage.java index f4507dfc8d8..29e0f8da23d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/JavaUsage.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/JavaUsage.java @@ -1,7 +1,7 @@ -import oldPackage.OldPackagePackage; +import oldPackage.FunKt; class JavaUsage { public static void main(String[] args) { - OldPackagePackage.foo(); + FunKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.java index 2f22a169eb5..9cc12698d1e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.java index 2f22a169eb5..9cc12698d1e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - APackage.test(); + MainKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/JavaUsage.java index 8865366fa0c..d46ff50a8d1 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/JavaUsage.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/JavaUsage.java @@ -1,7 +1,7 @@ -import newPackage.NewPackagePackage; +import newPackage.FooKt; class JavaUsage { public static void main(String[] args) { - NewPackagePackage.foo(); + FooKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/JavaUsage.java index f4507dfc8d8..29e0f8da23d 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/JavaUsage.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/JavaUsage.java @@ -1,7 +1,7 @@ -import oldPackage.OldPackagePackage; +import oldPackage.FunKt; class JavaUsage { public static void main(String[] args) { - OldPackagePackage.foo(); + FunKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java index 906d240d2dc..c0c072e7222 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java @@ -1,10 +1,10 @@ package a; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java index b973de71c0c..da7656dcd91 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + b.DependencyKt.setTest(""); + System.out.println(b.DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java index 0d131511d74..a464f023674 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java @@ -1,7 +1,7 @@ package a; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java index 2c89e9d36e8..61f425f6221 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java index 2c89e9d36e8..61f425f6221 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java index 8648539c9f7..0a7d28e83ef 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + b.DependencyKt.setTest(""); + System.out.println(b.DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java index 2c89e9d36e8..61f425f6221 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java index 59ec9aa301f..7d142a23c50 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java @@ -1,7 +1,7 @@ package b; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java index 6171f6a8a62..f5da4e0b0f9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java @@ -1,10 +1,10 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java index 6171f6a8a62..f5da4e0b0f9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java @@ -1,10 +1,10 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java index 1309a310809..0b464bb828f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java @@ -2,7 +2,7 @@ package c; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + b.DependencyKt.setTest(""); + System.out.println(b.DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java index 6171f6a8a62..f5da4e0b0f9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java @@ -1,10 +1,10 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java index 8916d698cec..ad13069db20 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java @@ -1,7 +1,7 @@ package c; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java index b42807193c7..083aa86c198 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java index 4c7d2b3a428..7c0e08fd55b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java index 5cb271f6685..363306f6c36 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java @@ -1,7 +1,7 @@ package a; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.java index a2840dbb624..0553ecce71e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - a.APackage.setTest(""); - System.out.println(a.APackage.getTest()); + a.MainKt.setTest(""); + System.out.println(a.MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java index 10af19e0cf0..bc66db275d9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java index 0f8a1f6ee75..01c6980eda3 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java index 72363a4bea3..5e5ada900b5 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java @@ -1,10 +1,10 @@ package b; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java index b896c640b4b..03269d9aef5 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java @@ -1,7 +1,7 @@ package b; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.java index 14722d77fe6..868eb3af18f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.java @@ -2,7 +2,7 @@ package c; class J { void bar() { - a.APackage.setTest(""); - System.out.println(a.APackage.getTest()); + a.MainKt.setTest(""); + System.out.println(a.MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java index a1342503097..1e398ba6dab 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java index 99f9096d76f..7b0dfb26fd8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java index c294f14dcaf..22b45443194 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java @@ -1,10 +1,10 @@ package c; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java index 29ebd4c3b45..63c12cee9f3 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java @@ -1,7 +1,7 @@ package c; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java index 906d240d2dc..c0c072e7222 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java @@ -1,10 +1,10 @@ package a; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java index b973de71c0c..da7656dcd91 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + b.DependencyKt.setTest(""); + System.out.println(b.DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java index 0d131511d74..a464f023674 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java @@ -1,7 +1,7 @@ package a; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java index 2c89e9d36e8..61f425f6221 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java index 2c89e9d36e8..61f425f6221 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java index 8648539c9f7..0a7d28e83ef 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + b.DependencyKt.setTest(""); + System.out.println(b.DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java index 2c89e9d36e8..61f425f6221 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java index 59ec9aa301f..7d142a23c50 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java @@ -1,7 +1,7 @@ package b; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java index 6171f6a8a62..f5da4e0b0f9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java @@ -1,10 +1,10 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java index 6171f6a8a62..f5da4e0b0f9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java @@ -1,10 +1,10 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java index 1309a310809..0b464bb828f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java @@ -2,7 +2,7 @@ package c; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + b.DependencyKt.setTest(""); + System.out.println(b.DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java index 6171f6a8a62..f5da4e0b0f9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java @@ -1,10 +1,10 @@ package c; -import b.BPackage; +import b.DependencyKt; class J { void bar() { - BPackage.setTest(""); - System.out.println(BPackage.getTest()); + DependencyKt.setTest(""); + System.out.println(DependencyKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java index 8916d698cec..ad13069db20 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java @@ -1,7 +1,7 @@ package c; -import static b.BPackage.getTest; -import static b.BPackage.setTest; +import static b.DependencyKt.getTest; +import static b.DependencyKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/noImports.java index b42807193c7..083aa86c198 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/noImports.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/onDemandStaticImport.java index 4c7d2b3a428..7c0e08fd55b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/onDemandStaticImport.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/specificStaticImports.java index 5cb271f6685..363306f6c36 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/specificStaticImports.java @@ -1,7 +1,7 @@ package a; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/noImports.java index a2840dbb624..0553ecce71e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - a.APackage.setTest(""); - System.out.println(a.APackage.getTest()); + a.MainKt.setTest(""); + System.out.println(a.MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandImport.java index 10af19e0cf0..bc66db275d9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandStaticImport.java index 0f8a1f6ee75..01c6980eda3 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/onDemandStaticImport.java @@ -1,6 +1,6 @@ package b; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificImports.java index 72363a4bea3..5e5ada900b5 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificImports.java @@ -1,10 +1,10 @@ package b; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificStaticImports.java index b896c640b4b..03269d9aef5 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/b/specificStaticImports.java @@ -1,7 +1,7 @@ package b; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/noImports.java index 14722d77fe6..868eb3af18f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/noImports.java @@ -2,7 +2,7 @@ package c; class J { void bar() { - a.APackage.setTest(""); - System.out.println(a.APackage.getTest()); + a.MainKt.setTest(""); + System.out.println(a.MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandImport.java index a1342503097..1e398ba6dab 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandStaticImport.java index 99f9096d76f..7b0dfb26fd8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/onDemandStaticImport.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificImports.java index c294f14dcaf..22b45443194 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificImports.java @@ -1,10 +1,10 @@ package c; -import a.APackage; +import a.MainKt; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificStaticImports.java index 29ebd4c3b45..63c12cee9f3 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/c/specificStaticImports.java @@ -1,7 +1,7 @@ package c; -import static a.APackage.getTest; -import static a.APackage.setTest; +import static a.MainKt.getTest; +import static a.MainKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.java index b42807193c7..083aa86c198 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.java index b42807193c7..083aa86c198 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.java @@ -2,7 +2,7 @@ package a; class J { void bar() { - APackage.setTest(""); - System.out.println(APackage.getTest()); + MainKt.setTest(""); + System.out.println(MainKt.getTest()); } }