Move: Implement inspection which reports mismatch between package directive and containing directory

idea/testData/multiFileInspections/mismatchedProjectAndDirectory/before/foo/barPackageMismatched.kt

@@ -0,0 +1,5 @@
+package bar
+
+class Foo {
+
+}

idea/testData/multiFileInspections/mismatchedProjectAndDirectory/before/foo/fooPackageMatched.kt

@@ -0,0 +1,5 @@
+package foo
+
+class Foo {
+
+}

idea/testData/multiFileInspections/mismatchedProjectAndDirectory/expected.xml

@@ -0,0 +1,19 @@
+<problems>
+    <problem>
+        <file>barPackageMismatched.kt</file>
+        <line>1</line>
+        <module>testPackageDirectoryMismatch_PackageDirectoryMismatch_0</module>
+        <entry_point TYPE="file" FQNAME="barPackageMismatched.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Package name does not match containing directory</problem_class>
+        <description>Move file to 'bar'</description>
+    </problem>
+
+    <problem>
+        <file>barPackageMismatched.kt</file>
+        <line>1</line>
+        <module>testPackageDirectoryMismatch_PackageDirectoryMismatch_0</module>
+        <entry_point TYPE="file" FQNAME="barPackageMismatched.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Package name does not match containing directory</problem_class>
+        <description>Change file's package to 'foo'</description>
+    </problem>
+</problems>

idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test

@@ -0,0 +1,3 @@
+{
+    "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection"
+}

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToDefaultDirectory/after/test.kt

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

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToDefaultDirectory/before/source/test.kt

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

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToDefaultDirectory/moveToDefaultDirectory.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "source/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.MoveFileToPackageMatchingDirectoryIntention",
+  "intentionText": "Move file to source root"
+}

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToNonDefaultDirectory/after/target/test.kt

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

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToNonDefaultDirectory/before/source/test.kt

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

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToNonDefaultDirectory/moveToNonDefaultDirectory.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "source/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.MoveFileToPackageMatchingDirectoryIntention",
+  "intentionText": "Move file to 'target'"
+}

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/packageMatchesDirectory/after/foo/bar/test.kt

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

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/packageMatchesDirectory/before/foo/bar/test.kt

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

idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/packageMatchesDirectory/packageMatchesDirectory.test

@@ -0,0 +1,5 @@
+{
+    "intentionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.MoveFileToPackageMatchingDirectoryIntention",
+    "isApplicable": "false",
+    "mainFile": "foo/bar/test.kt"
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/changeToDefaultPackage.test

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/changeToNonDefaultPackage.test

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

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

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

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

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

idea/testData/multiFileIntentions/reconcilePackageWithDirectory/packageMatchesDirectory/packageMatchesDirectory.test

@@ -0,0 +1,5 @@
+{
+    "intentionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.ChangePackageToMatchDirectoryIntention",
+    "isApplicable": "false",
+    "mainFile": "foo/bar/test.kt"
+}