From 5cb431c5c4330bf9cb9295454e5d616a7604dd92 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 27 Mar 2015 17:36:05 +0300 Subject: [PATCH] Convert JetCoreEnvironment: migrate other code --- compiler/builtins-serializer/src/BuiltInsSerializer.kt | 2 +- .../tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt | 2 +- .../jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt | 2 +- .../kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt | 4 ++-- .../jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt | 2 +- .../org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt | 2 +- .../kotlin/serialization/AbstractLocalClassProtoTest.kt | 4 ++-- .../kotlin/serialization/js/KotlinJavascriptSerializerTest.kt | 2 +- .../lang/resolve/android/test/AbstractAndroidBoxTest.kt | 2 +- .../android/test/AbstractAndroidXml2KConversionTest.kt | 2 +- .../kotlin/lang/resolve/android/test/CompilerTestUtils.kt | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index 19de20bd776..ad049befa43 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -89,7 +89,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) { val builtInModule = BuiltinsSourcesModule() val resolver = JvmAnalyzerFacade.setupResolverForProject( - GlobalContext(), environment.getProject(), listOf(builtInModule), + GlobalContext(), environment.project, listOf(builtInModule), { ModuleContent(files, GlobalSearchScope.EMPTY_SCOPE) }, platformParameters = JvmPlatformParameters { throw IllegalStateException() } ) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt index c5562148dd6..e9a5a7558cd 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt @@ -110,7 +110,7 @@ public class MethodOrderTest: CodegenTestCase() { private fun doTest(sourceText: String, classSuffix: String, expectedOrder: List) { createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_AND_ANNOTATIONS) - myFiles = CodegenTestFiles.create("file.kt", sourceText, myEnvironment!!.getProject()) + myFiles = CodegenTestFiles.create("file.kt", sourceText, myEnvironment!!.project) val classFileForObject = generateClassesInFile().asList().first { it.relativePath.endsWith("$classSuffix.class") } val classReader = ClassReader(classFileForObject.asByteArray()) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt index aa0106292c0..b2037bc03be 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt @@ -42,7 +42,7 @@ public class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() { ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir), EnvironmentConfigFiles.JVM_CONFIG_FILES) - val project = environment.getProject() + val project = environment.project val className = "test.A.B.C" val psiClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project)) assertNotNull(psiClass, "Psi class not found for $className") diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 49d3aca4b06..a2e8960029f 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -57,7 +57,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { val environment = createEnvironment(moduleDirs) val modules = setupModules(environment, moduleDirs) val resolverForProject = JvmAnalyzerFacade.setupResolverForProject( - GlobalContext(), environment.getProject(), modules, + GlobalContext(), environment.project, modules, { m -> ModuleContent(m.kotlinFiles, m.javaFilesScope) }, JvmPlatformParameters { javaClass -> @@ -76,7 +76,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { } private fun setupModules(environment: JetCoreEnvironment, moduleDirs: Array): List { - val project = environment.getProject() + val project = environment.project val modules = HashMap() for (dir in moduleDirs) { val name = dir.getName() diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 9fbaedbd233..c865bd47c0a 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -119,7 +119,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi } fileName.endsWith(".kt") -> { val environment = JetTestUtils.createEnvironmentWithFullJdk(myTestRootDisposable) - val jetFile = JetTestUtils.createFile(file.getPath(), addRuntimeRetentionToKotlinSource(text), environment.getProject()) + val jetFile = JetTestUtils.createFile(file.getPath(), addRuntimeRetentionToKotlinSource(text), environment.project) GenerationUtils.compileFileGetClassFileFactoryForTest(jetFile).writeAllTo(tmpdir) } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt index 2ad30b7b673..686e591a7ce 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt @@ -130,7 +130,7 @@ class MutableDiagnosticsTest : KotlinTestWithEnvironment() { } private inner class DummyDiagnostic : Diagnostic { - val dummyElement = JetPsiFactory(getEnvironment().getProject()).createType("Int") + val dummyElement = JetPsiFactory(getEnvironment().project).createType("Int") ;{ dummyElement.getContainingJetFile().doNotAnalyze = null diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index ab11105bc37..10d79d22da8 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -63,8 +63,8 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { val providerFactory = FileBasedDeclarationProviderFactory(globalContext.storageManager, emptyList()) val injector = InjectorForTopDownAnalyzerForJvm( - environment.getProject(), params, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), module, - providerFactory, GlobalSearchScope.allScope(environment.getProject()) + environment.project, params, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), module, + providerFactory, GlobalSearchScope.allScope(environment.project) ) module.initialize(injector.getJavaDescriptorResolver().packageFragmentProvider) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt index 53c94d9e83f..823df4ce699 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt @@ -70,7 +70,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() { try { val environment = JetCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES) val files = environment.getSourceFiles() - val config = LibrarySourcesConfigWithCaching(environment.getProject(), MODULE_NAME, EcmaVersion.defaultVersion(), false, true, false) + val config = LibrarySourcesConfigWithCaching(environment.project, MODULE_NAME, EcmaVersion.defaultVersion(), false, true, false) val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFiles(files, config) KotlinJavaScriptSerializer().serialize(MODULE_NAME, analysisResult.moduleDescriptor, metaFile) } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt index 9cce900d16f..28f1a03f9c0 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -93,7 +93,7 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { files.addAll(additionalFiles) } myFiles = CodegenTestFiles.create( - myEnvironment!!.getProject(), + myEnvironment!!.project, ArrayUtil.toStringArray(files), JetTestUtils.getHomeDirectory() + "/plugins/android-compiler-plugin/testData" ) diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt index 15c2e0103cb..d4e2cc9b341 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt @@ -31,7 +31,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { public fun doTest(path: String) { val jetCoreEnvironment = getEnvironment(path) - val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.getProject(), path + "AndroidManifest.xml", path + "/res") + val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.project, path + "AndroidManifest.xml", path + "/res") val actual = parser.parse(false) diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt index 32b552179bb..a1fb5b45471 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt @@ -50,7 +50,7 @@ fun UsefulTestCase.createAndroidTestEnvironment( configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, resPath) configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, manifestPath) val myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) - val project = myEnvironment.getProject() + val project = myEnvironment.project ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath)) ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension()) return myEnvironment