Add separate search of constructor usages

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

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

idea/testData/findUsages/findClassUsages/javaClassAllUsages.1.java

@@ -0,0 +1,13 @@
+import testing.*;
+
+class Client {
+    private Server myServer = new Server();
+
+    public void setServer(Server server) {
+        myServer = server;
+    }
+
+    public Server getMyServer() {
+        return myServer;
+    }
+}

idea/testData/findUsages/findClassUsages/javaClassAllUsages.results.txt

@@ -0,0 +1,4 @@
+Field declaration (4: 13) private Server myServer = new Server();
+Method parameter declaration (6: 27) public void setServer(Server server) {
+Method return type (10: 12) public Server getMyServer() {
+New instance creation (4: 35) private Server myServer = new Server();

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

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

idea/testData/findUsages/findClassUsages/javaClassConstructorUsages.1.java

@@ -0,0 +1,13 @@
+import testing.*;
+
+class Client {
+    private Server myServer = new Server();
+
+    public void setServer(Server server) {
+        myServer = server;
+    }
+
+    public Server getMyServer() {
+        return myServer;
+    }
+}

idea/testData/findUsages/findClassUsages/javaClassConstructorUsages.results.txt

@@ -0,0 +1 @@
+New instance creation (4: 35) private Server myServer = new Server();

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

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

idea/testData/findUsages/findClassUsages/javaClassNonConstructorUsages.1.java

@@ -0,0 +1,13 @@
+import testing.*;
+
+class Client {
+    private Server myServer = new Server();
+
+    public void setServer(Server server) {
+        myServer = server;
+    }
+
+    public Server getMyServer() {
+        return myServer;
+    }
+}

idea/testData/findUsages/findClassUsages/javaClassNonConstructorUsages.results.txt

@@ -0,0 +1,3 @@
+Field declaration (4: 13) private Server myServer = new Server();
+Method parameter declaration (6: 27) public void setServer(Server server) {
+Method return type (10: 12) public Server getMyServer() {

idea/testData/findUsages/findClassUsages/javaClassUsages.1.java

@@ -1,5 +0,0 @@
-import testing.*;
-
-class Client {
-    private Server myServer;
-}

idea/testData/findUsages/findClassUsages/javaClassUsages.results.txt

@@ -1 +0,0 @@
-Field declaration (4: 13) private Server myServer;

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

@@ -0,0 +1,13 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
+// OPTIONS: usages, constructorUsages
+package server
+
+open class <caret>Server {
+    class object {
+        val NAME = "Server"
+    }
+
+    open fun work() {
+        println("Server")
+    }
+}

idea/testData/findUsages/findClassUsages/kotlinClassAllUsages.1.kt

@@ -2,8 +2,8 @@ package client
 
 import server.Server
 
-class Client: Server {
-    var nextServer: Server? = null
+class Client: Server() {
+    var nextServer: Server? = new Server()
     val name = Server.NAME
 
     fun foo(s: Server) {
@@ -21,6 +21,10 @@ class Client: Server {
     }
 }
 
+object ClientObject: Server() {
+
+}
+
 fun Client.bar(s: Server) {
     foo(s)
 }

idea/testData/findUsages/findClassUsages/kotlinClassAllUsages.results.txt

@@ -0,0 +1,13 @@
+Class/object property type (6: 21) var nextServer: Server? = new Server()
+Function return types (14: 26) fun getNextServer(): Server? {
+Function return types (36: 21) fun Any.asServer(): Server? {
+Import directive (3: 15) import server.Server
+Local variable type (10: 21) val server: Server = s
+Nested class/object (7: 16) val name = Server.NAME
+Parameter type (28: 19) fun Client.bar(s: Server) {
+Parameter type (9: 16) fun foo(s: Server) {
+Super type qualifier (19: 15) super<Server>.work()
+Target type of 'as' operation (37: 40) return if (this is Server) this as Server else null
+Target type of 'is' operation (37: 24) return if (this is Server) this as Server else null
+Unclassified usage (24: 22) object ClientObject: Server() {
+Unclassified usage (5: 15) class Client: Server() {

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

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

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

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

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

@@ -0,0 +1,13 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
+// OPTIONS: constructorUsages
+package server
+
+open class <caret>Server {
+    class object {
+        val NAME = "Server"
+    }
+
+    open fun work() {
+        println("Server")
+    }
+}

idea/testData/findUsages/findClassUsages/kotlinClassConstructorUsages.1.kt

@@ -0,0 +1,38 @@
+package client
+
+import server.Server
+
+class Client: Server() {
+    var nextServer: Server? = new Server()
+    val name = Server.NAME
+
+    fun foo(s: Server) {
+        val server: Server = s
+        println("Server: $server")
+    }
+
+    fun getNextServer(): Server? {
+        return nextServer
+    }
+
+    override fun work() {
+        super<Server>.work()
+        println("Client")
+    }
+}
+
+object ClientObject: Server() {
+
+}
+
+fun Client.bar(s: Server) {
+    foo(s)
+}
+
+fun Client.hasNextServer(): Boolean {
+    return getNextServer() != null
+}
+
+fun Any.asServer(): Server? {
+    return if (this is Server) this as Server else null
+}

idea/testData/findUsages/findClassUsages/kotlinClassConstructorUsages.results.txt

@@ -0,0 +1,2 @@
+Unclassified usage (24: 22) object ClientObject: Server() {
+Unclassified usage (5: 15) class Client: Server() {

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

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

idea/testData/findUsages/findClassUsages/kotlinClassNonConstructorUsages.1.kt

@@ -0,0 +1,38 @@
+package client
+
+import server.Server
+
+class Client: Server() {
+    var nextServer: Server? = new Server()
+    val name = Server.NAME
+
+    fun foo(s: Server) {
+        val server: Server = s
+        println("Server: $server")
+    }
+
+    fun getNextServer(): Server? {
+        return nextServer
+    }
+
+    override fun work() {
+        super<Server>.work()
+        println("Client")
+    }
+}
+
+object ClientObject: Server() {
+
+}
+
+fun Client.bar(s: Server) {
+    foo(s)
+}
+
+fun Client.hasNextServer(): Boolean {
+    return getNextServer() != null
+}
+
+fun Any.asServer(): Server? {
+    return if (this is Server) this as Server else null
+}

idea/testData/findUsages/findClassUsages/kotlinClassNonConstructorUsages.results.txt

@@ -1,12 +1,11 @@
-Class/object property type (6: 21) var nextServer: Server? = null
+Class/object property type (6: 21) var nextServer: Server? = new Server()
 Function return types (14: 26) fun getNextServer(): Server? {
-Function return types (32: 21) fun Any.asServer(): Server? {
+Function return types (36: 21) fun Any.asServer(): Server? {
 Import directive (3: 15) import server.Server
 Local variable type (10: 21) val server: Server = s
 Nested class/object (7: 16) val name = Server.NAME
-Parameter type (24: 19) fun Client.bar(s: Server) {
+Parameter type (28: 19) fun Client.bar(s: Server) {
 Parameter type (9: 16) fun foo(s: Server) {
 Super type qualifier (19: 15) super<Server>.work()
-Supertype (5: 15) class Client: Server {
-Target type of 'as' operation (33: 40) return if (this is Server) this as Server else null
-Target type of 'is' operation (33: 24) return if (this is Server) this as Server else null
+Target type of 'as' operation (37: 40) return if (this is Server) this as Server else null
+Target type of 'is' operation (37: 24) return if (this is Server) this as Server else null

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

@@ -1,5 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
 // FILTERING_RULES: org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule
+// OPTIONS: usages, constructorUsages
 
 package testing
 

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

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