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

Fix instability of declaration order of KotlinStaticDeclarationProvider

Browse Source 
It affects how some rendering-related tests behave

^KT-64771 Fixed
This commit is contained in:
Denis.Zharkov
2024-01-09 16:32:41 +01:00
committed by Space Team
parent 7e4d9d9f64
commit 2bdadeb0c8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinStaticDeclarationProvider.kt
+1 -2
View File
@@ -40,7 +40,6 @@ import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub
import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
import org.jetbrains.kotlin.psi.stubs.impl.* import org.jetbrains.kotlin.psi.stubs.impl.*
import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol
import org.jetbrains.kotlin.utils.ifEmpty
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
public class KotlinStaticDeclarationProvider internal constructor( public class KotlinStaticDeclarationProvider internal constructor(
@@ -314,7 +313,7 @@ public class KotlinStaticDeclarationProviderFactory(
val binaryClassCache = ClsKotlinBinaryClassCache.getInstance() val binaryClassCache = ClsKotlinBinaryClassCache.getInstance()
for (root in additionalRoots) { for (root in additionalRoots) {
KotlinFakeClsStubsCache.processAdditionalRoot(root) { additionalRoot -> KotlinFakeClsStubsCache.processAdditionalRoot(root) { additionalRoot ->
val stubs = hashMapOf<VirtualFile, KotlinFileStubImpl>() val stubs = mutableMapOf<VirtualFile, KotlinFileStubImpl>()
VfsUtilCore.visitChildrenRecursively(additionalRoot, object : VirtualFileVisitor<Void>() { VfsUtilCore.visitChildrenRecursively(additionalRoot, object : VirtualFileVisitor<Void>() {
override fun visitFile(file: VirtualFile): Boolean { override fun visitFile(file: VirtualFile): Boolean {
if (!file.isDirectory) { if (!file.isDirectory) {