Rename JetCoreEnvironment -> KotlinCoreEnvironemnt

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
@@ -22,7 +22,7 @@ import com.intellij.psi.impl.compiled.ClsElementImpl;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithWithJava;
import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.test.JetTestUtils;
import java.io.File;
@@ -42,7 +42,7 @@ public abstract class AbstractKotlinLightClassTest extends KotlinMultiFileTestWi
}
@NotNull
public static JavaElementFinder createFinder(@NotNull JetCoreEnvironment environment) throws IOException {
public static JavaElementFinder createFinder(@NotNull KotlinCoreEnvironment environment) throws IOException {
// We need to resolve all the files in order too fill in the trace that sits inside LightClassGenerationSupport
JetTestUtils.resolveAllKotlinFiles(environment);
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.config.CommonConfigurationKeys;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment;
@@ -30,7 +30,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
protected JavaElementFinder finder;
@Override
protected JetCoreEnvironment createEnvironment() {
protected KotlinCoreEnvironment createEnvironment() {
CompilerConfiguration configuration = new CompilerConfiguration();
for (File root : getKotlinSourceRoots()) {
@@ -39,7 +39,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
extraConfiguration(configuration);
return JetCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
}
protected void extraConfiguration(@NotNull CompilerConfiguration configuration) {