[FIR] Swap priority of kotlin libraries / built-ins #KT-35948 Fixed

This commit is contained in:
Mikhail Glukhikh
2020-01-23 11:13:09 +03:00
parent c9b1c384e6
commit f949b48b4a
3 changed files with 19 additions and 20 deletions
@@ -95,7 +95,6 @@ class FirLibrarySession private constructor(
FirSymbolProvider::class, FirSymbolProvider::class,
FirCompositeSymbolProvider( FirCompositeSymbolProvider(
listOf( listOf(
FirBuiltinSymbolProvider(this, kotlinScopeProvider),
KotlinDeserializedJvmSymbolsProvider( KotlinDeserializedJvmSymbolsProvider(
this, sessionProvider.project, this, sessionProvider.project,
packagePartProvider, packagePartProvider,
@@ -104,6 +103,7 @@ class FirLibrarySession private constructor(
javaClassFinder, javaClassFinder,
kotlinScopeProvider kotlinScopeProvider
), ),
FirBuiltinSymbolProvider(this, kotlinScopeProvider),
javaSymbolProvider, javaSymbolProvider,
FirDependenciesSymbolProviderImpl(this) FirDependenciesSymbolProviderImpl(this)
) )
@@ -1,7 +1,6 @@
// IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS // IGNORE_BACKEND: JS
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// No kotlin-reflect.jar in this test // No kotlin-reflect.jar in this test
// WITH_RUNTIME // WITH_RUNTIME
@@ -15,30 +15,30 @@ fun n09(p: KProperty2<String, String, Int>) = p.get("", "")
fun n10() = (Foo::func).invoke(Foo("")) fun n10() = (Foo::func).invoke(Foo(""))
fun n11() = (Foo::func)(Foo("")) fun n11() = (Foo::func)(Foo(""))
fun y01() = Foo::prop.<!UNRESOLVED_REFERENCE!>getter<!> fun y01() = Foo::prop.getter
fun y02() = Foo::class.<!UNRESOLVED_REFERENCE!>members<!> fun y02() = Foo::class.members
fun y03() = Foo::class.simpleName fun y03() = Foo::class.simpleName
fun y04() = Foo::class.<!UNRESOLVED_REFERENCE!>properties<!> fun y04() = Foo::class.<!UNRESOLVED_REFERENCE!>properties<!>
fun <T : Any> kclass(k: KClass<*>, kt: KClass<T>) { fun <T : Any> kclass(k: KClass<*>, kt: KClass<T>) {
k.simpleName k.simpleName
k.qualifiedName k.qualifiedName
k.<!UNRESOLVED_REFERENCE!>members<!> k.members
k.<!UNRESOLVED_REFERENCE!>constructors<!> k.constructors
k.<!UNRESOLVED_REFERENCE!>nestedClasses<!> k.nestedClasses
k.<!UNRESOLVED_REFERENCE!>objectInstance<!> k.objectInstance
k.<!UNRESOLVED_REFERENCE!>typeParameters<!> k.typeParameters
k.<!UNRESOLVED_REFERENCE!>supertypes<!> k.supertypes
k.<!UNRESOLVED_REFERENCE!>visibility<!> k.visibility
k.<!UNRESOLVED_REFERENCE!>isFinal<!> k.isFinal
k.<!UNRESOLVED_REFERENCE!>isOpen<!> k.isOpen
k.<!UNRESOLVED_REFERENCE!>isAbstract<!> k.isAbstract
k.<!UNRESOLVED_REFERENCE!>isSealed<!> k.isSealed
k.<!UNRESOLVED_REFERENCE!>isData<!> k.isData
k.<!UNRESOLVED_REFERENCE!>isInner<!> k.isInner
k.<!UNRESOLVED_REFERENCE!>isCompanion<!> k.isCompanion
k.<!UNRESOLVED_REFERENCE!>annotations<!> k.annotations
k.isInstance(42) k.isInstance(42)
k == kt k == kt
@@ -50,7 +50,7 @@ fun ktype(t: KType, t2: KType) {
t.classifier t.classifier
t.arguments t.arguments
t.isMarkedNullable t.isMarkedNullable
t.<!UNRESOLVED_REFERENCE!>annotations<!> t.annotations
t == t2 t == t2
t.hashCode() t.hashCode()