azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix find usages classification for objects

Browse Source 
Objects/enum entries are treated as variables as before. Test data for private
object in superclass was changed because now the object (as opposed to the
property) is no longer resolved due to KT-354
This commit is contained in:
Alexander Udalov
2013-11-21 19:24:07 +04:00
parent ddda69c0a6
commit e48c91bba4
10 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
package server;
object <caret>O {
idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
// OPTIONS: usages
fun foo(): Any {
object <caret>Bar
idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
// OPTIONS: usages
fun foo(): Any {
if (true) {
idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
package a
class A {
idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
package server;
object <caret>O {
idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclarationName
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
// OPTIONS: usages
package server;
@@ -11,6 +11,6 @@ public open class Server() {
}
public class ServerEx(): Server() {
override fun processRequest() = Foo
override fun processRequest() = Server.Foo
}
idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt
+1 -1
View File
@@ -1,3 +1,3 @@
Value read (10: 33) open fun processRequest() = Foo
Value read (14: 37) override fun processRequest() = Foo
Value read (14: 44) override fun processRequest() = Server.Foo
Value read (5: 26) println(Server().Foo)