[CHERRY PICKED FROM IJ] cleanup - don't use trove
GitOrigin-RevId: 73223d3f587588c7646be1e6d820b75c778c8d37 Original commit: https://github.com/JetBrains/intellij-community/commit/8f93ffade2d275693a1ac868ab14f633dfd600ef
This commit is contained in:
committed by
Nikita Bobko
parent
9c0b617c7c
commit
5d0c87e402
+7
-5
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.jps.builders.java.dependencyView
|
package org.jetbrains.jps.builders.java.dependencyView
|
||||||
|
|
||||||
import gnu.trove.TIntHashSet
|
import it.unimi.dsi.fastutil.ints.IntOpenHashSet
|
||||||
import org.jetbrains.jps.builders.java.dependencyView.TypeRepr.ClassType
|
import org.jetbrains.jps.builders.java.dependencyView.TypeRepr.ClassType
|
||||||
import org.jetbrains.kotlin.fileClasses.internalNameWithoutInnerClasses
|
import org.jetbrains.kotlin.fileClasses.internalNameWithoutInnerClasses
|
||||||
import org.jetbrains.kotlin.load.java.JAVAX_NONNULL_ANNOTATION
|
import org.jetbrains.kotlin.load.java.JAVAX_NONNULL_ANNOTATION
|
||||||
@@ -41,7 +41,6 @@ internal class NullabilityAnnotationsTracker : AnnotationsChangeTracker() {
|
|||||||
return handleNullAnnotationsChanges(context, method, changedAnnotations)
|
return handleNullAnnotationsChanges(context, method, changedAnnotations)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun fieldAnnotationsChanged(
|
override fun fieldAnnotationsChanged(
|
||||||
context: NamingContext,
|
context: NamingContext,
|
||||||
field: FieldRepr,
|
field: FieldRepr,
|
||||||
@@ -55,7 +54,12 @@ internal class NullabilityAnnotationsTracker : AnnotationsChangeTracker() {
|
|||||||
protoMember: ProtoMember,
|
protoMember: ProtoMember,
|
||||||
annotations: Sequence<TypeRepr.ClassType>
|
annotations: Sequence<TypeRepr.ClassType>
|
||||||
): Set<Recompile> {
|
): Set<Recompile> {
|
||||||
val nullabilityAnnotations = TIntHashSet(this.annotations.toIntArray { context.get(it) })
|
val n = this.annotations.size
|
||||||
|
val nullabilityAnnotations = IntOpenHashSet(n)
|
||||||
|
for (i in 0 until n) {
|
||||||
|
nullabilityAnnotations.add(context.get(this.annotations.get(i)))
|
||||||
|
}
|
||||||
|
|
||||||
val changedNullAnnotation = annotations.firstOrNull { nullabilityAnnotations.contains(it.className) }
|
val changedNullAnnotation = annotations.firstOrNull { nullabilityAnnotations.contains(it.className) }
|
||||||
|
|
||||||
val result = EnumSet.noneOf(Recompile::class.java)
|
val result = EnumSet.noneOf(Recompile::class.java)
|
||||||
@@ -74,6 +78,4 @@ internal class NullabilityAnnotationsTracker : AnnotationsChangeTracker() {
|
|||||||
private fun <T> Difference.Specifier<T, Difference>.addedOrRemoved(): Sequence<T> =
|
private fun <T> Difference.Specifier<T, Difference>.addedOrRemoved(): Sequence<T> =
|
||||||
added().asSequence() + removed().asSequence()
|
added().asSequence() + removed().asSequence()
|
||||||
|
|
||||||
private inline fun <T> Array<T>.toIntArray(fn: (T) -> Int): IntArray =
|
|
||||||
IntArray(size) { i -> fn(get(i)) }
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user