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

Rename JetCoreEnvironment -> KotlinCoreEnvironemnt

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-27 17:37:08 +03:00
parent 5cb431c5c4
commit b73bd697e6
68 changed files with 196 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
+3 -3
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.lang.resolve.android.test
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import java.io.File
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.ConfigurationKind
@@ -55,8 +55,8 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
}
}
private fun getEnvironment(testPath: String): JetCoreEnvironment {
private fun getEnvironment(testPath: String): KotlinCoreEnvironment {
val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK)
return JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
return KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
}
}
plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
+3 -3
View File
@@ -27,7 +27,7 @@ import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor
@@ -45,11 +45,11 @@ private class AndroidTestExternalDeclarationsProvider(
fun UsefulTestCase.createAndroidTestEnvironment(
configuration: CompilerConfiguration,
resPath: String,
manifestPath: String): JetCoreEnvironment
manifestPath: String): KotlinCoreEnvironment
{
configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, resPath)
configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, manifestPath)
val myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
val myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
val project = myEnvironment.project
ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath))
ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension())