Cleanup RC deprecations in compiler and plugin.
This commit is contained in:
+1
-1
@@ -88,7 +88,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
|
||||
return
|
||||
}
|
||||
createTypeAnnotationStubs(parent, annotations)
|
||||
val outerTypeChain = sequence(type) { it.outerType(c.typeTable) }.toList()
|
||||
val outerTypeChain = generateSequence(type) { it.outerType(c.typeTable) }.toList()
|
||||
|
||||
createStubForTypeName(classId, parent) {
|
||||
userTypeStub, index ->
|
||||
|
||||
+1
-1
@@ -110,7 +110,7 @@ private fun setupFileStub(fileStub: KotlinFileStubImpl, packageFqName: FqName) {
|
||||
}
|
||||
|
||||
fun createStubForPackageName(packageDirectiveStub: KotlinPlaceHolderStubImpl<KtPackageDirective>, packageFqName: FqName) {
|
||||
val segments = packageFqName.pathSegments().toArrayList()
|
||||
val segments = packageFqName.pathSegments()
|
||||
val iterator = segments.listIterator(segments.size)
|
||||
|
||||
fun recCreateStubForPackageName(current: StubElement<out PsiElement>) {
|
||||
|
||||
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData
|
||||
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
|
||||
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData
|
||||
import org.jetbrains.kotlin.types.KotlinType
|
||||
import kotlin.comparisons.*
|
||||
|
||||
object IdeRenderers {
|
||||
|
||||
@@ -43,8 +44,7 @@ object IdeRenderers {
|
||||
|
||||
@JvmField val HTML_NONE_APPLICABLE_CALLS: Renderer<Collection<ResolvedCall<*>>> = Renderer {
|
||||
calls: Collection<ResolvedCall<*>> ->
|
||||
// TODO: compareBy(comparator, selector) in stdlib
|
||||
val comparator = comparator<ResolvedCall<*>> { c1, c2 -> MemberComparator.INSTANCE.compare(c1.resultingDescriptor, c2.resultingDescriptor) }
|
||||
val comparator = compareBy(MemberComparator.INSTANCE) { c: ResolvedCall<*> -> c.resultingDescriptor }
|
||||
calls
|
||||
.sortedWith(comparator)
|
||||
.joinToString("") { "<li>" + renderResolvedCall(it) + "</li>" }
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ abstract class SelfTargetingIntention<TElement : KtElement>(
|
||||
val leaf2 = file.findElementAt(offset - 1)
|
||||
val commonParent = if (leaf1 != null && leaf2 != null) PsiTreeUtil.findCommonParent(leaf1, leaf2) else null
|
||||
|
||||
var elementsToCheck: Sequence<PsiElement> = sequence { null }
|
||||
var elementsToCheck: Sequence<PsiElement> = emptySequence()
|
||||
if (leaf1 != null) {
|
||||
elementsToCheck += leaf1.parentsWithSelf.takeWhile { it != commonParent }
|
||||
}
|
||||
|
||||
@@ -55,22 +55,22 @@ class CommentSaver(originalElements: PsiChildRange, private val saveLineBreaks:
|
||||
var lastChild: TreeElement? = null
|
||||
|
||||
val children: Sequence<TreeElement>
|
||||
get() = sequence({ firstChild }, { it.next })
|
||||
get() = generateSequence({ firstChild }, { it.next })
|
||||
|
||||
val reverseChildren: Sequence<TreeElement>
|
||||
get() = sequence({ lastChild }, { it.prev })
|
||||
get() = generateSequence({ lastChild }, { it.prev })
|
||||
|
||||
val prevSiblings: Sequence<TreeElement>
|
||||
get() = sequence({ prev }, { it.prev })
|
||||
get() = generateSequence({ prev }, { it.prev })
|
||||
|
||||
val nextSiblings: Sequence<TreeElement>
|
||||
get() = sequence({ next }, { it.next })
|
||||
get() = generateSequence({ next }, { it.next })
|
||||
|
||||
val parents: Sequence<TreeElement>
|
||||
get() = sequence({ parent }, { it.parent })
|
||||
get() = generateSequence({ parent }, { it.parent })
|
||||
|
||||
val parentsWithSelf: Sequence<TreeElement>
|
||||
get() = sequence(this, { it.parent })
|
||||
get() = generateSequence(this, { it.parent })
|
||||
|
||||
val firstLeafInside: TreeElement
|
||||
get() {
|
||||
@@ -101,10 +101,10 @@ class CommentSaver(originalElements: PsiChildRange, private val saveLineBreaks:
|
||||
}
|
||||
|
||||
val prevLeafs: Sequence<TreeElement>
|
||||
get() = sequence({ prevLeaf }, { it.prevLeaf })
|
||||
get() = generateSequence({ prevLeaf }, { it.prevLeaf })
|
||||
|
||||
val nextLeafs: Sequence<TreeElement>
|
||||
get() = sequence({ nextLeaf }, { it.nextLeaf })
|
||||
get() = generateSequence({ nextLeaf }, { it.nextLeaf })
|
||||
|
||||
fun withDescendants(leftToRight: Boolean): Sequence<TreeElement> {
|
||||
val children = if (leftToRight) children else reverseChildren
|
||||
|
||||
Reference in New Issue
Block a user