[FIR] Get rid of dependency on intellijCore from :compiler:fir:resolve

This commit is contained in:
Dmitriy Novozhilov
2020-08-28 14:51:39 +03:00
parent 18ad56f7a8
commit 73e2314f2f
4 changed files with 3 additions and 8 deletions
+2 -1
View File
@@ -15,9 +15,10 @@ dependencies {
compile(project(":compiler:fir:tree"))
compile(project(":compiler:resolution.common"))
compile("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:${property("versions.kotlinx-collections-immutable")}")
implementation(project(":core:util.runtime"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
compileOnly(intellijCoreDep()) { includeJars("guava", rootProject = rootProject) }
}
sourceSets {
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.resolve.calls
import com.intellij.openapi.progress.ProcessCanceledException
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.builder.buildConstructedClassTypeParameterRef
@@ -175,8 +174,6 @@ private fun processConstructors(
}
}
}
} catch (e: ProcessCanceledException) {
throw e
} catch (e: Throwable) {
throw RuntimeException("While processing constructors", e)
}
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.resolve.calls
import com.intellij.util.SmartList
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
@@ -28,6 +27,7 @@ import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
import org.jetbrains.kotlin.fir.types.FirTypeRef
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.AbstractTypeChecker
import org.jetbrains.kotlin.utils.SmartList
import org.jetbrains.kotlin.utils.addIfNotNull
fun BodyResolveComponents.findTypesForSuperCandidates(
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.resolve.transformers.body.resolve
import com.intellij.openapi.progress.ProcessCanceledException
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.declarations.*
@@ -275,8 +274,6 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
callCompleter.completeCall(resultExplicitReceiver, noExpectedType)
}
callCompleter.completeCall(resultExpression, expectedTypeRef)
} catch (e: ProcessCanceledException) {
throw e
} catch (e: Throwable) {
throw RuntimeException("While resolving call ${functionCall.render()}", e)
}