Return Kotlin fields and methods through KotlinShortNameCache

#KT-12205 Fixed
This commit is contained in:
Simon Ogorodnik
2016-08-30 19:49:10 +03:00
committed by Dmitry Jemerov
parent b06bdcef75
commit 18feb8f622
28 changed files with 1156 additions and 57 deletions
+22
View File
@@ -0,0 +1,22 @@
object B1 {
@JvmStatic
fun foobar() {}
@JvmField
val barfoo = ""
}
object B2 {
@JvmStatic
fun foobar() {}
@JvmField
val barfoo = ""
}
object B3 {
@JvmStatic
fun foobar() {}
@JvmField
val barfoo = ""
}
+16
View File
@@ -0,0 +1,16 @@
object B1 {
@JvmField
val foobar = ""
fun method1(){}
fun methodInBoth(){}
}
object B2 {
val barfoo = ""
fun method2(){}
fun methodInBoth(){}
}
@@ -0,0 +1,7 @@
class C1 {
}
object O1 {
}
@@ -0,0 +1,52 @@
@file:JvmName("KotlinShortNameCacheTestData")
var topLevelVar: String
get() {
return ""
}
set(value) {
}
object B1 {
@JvmStatic
var staticObjectVar: String
get() {
return ""
}
set(value) {
}
var nonStaticObjectVar: String
get() {
return ""
}
set(value) {
}
}
class C1 {
var classVar: String
get() {
return ""
}
set(value) {
}
companion object {
@JvmStatic
var staticCompanionVar: String
get() {
return ""
}
set(value) {
}
var nonStaticCompanionVar: String
get() {
return ""
}
set(value) {
}
}
}
@@ -0,0 +1,22 @@
@file:JvmName("KotlinShortNameCacheTestData")
var topLevelVar = ""
object B1 {
@JvmStatic
var staticObjectVar = ""
var nonStaticObjectVar = ""
}
class C1 {
var classVar = ""
companion object {
@JvmStatic
var staticCompanionVar = ""
var nonStaticCompanionVar = ""
}
}
@@ -0,0 +1,17 @@
@JvmField
var topLevelVar = ""
object B1 {
@JvmField
var objectVar = ""
}
class C1 {
@JvmField
var classVar = ""
companion object {
@JvmField
var companionVar = ""
}
}
@@ -0,0 +1,27 @@
fun topLevelFunction(){
}
object B1 {
@JvmStatic
fun staticMethodOfObject() {
}
fun nonStaticMethodOfObject() {
}
}
class C1 {
fun methodOfClass() {
}
companion object {
@JvmStatic
fun staticMethodOfCompanion() {
}
fun nonStaticMethodOfCompanion() {
}
}
}