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

Fix js repl tests compilation

Browse Source
This commit is contained in:
Ilya Chernikov
2020-04-17 13:38:51 +02:00
parent f489e4044f
commit d1a59e8da6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstBinaries.kt
+2 -2
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerDesc
import org.jetbrains.kotlin.ir.backend.js.utils.NameTables import org.jetbrains.kotlin.ir.backend.js.utils.NameTables
import org.jetbrains.kotlin.ir.util.SymbolTable import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.js.engine.ScriptEngineNashorn import org.jetbrains.kotlin.js.engine.ScriptEngineNashorn
import org.jetbrains.kotlin.scripting.compiler.plugin.repl.ReplCodeAnalyzer import org.jetbrains.kotlin.scripting.compiler.plugin.repl.ReplCodeAnalyzerBase
import org.jetbrains.kotlin.scripting.repl.js.* import org.jetbrains.kotlin.scripting.repl.js.*
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
@@ -33,7 +33,7 @@ class JsReplTestAgainstBinaries : AbstractJsReplTest() {
} }
override fun createCompilationState(): JsReplCompilationState { override fun createCompilationState(): JsReplCompilationState {
val replState = ReplCodeAnalyzer.ResettableAnalyzerState() val replState = ReplCodeAnalyzerBase.ResettableAnalyzerState()
val mangler = JsManglerDesc val mangler = JsManglerDesc
val signaturer = IdSignatureDescriptor(mangler) val signaturer = IdSignatureDescriptor(mangler)
return JsReplCompilationState(ReentrantReadWriteLock(), dependencyLoader.loadNames(), dependencies, replState, SymbolTable(signaturer)) return JsReplCompilationState(ReentrantReadWriteLock(), dependencyLoader.loadNames(), dependencies, replState, SymbolTable(signaturer))
libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstKlib.kt
+2 -2
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerDesc
import org.jetbrains.kotlin.ir.backend.js.utils.NameTables import org.jetbrains.kotlin.ir.backend.js.utils.NameTables
import org.jetbrains.kotlin.ir.util.SymbolTable import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.js.engine.ScriptEngineNashorn import org.jetbrains.kotlin.js.engine.ScriptEngineNashorn
import org.jetbrains.kotlin.scripting.compiler.plugin.repl.ReplCodeAnalyzer import org.jetbrains.kotlin.scripting.compiler.plugin.repl.ReplCodeAnalyzerBase
import org.jetbrains.kotlin.scripting.repl.js.* import org.jetbrains.kotlin.scripting.repl.js.*
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
@@ -32,7 +32,7 @@ class JsReplTestAgainstKlib : AbstractJsReplTest() {
ReentrantReadWriteLock(), ReentrantReadWriteLock(),
nameTables, nameTables,
dependencies, dependencies,
ReplCodeAnalyzer.ResettableAnalyzerState(), ReplCodeAnalyzerBase.ResettableAnalyzerState(),
symbolTable symbolTable
) )
} }