FIR: remove dependency of :compiler:fir:resolve on :compiler:cli

compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt

@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.java
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.analyzer.ModuleInfo
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.java.deserialization.KotlinDeserializedJvmSymbolsProvider
 import org.jetbrains.kotlin.fir.resolve.FirProvider
@@ -71,16 +70,6 @@ class FirLibrarySession private constructor(
     }
 
     companion object {
-        fun create(
-            moduleInfo: ModuleInfo,
-            sessionProvider: FirProjectSessionProvider,
-            scope: GlobalSearchScope,
-            environment: KotlinCoreEnvironment
-        ): FirLibrarySession = create(
-            moduleInfo, sessionProvider, scope, environment.project,
-            environment.createPackagePartProvider(scope)
-        )
-
         fun create(
             moduleInfo: ModuleInfo,
             sessionProvider: FirProjectSessionProvider,

compiler/fir/resolve/build.gradle.kts

@@ -1,8 +1,3 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("jvm")
     id("jps-compatible")
@@ -13,13 +8,11 @@ dependencies {
     compile(project(":core:deserialization"))
     compile(project(":compiler:fir:cones"))
     compile(project(":compiler:fir:tree"))
-    compile(project(":compiler:cli"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
 
-
     testRuntime(intellijDep())
 
     testCompile(commonDep("junit:junit"))
@@ -29,7 +22,6 @@ dependencies {
     
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntime(project(":kotlin-reflect"))
-
 }
 
 sourceSets {
@@ -43,4 +35,4 @@ projectTest(parallel = true) {
     maxHeapSize = "3g"
 }
 
-testsJar()
+testsJar()

compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt

@@ -58,8 +58,8 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() {
         //For BuiltIns, registered in sessionProvider automatically
         val allProjectScope = GlobalSearchScope.allScope(project)
         FirLibrarySession.create(
-            builtInsModuleInfo, sessionProvider, allProjectScope,
-            environment
+            builtInsModuleInfo, sessionProvider, allProjectScope, project,
+            environment.createPackagePartProvider(allProjectScope)
         )
 
         val configToSession = modules.mapValues { (config, info) ->

compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt

@@ -28,5 +28,6 @@ private fun createSessionForDependencies(
 ) {
     val dependenciesInfo = FirTestModuleInfo()
     moduleInfo.dependencies.add(dependenciesInfo)
-    FirLibrarySession.create(dependenciesInfo, provider, GlobalSearchScope.notScope(sourceScope), environment)
+    val scope = GlobalSearchScope.notScope(sourceScope)
+    FirLibrarySession.create(dependenciesInfo, provider, scope, environment.project, environment.createPackagePartProvider(scope))
 }