Simplify "Find Usages" test data, Move configuration options to test files

idea/testData/findUsages/findClassUsages/javaClassUsages.0.kt

@@ -0,0 +1,5 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
+package testing
+
+class <caret>Server() {
+}

idea/testData/findUsages/findClassUsages/javaClassUsages/Server.kt

@@ -1,4 +0,0 @@
-package testing;
-
-class <caret>Server() {
-}

idea/testData/findUsages/findClassUsages/kotlinClassUsages.0.kt

@@ -1,3 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
 package server
 
 open class <caret>Server {

idea/testData/findUsages/findClassUsages/kotlinClassUsages2.0.kt

@@ -1,3 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
 package server
 
 annotation class <caret>X(val x: String)

idea/testData/findUsages/findClassUsages/kotlinClassUsages3.0.kt

@@ -0,0 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
+package server
+
+data class <caret>Data

idea/testData/findUsages/findClassUsages/kotlinClassUsages3/Server.kt

@@ -1,3 +0,0 @@
-package server
-
-data class <caret>Data

idea/testData/findUsages/findMethodUsages/javaAndKotlinOverrides.0.kt

@@ -1,3 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
 // OPTIONS: overrides
 open class A<T> {
     open fun <caret>foo(t: T) {

idea/testData/findUsages/findMethodUsages/javaAndKotlinOverrides.results.txt

@@ -0,0 +1,2 @@
+Unclassified usage (29: 18) override fun foo(t: String) {
+Unclassified usage (3: 17) public void foo(String s) {

idea/testData/findUsages/findMethodUsages/javaAndKotlinOverrides/results.txt

@@ -1,2 +0,0 @@
-Unclassified usage (28: 18) override fun foo(t: String) {
-Unclassified usage (3: 17) public void foo(String s) {

idea/testData/findUsages/findMethodUsages/javaMethodUsages.0.kt

@@ -1,3 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
 // OPTIONS: usages
 package testing;
 

idea/testData/findUsages/findMethodUsages/kotlinExtensionAndOverloadUsages/results.txt

@@ -1,6 +0,0 @@
-Function call (10: 7) x.foo(1, 2)
-Function call (11: 11) a.foo(0, "")
-Function call (24: 5) foo(t)
-Function call (29: 7) a.foo(1, "")
-Function call (34: 9) foo(t)
-Function call (3: 18) super<A>.foo(t)

idea/testData/findUsages/findMethodUsages/kotlinMethodUsages.0.kt

@@ -1,3 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
 // OPTIONS: usages
 package server;
 

idea/testData/findUsages/findMethodUsages/kotlinOverloadAndExtensionUsages.0.kt

@@ -1,3 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
 // OPTIONS: overloadUsages
 trait X<T> {
 }

idea/testData/findUsages/findMethodUsages/kotlinOverloadAndExtensionUsages.results.txt

@@ -0,0 +1,6 @@
+Function call (11: 11) a.foo(0, "")
+Function call (11: 7) x.foo(1, 2)
+Function call (25: 5) foo(t)
+Function call (30: 7) a.foo(1, "")
+Function call (35: 9) foo(t)
+Function call (3: 18) super<A>.foo(t)

idea/testData/findUsages/findObjectUsages/javaObjectUsages.0.kt

@@ -0,0 +1,7 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
+package server;
+
+object <caret>O {
+    var foo: String = "foo"
+}
+

idea/testData/findUsages/findObjectUsages/javaObjectUsages/Server.kt

@@ -1,6 +0,0 @@
-package server;
-
-object <caret>O {
-    var foo: String = "foo"
-}
-

idea/testData/findUsages/findObjectUsages/kotlinObjectUsages.0.kt

@@ -0,0 +1,7 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
+package server;
+
+object <caret>O {
+    var foo: String = "foo"
+}
+

idea/testData/findUsages/findObjectUsages/kotlinObjectUsages/Server.kt

@@ -1,6 +0,0 @@
-package server;
-
-object <caret>O {
-    var foo: String = "foo"
-}
-

idea/testData/findUsages/findPropertyUsages/javaPropertyUsages.0.kt

@@ -1,3 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
 package server;
 
 object O {

idea/testData/findUsages/findPropertyUsages/kotlinPropertyUsages.0.kt

@@ -0,0 +1,5 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
+package server;
+
+var <caret>foo: String = "foo"
+

idea/testData/findUsages/findPropertyUsages/kotlinPropertyUsages/Server.kt

@@ -1,4 +0,0 @@
-package server;
-
-var <caret>foo: String = "foo"
-

idea/testData/findUsages/findWithFilteringImports/Server.kt

@@ -1,3 +0,0 @@
-package testing
-
-public class <caret>Test

idea/testData/findUsages/findWithFilteringImports/findWithFilteringImports.0.kt

@@ -0,0 +1,6 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
+// FILTERING_RULES: org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule
+
+package testing
+
+public class <caret>Test

idea/testData/findUsages/unresolvedAnnotation/Server.kt

@@ -1,3 +0,0 @@
-open class <caret>Foo {
-    vv open val foo = 1
-}

idea/testData/findUsages/unresolvedAnnotation/unresolvedAnnotation.0.kt

@@ -0,0 +1,4 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
+open class <caret>Foo {
+    vv open val foo = 1
+}