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

FIR accessor symbols: check all possible getter name variants

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-11-21 16:23:51 +03:00
parent ed6238db4b
commit b48a4ace57
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
+17 -9
View File
@@ -23,7 +23,10 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirSuperTypeScope
import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef
import org.jetbrains.kotlin.load.java.propertyNameByGetMethodName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeFirstWord
class JavaClassUseSiteMemberScope(
klass: FirRegularClass,
@@ -86,7 +89,7 @@ class JavaClassUseSiteMemberScope(
private fun processAccessorFunctionsAndPropertiesByName(
propertyName: Name,
getterName: Name,
getterNames: List<Name>,
setterName: Name,
processor: (FirCallableSymbol<*>) -> ProcessorAction
): ProcessorAction {
@@ -98,12 +101,8 @@ class JavaClassUseSiteMemberScope(
}
) return STOP
if (klass is FirJavaClass) {
if (!declaredMemberScope.processFunctionsByName(getterName) { functionSymbol ->
processAccessorFunction(functionSymbol, propertyName, overrideCandidates, processor, isGetter = true)
}
) return STOP
if (propertyName.asString().startsWith(IS_PREFIX)) {
if (!declaredMemberScope.processFunctionsByName(propertyName) { functionSymbol ->
for (getterName in getterNames) {
if (!declaredMemberScope.processFunctionsByName(getterName) { functionSymbol ->
processAccessorFunction(functionSymbol, propertyName, overrideCandidates, processor, isGetter = true)
}
) return STOP
@@ -151,9 +150,18 @@ class JavaClassUseSiteMemberScope(
}
override fun processPropertiesByName(name: Name, processor: (FirCallableSymbol<*>) -> ProcessorAction): ProcessorAction {
val getterName = Name.identifier(GETTER_PREFIX + name.asString().capitalize())
val identifier = name.identifier
val capitalizedAsciiName = identifier.capitalizeAsciiOnly()
val capitalizedFirstWordName = identifier.capitalizeFirstWord(asciiOnly = true)
val getterNames = listOfNotNull(
Name.identifier(GETTER_PREFIX + capitalizedAsciiName),
if (capitalizedFirstWordName == capitalizedAsciiName) null else Name.identifier(GETTER_PREFIX + capitalizedFirstWordName),
name.takeIf { identifier.startsWith(IS_PREFIX) }
).filter {
propertyNameByGetMethodName(it) == name
}
val setterName = Name.identifier(SETTER_PREFIX + name.asString().capitalize())
return processAccessorFunctionsAndPropertiesByName(name, getterName, setterName, processor)
return processAccessorFunctionsAndPropertiesByName(name, getterNames, setterName, processor)
}
companion object {
compiler/fir/resolve/testData/resolve/problems/javaAccessorConversion.kt
Vendored
+4 -4
View File
@@ -55,8 +55,8 @@ public class D {
// FILE: main.kt
fun test_1(x: A) {
val str1 = x.<!UNRESOLVED_REFERENCE!>vmParameters<!> // OK
val str2 = x.vMParameters // should be error
val str1 = x.vmParameters // OK
val str2 = x.<!UNRESOLVED_REFERENCE!>vMParameters<!> // should be error
}
fun test_2(x: B) {
@@ -65,8 +65,8 @@ fun test_2(x: B) {
}
fun test_3(x: C) {
val error = x.vmParameters // should be error
val int = x.vMParameters // should be error
val error = x.<!AMBIGUITY!>vmParameters<!> // should be error
val int = x.<!UNRESOLVED_REFERENCE!>vMParameters<!> // should be error
}
class Foo {
compiler/fir/resolve/testData/resolve/problems/javaAccessorConversion.txt
Vendored
+4 -4
View File
@@ -1,15 +1,15 @@
FILE: main.kt
public final fun test_1(x: R|A|): R|kotlin/Unit| {
lval str1: <ERROR TYPE REF: Unresolved name: vmParameters> = R|<local>/x|.<Unresolved name: vmParameters>#
lval str2: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/x|.R|/A.vMParameters|
lval str1: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/x|.R|/A.vmParameters|
lval str2: <ERROR TYPE REF: Unresolved name: vMParameters> = R|<local>/x|.<Unresolved name: vMParameters>#
}
public final fun test_2(x: R|B|): R|kotlin/Unit| {
lval int: R|ft<kotlin/Int, kotlin/Int?>!| = R|<local>/x|.R|/B.vmParameters|
lval error: <ERROR TYPE REF: Unresolved name: vMParameters> = R|<local>/x|.<Unresolved name: vMParameters>#
}
public final fun test_3(x: R|C|): R|kotlin/Unit| {
lval error: R|ft<kotlin/Int, kotlin/Int?>!| = R|<local>/x|.R|/C.vmParameters|
lval int: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/x|.R|/C.vMParameters|
lval error: <ERROR TYPE REF: Ambiguity: vmParameters, [/C.vmParameters, /C.vmParameters]> = R|<local>/x|.<Ambiguity: vmParameters, [/C.vmParameters, /C.vmParameters]>#
lval int: <ERROR TYPE REF: Unresolved name: vMParameters> = R|<local>/x|.<Unresolved name: vMParameters>#
}
public final class Foo : R|kotlin/Any| {
public constructor(): R|Foo| {