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

Minor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-04-27 15:10:51 +03:00
parent b0e6bf3965
commit 9c0e1204ea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/propertyDetection.kt
+3 -3
View File
@@ -127,7 +127,7 @@ private class PropertyDetector(
} }
val propertyNamesWithConflict = HashSet<String>() val propertyNamesWithConflict = HashSet<String>()
val prohibitedPropertyNames = psiClass.fields.map { it.name }.toMutableSet() //TODO: fields from base val prohibitedPropertyNames = psiClass.fields.mapNotNull { it.name }.toMutableSet() //TODO: fields from base
val propertyNameToGetterInfo = detectGetters(methodsToCheck, prohibitedPropertyNames, propertyNamesWithConflict) val propertyNameToGetterInfo = detectGetters(methodsToCheck, prohibitedPropertyNames, propertyNamesWithConflict)
@@ -223,7 +223,7 @@ private class PropertyDetector(
private fun detectGetters( private fun detectGetters(
methodsToCheck: List<Pair<PsiMethod, SuperInfo.Property?>>, methodsToCheck: List<Pair<PsiMethod, SuperInfo.Property?>>,
prohibitedPropertyNames: MutableSet<String?>, prohibitedPropertyNames: MutableSet<String>,
propertyNamesWithConflict: MutableSet<String> propertyNamesWithConflict: MutableSet<String>
): Map<String, AccessorInfo> { ): Map<String, AccessorInfo> {
val propertyNameToGetterInfo = LinkedHashMap<String, AccessorInfo>() val propertyNameToGetterInfo = LinkedHashMap<String, AccessorInfo>()
@@ -244,7 +244,7 @@ private class PropertyDetector(
private fun detectSetters( private fun detectSetters(
methodsToCheck: List<Pair<PsiMethod, SuperInfo.Property?>>, methodsToCheck: List<Pair<PsiMethod, SuperInfo.Property?>>,
prohibitedPropertyNames: MutableSet<String?>, prohibitedPropertyNames: MutableSet<String>,
propertyNamesFromGetters: Set<String>, propertyNamesFromGetters: Set<String>,
propertyNamesWithConflict: MutableSet<String> propertyNamesWithConflict: MutableSet<String>
): Map<String, AccessorInfo> { ): Map<String, AccessorInfo> {