Add @JvmStatic Intention: Support functions/properties in objects

Also eliminate unnecessary object instance references on Java call sites

 #KT-20095 Fixed

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectFun/addJvmStaticToCompanionObjectFun.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "test/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.AddJvmStaticIntention",
+  "withRuntime": "true"
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectFun/after/test/J.java

@@ -0,0 +1,8 @@
+package test;
+
+class J {
+    void test(C.Companion companion) {
+        companion.foo("x");
+        C.foo("y");
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectFun/after/test/test.kt

@@ -0,0 +1,8 @@
+package test
+
+class C {
+    companion object {
+        @JvmStatic
+        fun foo(s: String) {}
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectFun/before/test/J.java

@@ -0,0 +1,8 @@
+package test;
+
+class J {
+    void test(C.Companion companion) {
+        companion.foo("x");
+        C.Companion.foo("y");
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectFun/before/test/test.kt

@@ -0,0 +1,7 @@
+package test
+
+class C {
+    companion object {
+        fun <caret>foo(s: String) {}
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectProperty/addJvmStaticToCompanionObjectProperty.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "test/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.AddJvmStaticIntention",
+  "withRuntime": "true"
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectProperty/after/test/J.java

@@ -0,0 +1,11 @@
+package test;
+
+class J {
+    void test(C.Companion companion) {
+        companion.getFoo();
+        companion.setFoo(1);
+
+        C.getFoo();
+        C.setFoo(2);
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectProperty/after/test/test.kt

@@ -0,0 +1,8 @@
+package test
+
+class C {
+    companion object {
+        @JvmStatic
+        var foo: Int = 1
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectProperty/before/test/J.java

@@ -0,0 +1,11 @@
+package test;
+
+class J {
+    void test(C.Companion companion) {
+        companion.getFoo();
+        companion.setFoo(1);
+
+        C.Companion.getFoo();
+        C.Companion.setFoo(2);
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToCompanionObjectProperty/before/test/test.kt

@@ -0,0 +1,7 @@
+package test
+
+class C {
+    companion object {
+        var <caret>foo: Int = 1
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectFun/addJvmStaticToNamedCompanionObjectFun.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "test/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.AddJvmStaticIntention",
+  "withRuntime": "true"
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectFun/after/test/J.java

@@ -0,0 +1,8 @@
+package test;
+
+class J {
+    void test(C.O companion) {
+        companion.foo("x");
+        C.foo("y");
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectFun/after/test/test.kt

@@ -0,0 +1,8 @@
+package test
+
+class C {
+    companion object O {
+        @JvmStatic
+        fun foo(s: String) {}
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectFun/before/test/J.java

@@ -0,0 +1,8 @@
+package test;
+
+class J {
+    void test(C.O companion) {
+        companion.foo("x");
+        C.O.foo("y");
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectFun/before/test/test.kt

@@ -0,0 +1,7 @@
+package test
+
+class C {
+    companion object O {
+        fun <caret>foo(s: String) {}
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectProperty/addJvmStaticToNamedCompanionObjectProperty.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "test/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.AddJvmStaticIntention",
+  "withRuntime": "true"
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectProperty/after/test/J.java

@@ -0,0 +1,11 @@
+package test;
+
+class J {
+    void test(C.O companion) {
+        companion.getFoo();
+        companion.setFoo(1);
+
+        C.getFoo();
+        C.setFoo(2);
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectProperty/after/test/test.kt

@@ -0,0 +1,8 @@
+package test
+
+class C {
+    companion object O {
+        @JvmStatic
+        var foo: Int = 1
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectProperty/before/test/J.java

@@ -0,0 +1,11 @@
+package test;
+
+class J {
+    void test(C.O companion) {
+        companion.getFoo();
+        companion.setFoo(1);
+
+        C.O.getFoo();
+        C.O.setFoo(2);
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToNamedCompanionObjectProperty/before/test/test.kt

@@ -0,0 +1,7 @@
+package test
+
+class C {
+    companion object O {
+        var <caret>foo: Int = 1
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectFun/addJvmStaticToObjectFun.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "test/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.AddJvmStaticIntention",
+  "withRuntime": "true"
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectFun/after/test/J.java

@@ -0,0 +1,8 @@
+package test;
+
+class J {
+    void test(O o) {
+        o.foo("x");
+        O.foo("y");
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectFun/after/test/test.kt

@@ -0,0 +1,6 @@
+package test
+
+object O {
+    @JvmStatic
+    fun foo(s: String) {}
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectFun/before/test/J.java

@@ -0,0 +1,8 @@
+package test;
+
+class J {
+    void test(O o) {
+        o.foo("x");
+        O.INSTANCE.foo("y");
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectFun/before/test/test.kt

@@ -0,0 +1,5 @@
+package test
+
+object O {
+    fun <caret>foo(s: String) {}
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectProperty/addJvmStaticToObjectProperty.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "test/test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.AddJvmStaticIntention",
+  "withRuntime": "true"
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectProperty/after/test/J.java

@@ -0,0 +1,11 @@
+package test;
+
+class J {
+    void test(O o) {
+        o.getFoo();
+        o.setFoo(1);
+
+        O.getFoo();
+        O.setFoo(2);
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectProperty/after/test/test.kt

@@ -0,0 +1,6 @@
+package test
+
+object O {
+    @JvmStatic
+    var foo: Int = 1
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectProperty/before/test/J.java

@@ -0,0 +1,11 @@
+package test;
+
+class J {
+    void test(O o) {
+        o.getFoo();
+        o.setFoo(1);
+
+        O.INSTANCE.getFoo();
+        O.INSTANCE.setFoo(2);
+    }
+}

idea/testData/multiFileIntentions/addJvmStaticToObjectProperty/before/test/test.kt

@@ -0,0 +1,5 @@
+package test
+
+object O {
+    var <caret>foo: Int = 1
+}