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

Review changes: revert compiler behaviour, add test, remove inner classes

Browse Source
This commit is contained in:
Nikolay Krasko
2019-03-11 15:45:12 +03:00
committed by Nikolay Krasko
parent 6ba134b1be
commit 213b98fefe
5 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/propertiesConventionUtil.kt
+2 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.load.java
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeSmart
import org.jetbrains.kotlin.load.java.BuiltinSpecialProperties.getPropertyNameCandidatesBySpecialGetterName
import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeSmartForCompiler
fun propertyNameByGetMethodName(methodName: Name): Name?
@@ -43,7 +44,7 @@ private fun propertyNameFromAccessorMethodName(methodName: Name, prefix: String,
}
if (!removePrefix) return methodName
val name = identifier.removePrefix(prefix).decapitalizeSmart(asciiOnly = true)
val name = identifier.removePrefix(prefix).decapitalizeSmartForCompiler(asciiOnly = true)
if (!Name.isValidIdentifier(name)) return null
return Name.identifier(name)
}