Refactoring: "package matching directory" is now an inspection

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/addQuotation.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "in/foo/fun/test.kt",
+  "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection",
+  "fix": "Change file's package to 'in.foo.fun'"
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/test.kt

@@ -0,0 +1,7 @@
+package `in`.foo.`fun`
+
+class Foo
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithFqNames.java

@@ -0,0 +1,8 @@
+package in.foo.fun;
+
+class Test {
+    static void test() {
+        new Foo();
+        TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithFqNames.kt

@@ -0,0 +1,6 @@
+package `in`.foo.`fun`
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithImports.java

@@ -0,0 +1,10 @@
+package in.foo.fun;
+
+import static in.foo.fun.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithImports.kt

@@ -0,0 +1,6 @@
+package `in`.foo.`fun`
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/usages/usagesWithFqNames.java

@@ -0,0 +1,11 @@
+package usages;
+
+import in.foo.fun.Foo;
+import in.foo.fun.TestKt;
+
+class Test {
+    static void test() {
+        new Foo();
+        TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/usages/usagesWithFqNames.kt

@@ -0,0 +1,9 @@
+package usages
+
+import `in`.foo.`fun`.Foo
+import `in`.foo.`fun`.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/usages/usagesWithImports.java

@@ -0,0 +1,11 @@
+package usages;
+
+import in.foo.fun.Foo;
+import static in.foo.fun.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/after/usages/usagesWithImports.kt

@@ -0,0 +1,9 @@
+package usages
+
+import `in`.foo.`fun`.Foo
+import `in`.foo.`fun`.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/in/foo/fun/test.kt

@@ -0,0 +1,7 @@
+<caret>package bar
+
+class Foo
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/in/foo/fun/usagesWithFqNames.java

@@ -0,0 +1,8 @@
+package in.foo.fun;
+
+class Test {
+    static void test() {
+        new bar.Foo();
+        bar.TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/in/foo/fun/usagesWithFqNames.kt

@@ -0,0 +1,6 @@
+package `in`.foo.`fun`
+
+fun test() {
+    bar.Foo()
+    bar.foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/in/foo/fun/usagesWithImports.java

@@ -0,0 +1,11 @@
+package in.foo.fun;
+
+import bar.Foo;
+import static bar.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/in/foo/fun/usagesWithImports.kt

@@ -0,0 +1,9 @@
+package `in`.foo.`fun`
+
+import bar.Foo
+import bar.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/usages/usagesWithFqNames.java

@@ -0,0 +1,8 @@
+package usages;
+
+class Test {
+    static void test() {
+        new bar.Foo();
+        bar.TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/usages/usagesWithFqNames.kt

@@ -0,0 +1,6 @@
+package usages
+
+fun test() {
+    bar.Foo()
+    bar.foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/usages/usagesWithImports.java

@@ -0,0 +1,11 @@
+package usages;
+
+import bar.Foo;
+import static bar.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/addQuotation/before/usages/usagesWithImports.kt

@@ -0,0 +1,9 @@
+package usages
+
+import bar.Foo
+import bar.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/after/test.kt

@@ -0,0 +1,5 @@
+class Foo
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithFqNames.java

@@ -0,0 +1,6 @@
+class Test {
+    static void test() {
+        new Foo();
+        TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithFqNames.kt

@@ -0,0 +1,4 @@
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.java

@@ -0,0 +1,8 @@
+import static TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.kt

@@ -0,0 +1,4 @@
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/before/test.kt

@@ -0,0 +1,7 @@
+<caret>package source
+
+class Foo
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithFqNames.java

@@ -0,0 +1,6 @@
+class Test {
+    static void test() {
+        new source.Foo();
+        source.TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithFqNames.kt

@@ -0,0 +1,4 @@
+fun test() {
+    source.Foo()
+    source.foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithImports.java

@@ -0,0 +1,9 @@
+import source.Foo;
+import static source.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithImports.kt

@@ -0,0 +1,7 @@
+import source.Foo
+import source.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToDefaultPackage/changeToDefaultPackage.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "test.kt",
+  "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection",
+  "fix": "Change file's package to ''"
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/test.kt

@@ -0,0 +1,7 @@
+package target
+
+class Foo
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithFqNames.java

@@ -0,0 +1,8 @@
+package target;
+
+class Test {
+    static void test() {
+        new Foo();
+        TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithFqNames.kt

@@ -0,0 +1,6 @@
+package target
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.java

@@ -0,0 +1,10 @@
+package target;
+
+import static target.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.kt

@@ -0,0 +1,6 @@
+package target
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java

@@ -0,0 +1,11 @@
+package usages;
+
+import target.Foo;
+import target.TestKt;
+
+class Test {
+    static void test() {
+        new Foo();
+        TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithFqNames.kt

@@ -0,0 +1,9 @@
+package usages
+
+import target.Foo
+import target.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithImports.java

@@ -0,0 +1,11 @@
+package usages;
+
+import target.Foo;
+import static target.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithImports.kt

@@ -0,0 +1,9 @@
+package usages
+
+import target.Foo
+import target.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/test.kt

@@ -0,0 +1,7 @@
+<caret>package source
+
+class Foo
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithFqNames.java

@@ -0,0 +1,8 @@
+package target;
+
+class Test {
+    static void test() {
+        new source.Foo();
+        source.TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithFqNames.kt

@@ -0,0 +1,6 @@
+package target
+
+fun test() {
+    source.Foo()
+    source.foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithImports.java

@@ -0,0 +1,11 @@
+package target;
+
+import source.Foo;
+import static source.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithImports.kt

@@ -0,0 +1,9 @@
+package target
+
+import source.Foo
+import source.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java

@@ -0,0 +1,8 @@
+package usages;
+
+class Test {
+    static void test() {
+        new source.Foo();
+        source.TestKt.foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithFqNames.kt

@@ -0,0 +1,6 @@
+package usages
+
+fun test() {
+    source.Foo()
+    source.foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithImports.java

@@ -0,0 +1,11 @@
+package usages;
+
+import source.Foo;
+import static source.TestKt.foo;
+
+class Test {
+    static void test() {
+        new Foo();
+        foo();
+    }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithImports.kt

@@ -0,0 +1,9 @@
+package usages
+
+import source.Foo
+import source.foo
+
+fun test() {
+    Foo()
+    foo()
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackage/changeToNonDefaultPackage.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "target/test.kt",
+  "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection",
+  "fix": "Change file's package to 'target'"
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/innerClass/after/foo/dependency.kt

@@ -0,0 +1,7 @@
+package baz
+
+import foo.Class1
+
+class Class2 : Class1() {
+    init { InnerClass() }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/innerClass/after/foo/test.kt

@@ -0,0 +1,6 @@
+package foo
+
+open class Class1() {
+    init { InnerClass() }
+    open inner class InnerClass() { }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/innerClass/before/foo/dependency.kt

@@ -0,0 +1,7 @@
+package baz
+
+import bar.Class1
+
+class Class2 : Class1() {
+    init { InnerClass() }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/innerClass/before/foo/test.kt

@@ -0,0 +1,6 @@
+pack<caret>age bar
+
+open class Class1() {
+    init { InnerClass() }
+    open inner class InnerClass() { }
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/innerClass/innerClass.test

@@ -0,0 +1,5 @@
+{
+    "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection",
+    "mainFile": "foo/test.kt",
+    "fix": "Change file's package to 'foo'"
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/packageMatchesDirectory/after/foo/bar/test.kt

@@ -0,0 +1,9 @@
+package foo.bar
+
+class Foo {
+
+}
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/packageMatchesDirectory/before/foo/bar/test.kt

@@ -0,0 +1,9 @@
+pack<caret>age foo.bar
+
+class Foo {
+
+}
+
+fun foo() {
+
+}

idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/packageMatchesDirectory/packageMatchesDirectory.test

@@ -0,0 +1,5 @@
+{
+    "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection",
+    "problem": "none",
+    "mainFile": "foo/bar/test.kt"
+}