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

"is" getter naming allowed for non-booleans too

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-09-28 22:20:45 +03:00
parent 20bddce18d
commit 94d8e3f4b6
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
-2
View File
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.typeUtil.isBoolean
import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
import org.jetbrains.kotlin.types.typeUtil.isUnit import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
@@ -118,7 +117,6 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager) : JetScopeImp
private fun isGoodGetMethod(descriptor: FunctionDescriptor): Boolean { private fun isGoodGetMethod(descriptor: FunctionDescriptor): Boolean {
val returnType = descriptor.returnType ?: return false val returnType = descriptor.returnType ?: return false
if (returnType.isUnit()) return false if (returnType.isUnit()) return false
if (descriptor.name.asString().startsWith("is") && !returnType.isBoolean()) return false
return descriptor.valueParameters.isEmpty() return descriptor.valueParameters.isEmpty()
&& descriptor.typeParameters.isEmpty() && descriptor.typeParameters.isEmpty()
compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/IsNaming.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ fun foo(javaClass: JavaClass) {
javaClass.isSomething2 = !javaClass.isSomething2 javaClass.isSomething2 = !javaClass.isSomething2
javaClass.<!UNRESOLVED_REFERENCE!>something<!> javaClass.<!UNRESOLVED_REFERENCE!>something<!>
javaClass.<!FUNCTION_CALL_EXPECTED!>isSomethingWrong<!> javaClass.isSomethingWrong
javaClass.<!UNRESOLVED_REFERENCE!>somethingWrong<!> javaClass.<!UNRESOLVED_REFERENCE!>somethingWrong<!>
javaClass.<!FUNCTION_CALL_EXPECTED!>issueFlag<!> javaClass.<!FUNCTION_CALL_EXPECTED!>issueFlag<!>
j2k/src/org/jetbrains/kotlin/j2k/propertyDetection.kt
-5
View File
@@ -385,11 +385,6 @@ private class PropertyDetector(
if (!Name.isValidIdentifier(name)) return null if (!Name.isValidIdentifier(name)) return null
val propertyName = SyntheticJavaPropertyDescriptor.propertyNameByGetMethodName(Name.identifier(name))?.identifier ?: return null val propertyName = SyntheticJavaPropertyDescriptor.propertyNameByGetMethodName(Name.identifier(name))?.identifier ?: return null
if (name.startsWith("is")) {
val typeText = method.returnType?.canonicalText
if (typeText != "boolean" && typeText != "java.lang.Boolean") return null
}
val returnType = method.returnType ?: return null val returnType = method.returnType ?: return null
if (returnType.canonicalText == "void") return null if (returnType.canonicalText == "void") return null
if (method.typeParameters.isNotEmpty()) return null if (method.typeParameters.isNotEmpty()) return null
j2k/testData/fileOrElement/detectProperties/IsPrefix.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ internal interface I {
val isSomething2: Boolean? val isSomething2: Boolean?
fun isSomething3(): Int val isSomething3: Int
var isSomething4: Boolean var isSomething4: Boolean