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

Change type of KotlinCoreEnvironment::projectEnvironment type

Browse Source
This commit is contained in:
Denis.Zharkov
2021-07-22 16:40:55 +03:00
committed by TeamCityServer
parent d6adac8dd0
commit ea5157cadc
5 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/extensions/ScriptEvaluationExtension.kt
+2 -2
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.cli.common.extensions package org.jetbrains.kotlin.cli.common.extensions
import com.intellij.core.JavaCoreProjectEnvironment
import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
@@ -22,6 +22,6 @@ interface ScriptEvaluationExtension {
fun eval( fun eval(
arguments: CommonCompilerArguments, arguments: CommonCompilerArguments,
configuration: CompilerConfiguration, configuration: CompilerConfiguration,
projectEnvironment: JavaCoreProjectEnvironment projectEnvironment: KotlinCoreEnvironment.ProjectEnvironment
): ExitCode ): ExitCode
} }
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+3 -6
View File
@@ -108,7 +108,7 @@ import java.nio.file.FileSystems
import java.util.zip.ZipFile import java.util.zip.ZipFile
class KotlinCoreEnvironment private constructor( class KotlinCoreEnvironment private constructor(
val projectEnvironment: JavaCoreProjectEnvironment, val projectEnvironment: ProjectEnvironment,
private val initialConfiguration: CompilerConfiguration, private val initialConfiguration: CompilerConfiguration,
configFiles: EnvironmentConfigFiles configFiles: EnvironmentConfigFiles
) { ) {
@@ -196,9 +196,6 @@ class KotlinCoreEnvironment private constructor(
val configuration: CompilerConfiguration = initialConfiguration.apply { setupJdkClasspathRoots(configFiles) }.copy() val configuration: CompilerConfiguration = initialConfiguration.apply { setupJdkClasspathRoots(configFiles) }.copy()
private val jarFileSystem: VirtualFileSystem =
(projectEnvironment as? ProjectEnvironment)?.jarFileSystem ?: applicationEnvironment.jarFileSystem
init { init {
PersistentFSConstants::class.java.getDeclaredField("ourMaxIntellisenseFileSize") PersistentFSConstants::class.java.getDeclaredField("ourMaxIntellisenseFileSize")
.apply { isAccessible = true } .apply { isAccessible = true }
@@ -439,7 +436,7 @@ class KotlinCoreEnvironment private constructor(
} }
private fun findJarRoot(file: File): VirtualFile? = private fun findJarRoot(file: File): VirtualFile? =
jarFileSystem.findFileByPath("$file${URLUtil.JAR_SEPARATOR}") projectEnvironment.jarFileSystem.findFileByPath("$file${URLUtil.JAR_SEPARATOR}")
private fun getSourceRootsCheckingForDuplicates(): List<KotlinSourceRoot> { private fun getSourceRootsCheckingForDuplicates(): List<KotlinSourceRoot> {
val uniqueSourceRoots = hashSetOf<String>() val uniqueSourceRoots = hashSetOf<String>()
@@ -486,7 +483,7 @@ class KotlinCoreEnvironment private constructor(
@JvmStatic @JvmStatic
fun createForProduction( fun createForProduction(
projectEnvironment: JavaCoreProjectEnvironment, configuration: CompilerConfiguration, configFiles: EnvironmentConfigFiles projectEnvironment: ProjectEnvironment, configuration: CompilerConfiguration, configFiles: EnvironmentConfigFiles
): KotlinCoreEnvironment { ): KotlinCoreEnvironment {
val environment = KotlinCoreEnvironment(projectEnvironment, configuration, configFiles) val environment = KotlinCoreEnvironment(projectEnvironment, configuration, configFiles)
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/AbstractScriptEvaluationExtension.kt
+2 -3
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.scripting.compiler.plugin package org.jetbrains.kotlin.scripting.compiler.plugin
import com.intellij.core.JavaCoreProjectEnvironment
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
@@ -31,7 +30,7 @@ abstract class AbstractScriptEvaluationExtension : ScriptEvaluationExtension {
abstract fun setupScriptConfiguration(configuration: CompilerConfiguration) abstract fun setupScriptConfiguration(configuration: CompilerConfiguration)
abstract fun createEnvironment( abstract fun createEnvironment(
projectEnvironment: JavaCoreProjectEnvironment, projectEnvironment: KotlinCoreEnvironment.ProjectEnvironment,
configuration: CompilerConfiguration configuration: CompilerConfiguration
): KotlinCoreEnvironment ): KotlinCoreEnvironment
@@ -43,7 +42,7 @@ abstract class AbstractScriptEvaluationExtension : ScriptEvaluationExtension {
override fun eval( override fun eval(
arguments: CommonCompilerArguments, arguments: CommonCompilerArguments,
configuration: CompilerConfiguration, configuration: CompilerConfiguration,
projectEnvironment: JavaCoreProjectEnvironment projectEnvironment: KotlinCoreEnvironment.ProjectEnvironment
): ExitCode { ): ExitCode {
val messageCollector = configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY) val messageCollector = configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(projectEnvironment.project) val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(projectEnvironment.project)
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JsScriptEvaluationExtension.kt
+2 -9
View File
@@ -5,23 +5,16 @@
package org.jetbrains.kotlin.scripting.compiler.plugin package org.jetbrains.kotlin.scripting.compiler.plugin
import com.intellij.core.JavaCoreProjectEnvironment
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.cli.common.repl.ReplCompileResult
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.ir.backend.js.utils.NameTables
import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.scripting.compiler.plugin.impl.JsScriptCompilerWithDependenciesProxy import org.jetbrains.kotlin.scripting.compiler.plugin.impl.JsScriptCompilerWithDependenciesProxy
import org.jetbrains.kotlin.scripting.compiler.plugin.impl.withMessageCollector
import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.platform import org.jetbrains.kotlin.scripting.definitions.platform
import org.jetbrains.kotlin.scripting.repl.js.* import org.jetbrains.kotlin.scripting.repl.js.JsScriptEvaluator
import kotlin.script.experimental.api.* import kotlin.script.experimental.api.*
import kotlin.script.experimental.host.ScriptingHostConfiguration import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.jvm.JsDependency import kotlin.script.experimental.jvm.JsDependency
@@ -47,7 +40,7 @@ class JsScriptEvaluationExtension : AbstractScriptEvaluationExtension() {
} }
override fun createEnvironment( override fun createEnvironment(
projectEnvironment: JavaCoreProjectEnvironment, projectEnvironment: KotlinCoreEnvironment.ProjectEnvironment,
configuration: CompilerConfiguration configuration: CompilerConfiguration
): KotlinCoreEnvironment { ): KotlinCoreEnvironment {
return KotlinCoreEnvironment.createForProduction( return KotlinCoreEnvironment.createForProduction(
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.scripting.compiler.plugin package org.jetbrains.kotlin.scripting.compiler.plugin
import com.intellij.core.JavaCoreProjectEnvironment
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
@@ -32,7 +31,7 @@ class JvmCliScriptEvaluationExtension : AbstractScriptEvaluationExtension() {
} }
override fun createEnvironment( override fun createEnvironment(
projectEnvironment: JavaCoreProjectEnvironment, projectEnvironment: KotlinCoreEnvironment.ProjectEnvironment,
configuration: CompilerConfiguration configuration: CompilerConfiguration
): KotlinCoreEnvironment { ): KotlinCoreEnvironment {
return KotlinCoreEnvironment.createForProduction(projectEnvironment, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) return KotlinCoreEnvironment.createForProduction(projectEnvironment, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)