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

Compiler&plugin deprecations cleanup: length, size, indices, tail and other collection operations.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-06-25 18:49:25 +03:00
parent f3a19ebe11
commit 32144257ec
23 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.kt
+1 -1
View File
@@ -34,7 +34,7 @@ public fun isComponentLike(name: Name): Boolean {
}
public fun getComponentIndex(componentName: Name): Int =
componentName.asString().substring(COMPONENT_FUNCTION_NAME_PREFIX.length).toInt()
componentName.asString().substring(COMPONENT_FUNCTION_NAME_PREFIX.length()).toInt()
public fun createComponentName(index: Int): Name =
Name.identifier(COMPONENT_FUNCTION_NAME_PREFIX + index)
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt
+3 -3
View File
@@ -76,8 +76,8 @@ private class ExplicitTypeBinding(
override fun getArgumentBindings(): List<TypeArgumentBinding<JetTypeElement>?> {
val psiTypeArguments = psiElement.getTypeArgumentsAsTypes()
val isErrorBinding = run {
val sizeIsEqual = psiTypeArguments.size == jetType.getArguments().size
&& psiTypeArguments.size == jetType.getConstructor().getParameters().size
val sizeIsEqual = psiTypeArguments.size() == jetType.getArguments().size()
&& psiTypeArguments.size() == jetType.getConstructor().getParameters().size()
jetType.isError() || !sizeIsEqual
}
@@ -115,7 +115,7 @@ private class NoTypeElementBinding<out P : PsiElement>(
): TypeBinding<P> {
override fun getArgumentBindings(): List<TypeArgumentBinding<P>?> {
val isErrorBinding = jetType.isError() || jetType.getConstructor().getParameters().size != jetType.getArguments().size
val isErrorBinding = jetType.isError() || jetType.getConstructor().getParameters().size() != jetType.getArguments().size()
return jetType.getArguments().indices.map {
val typeProjection = jetType.getArguments()[it]
TypeArgumentBindingImpl(