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

Minor. Rename compactIfPossible -> compact

Browse Source 
As ArrayList can always be compacted
This commit is contained in:
Denis Zharkov
2017-07-18 12:40:43 +03:00
parent f454858bbb
commit 99a10d8d63
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt
+3 -3
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.utils.addToStdlib.flattenTo
import org.jetbrains.kotlin.utils.compactIfPossible
import org.jetbrains.kotlin.utils.compact
import org.jetbrains.org.objectweb.asm.Type
import java.text.CharacterIterator
import java.text.StringCharacterIterator
@@ -53,7 +53,7 @@ class BinaryClassSignatureParser(globalContext: ClassifierResolutionContext) {
typeParameters.add(parseTypeParameter(signature, context))
}
signature.next()
return typeParameters.compactIfPossible()
return typeParameters.compact()
}
private fun parseTypeParameter(signature: CharacterIterator, context: ClassifierResolutionContext): JavaTypeParameter {
@@ -152,7 +152,7 @@ class BinaryClassSignatureParser(globalContext: ClassifierResolutionContext) {
return PlainJavaClassifierType(
{ context.resolveByInternalName(canonicalName.toString()) },
argumentGroups.reversed().flattenTo(arrayListOf()).compactIfPossible()
argumentGroups.reversed().flattenTo(arrayListOf()).compact()
)
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt
+3 -3
View File
@@ -21,7 +21,7 @@ import com.intellij.util.containers.ContainerUtil
import org.jetbrains.kotlin.load.java.structure.*
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.utils.compactIfPossible
import org.jetbrains.kotlin.utils.compact
import org.jetbrains.org.objectweb.asm.MethodVisitor
import org.jetbrains.org.objectweb.asm.Opcodes
import org.jetbrains.org.objectweb.asm.Type
@@ -95,7 +95,7 @@ abstract class BinaryJavaMethodBase(
else
BinaryJavaMethod(
access, containingClass,
parameterList.compactIfPossible(),
parameterList.compact(),
info.typeParameters,
Name.identifier(name), info.returnType
)
@@ -141,7 +141,7 @@ abstract class BinaryJavaMethodBase(
}
if (iterator.current() != ')') throw ClsFormatException()
paramTypes = (paramTypes as ArrayList).compactIfPossible()
paramTypes = (paramTypes as ArrayList).compact()
}
iterator.next()
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiJavaModule
import com.intellij.psi.PsiModifier
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.utils.compactIfPossible
import org.jetbrains.kotlin.utils.compact
import org.jetbrains.org.objectweb.asm.ClassReader
import org.jetbrains.org.objectweb.asm.ClassVisitor
import org.jetbrains.org.objectweb.asm.ModuleVisitor
@@ -82,7 +82,7 @@ class JavaModuleInfo(
}, ClassReader.SKIP_DEBUG or ClassReader.SKIP_CODE or ClassReader.SKIP_FRAMES)
return if (moduleName != null)
JavaModuleInfo(moduleName!!, requires.compactIfPossible(), exports.compactIfPossible())
JavaModuleInfo(moduleName!!, requires.compact(), exports.compact())
else null
}
}