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

[JS REPL] Extract JS script/repl parts into separate module

Browse Source 
- don't load js evaluation plugin in CLI compiler
This commit is contained in:
Roman Artemev
2021-12-20 19:13:44 +03:00
committed by teamcity
parent c12d1930b4
commit e17f121b23
19 changed files with 81 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/js-test/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
testApi(project(":kotlin-scripting-js"))
testApi(project(":compiler:plugin-api"))
testApi(project(":kotlin-scripting-compiler"))
testApi(project(":kotlin-scripting-compiler-js"))
testApi(project(":compiler:cli"))
testApi(project(":compiler:backend.js"))
testApi(project(":compiler:ir.tree.impl"))
libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/AbstractJsReplTest.kt
+3
View File
@@ -20,6 +20,9 @@ import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigura
import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.platform
import org.jetbrains.kotlin.scripting.js.JsReplCompiler
import org.jetbrains.kotlin.scripting.js.JsReplCompilerState
import org.jetbrains.kotlin.scripting.js.ReplMessageCollector
import org.jetbrains.kotlin.scripting.repl.js.*
import java.io.Closeable
import kotlin.script.experimental.api.ScriptCompilationConfiguration
libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstBinaries.kt
+3 -1
View File
@@ -12,7 +12,9 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.js.engine.ScriptEngineNashorn
import org.jetbrains.kotlin.scripting.compiler.plugin.repl.ReplCodeAnalyzerBase
import org.jetbrains.kotlin.scripting.repl.js.*
import org.jetbrains.kotlin.scripting.js.*
import org.jetbrains.kotlin.scripting.repl.js.JsEvaluationState
import org.jetbrains.kotlin.scripting.repl.js.JsReplEvaluator
import java.util.concurrent.locks.ReentrantReadWriteLock
// 1. Compile dependencies
libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstKlib.kt
+4
View File
@@ -13,6 +13,10 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.js.engine.ScriptEngineNashorn
import org.jetbrains.kotlin.scripting.compiler.plugin.repl.ReplCodeAnalyzerBase
import org.jetbrains.kotlin.scripting.js.JsReplCompilerState
import org.jetbrains.kotlin.scripting.js.JsScriptDependencyCompiler
import org.jetbrains.kotlin.scripting.js.createCompileResult
import org.jetbrains.kotlin.scripting.js.readLibrariesFromConfiguration
import org.jetbrains.kotlin.scripting.repl.js.*
import java.util.concurrent.locks.ReentrantReadWriteLock
libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/ReplTest.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.cli.common.repl.ReplCompileResult
import org.junit.Assert
import org.junit.Test
import org.jetbrains.kotlin.cli.common.repl.ReplEvalResult
import org.jetbrains.kotlin.scripting.repl.js.makeReplCodeLine
import org.jetbrains.kotlin.scripting.js.makeReplCodeLine
abstract class AbstractReplTestRunner : TestCase() {
abstract fun getTester(): AbstractJsReplTest