From 5eec7d3ac2f44cae727a23e8ff566fa63ab013e1 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 4 Feb 2015 19:40:43 +0300 Subject: [PATCH] Rename jet to kotlin in android-compiler-plugin --- .../kotlin/generators/tests/GenerateTests.kt | 6 +++--- .../src/AndroidComponentRegistrar.kt | 4 +++- .../lang/resolve/android/AndroidConst.kt | 2 +- .../resolve/android/AndroidResourceManager.kt | 2 +- .../resolve/android/AndroidUIXmlProcessor.kt | 2 +- .../lang/resolve/android/AndroidUtil.kt | 2 +- .../lang/resolve/android/AndroidXmlHandler.kt | 2 +- .../android/CliAndroidResourceManager.kt | 2 +- .../android/CliAndroidUIXmlProcessor.kt | 2 +- .../lang/resolve/android/Context.kt | 2 +- .../lang/resolve/android/KotlinWriter.kt | 2 +- .../lang/resolve/android/androidResources.kt | 2 +- .../android/test/AbstractAndroidBoxTest.kt | 12 ++++++------ .../test/AbstractAndroidBytecodeShapeTest.kt | 11 ++++------- .../AbstractAndroidXml2KConversionTest.kt | 19 +++++++------------ .../android/test/AndroidBoxTestGenerated.java | 6 +++--- .../AndroidBytecodeShapeTestGenerated.java | 7 ++++--- .../AndroidXml2KConversionTestGenerated.java | 6 +++--- .../resolve/android/test/CompilerTestUtils.kt | 4 ++-- .../plugin/android/AndroidRenameProcessor.kt | 10 +++++----- .../jet/plugin/android/AndroidXmlVisitor.kt | 5 +++-- 21 files changed, 53 insertions(+), 57 deletions(-) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/AndroidConst.kt (97%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/AndroidResourceManager.kt (97%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/AndroidUIXmlProcessor.kt (99%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/AndroidUtil.kt (96%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/AndroidXmlHandler.kt (97%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/CliAndroidResourceManager.kt (97%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/CliAndroidUIXmlProcessor.kt (97%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/Context.kt (98%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/KotlinWriter.kt (98%) rename plugins/android-compiler-plugin/src/org/jetbrains/{jet => kotlin}/lang/resolve/android/androidResources.kt (94%) rename plugins/android-compiler-plugin/tests/org/jetbrains/{jet => kotlin}/lang/resolve/android/test/AbstractAndroidBoxTest.kt (98%) rename plugins/android-compiler-plugin/tests/org/jetbrains/{jet => kotlin}/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt (88%) rename plugins/android-compiler-plugin/tests/org/jetbrains/{jet => kotlin}/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt (86%) rename plugins/android-compiler-plugin/tests/org/jetbrains/{jet => kotlin}/lang/resolve/android/test/AndroidBoxTestGenerated.java (95%) rename plugins/android-compiler-plugin/tests/org/jetbrains/{jet => kotlin}/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java (90%) rename plugins/android-compiler-plugin/tests/org/jetbrains/{jet => kotlin}/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java (94%) rename plugins/android-compiler-plugin/tests/org/jetbrains/{jet => kotlin}/lang/resolve/android/test/CompilerTestUtils.kt (94%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index f3d54a45ffd..f95f696c61a 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -147,9 +147,9 @@ import org.jetbrains.jet.android.AbstractAndroidGotoTest import org.jetbrains.jet.jps.build.android.AbstractAndroidJpsTestCase import org.jetbrains.jet.android.AbstractAndroidRenameTest import org.jetbrains.jet.android.AbstractAndroidFindUsagesTest -import org.jetbrains.jet.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest -import org.jetbrains.jet.lang.resolve.android.test.AbstractAndroidXml2KConversionTest -import org.jetbrains.jet.lang.resolve.android.test.AbstractAndroidBoxTest +import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest +import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidXml2KConversionTest +import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBoxTest import org.jetbrains.jet.android.AbstractParserResultEqualityTest fun main(args: Array) { diff --git a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt index 7f06db9227a..85abd9f8bcb 100644 --- a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt +++ b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor import org.jetbrains.kotlin.compiler.plugin.CliOption import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider -import org.jetbrains.jet.lang.resolve.android.* import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension @@ -49,6 +48,9 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.kotlin.codegen.FunctionCodegen import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey +import org.jetbrains.kotlin.lang.resolve.android.AndroidConst +import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor +import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor public object AndroidConfigurationKeys { diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt similarity index 97% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt index 16301038ff4..7fddec9404a 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import com.intellij.openapi.util.Key diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt similarity index 97% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt index 1108218e247..a758b033e25 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import com.intellij.psi.PsiFile import com.intellij.psi.PsiElement diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt similarity index 99% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt index 96882ec475e..07ae9a8ef6a 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import java.util.ArrayList import java.util.HashMap diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUtil.kt similarity index 96% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUtil.kt index e46b7666d21..250ae293794 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUtil.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import com.intellij.psi.PsiFile import com.intellij.psi.PsiElement diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidXmlHandler.kt similarity index 97% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidXmlHandler.kt index 99ef5e6315c..bf09b6d34cf 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidXmlHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import org.xml.sax.helpers.DefaultHandler import org.xml.sax.Attributes diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt similarity index 97% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt index a87b2f0eaac..11f107b570a 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import com.intellij.openapi.project.Project import java.io.File diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt similarity index 97% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt index c714d37ee2e..cd4e8b36ee6 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import java.util.ArrayList import com.intellij.openapi.project.Project diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/Context.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt similarity index 98% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/Context.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt index 242c49a8926..ab29546d537 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/Context.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android import java.util.ArrayList diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt similarity index 98% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt index 4f15bcb7be6..ae17953b5b2 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android trait KotlinWriter { fun toStringBuffer(): StringBuffer diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/androidResources.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt similarity index 94% rename from plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/androidResources.kt rename to plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt index 360d0202f89..23cc1efaa36 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/androidResources.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android +package org.jetbrains.kotlin.lang.resolve.android public data class AndroidModuleInfo(val applicationPackage: String, val mainResDirectory: String?) diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt similarity index 98% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBoxTest.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt index e1ace9a7c36..127b977cf24 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android.test +package org.jetbrains.kotlin.lang.resolve.android.test +import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest +import org.jetbrains.kotlin.config.CompilerConfiguration import java.io.File import com.intellij.util.Processor +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.JetTestUtils import java.util.regex.Pattern import com.intellij.openapi.util.io.FileUtil import java.util.ArrayList import java.util.Collections import com.intellij.util.ArrayUtil -import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest -import org.jetbrains.kotlin.test.JetTestUtils -import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.TestJdkKind -import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.codegen.CodegenTestFiles public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt similarity index 88% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt index 4fef10b8583..fa7dbfd27a4 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt @@ -14,16 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android.test +package org.jetbrains.kotlin.lang.resolve.android.test -import org.jetbrains.kotlin.android.AndroidConfigurationKeys -import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension -import org.jetbrains.kotlin.android.AndroidExpressionCodegen import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.TestJdkKind -import org.jetbrains.kotlin.config.CompilerConfiguration +import org.jetbrains.kotlin.test.JetTestUtils public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTest() { @@ -48,4 +45,4 @@ public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTes val expected = readExpectedOccurrences(fileName) countAndCompareActualOccurrences(expected) } -} +} \ No newline at end of file diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt similarity index 86% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt index 0c74f90c5e3..c2d18afeb5d 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt @@ -14,23 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android.test +package org.jetbrains.kotlin.lang.resolve.android.test import com.intellij.testFramework.UsefulTestCase -import java.io.File -import java.io.IOException -import java.util.Scanner -import java.io.FileWriter -import org.junit.Assert -import kotlin.test.fail -import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor -import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor -import kotlin.test.assertEquals -import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment +import java.io.File +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor +import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor +import kotlin.test.* public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { @@ -64,4 +59,4 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) return JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) } -} +} \ No newline at end of file diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBoxTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java similarity index 95% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBoxTestGenerated.java rename to plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java index 3cea43ce2fd..88dcb84a4c5 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBoxTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android.test; +package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({AndroidBoxTestGenerated.Android.class, AndroidBoxTestGenerated.Invoke.class}) @RunWith(JUnit3RunnerWithInners.class) diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java similarity index 90% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java rename to plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java index 4a3b497235b..bf5007cfea2 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android.test; +package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -25,7 +26,7 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape") @TestDataPath("$PROJECT_ROOT") diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java similarity index 94% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java rename to plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java index 80d3d1827ce..808f94dc3fa 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android.test; +package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({AndroidXml2KConversionTestGenerated.Simple.class, AndroidXml2KConversionTestGenerated.Exceptions.class}) @RunWith(JUnit3RunnerWithInners.class) diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt similarity index 94% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/CompilerTestUtils.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt index 790358662f9..9b921ceea7c 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/CompilerTestUtils.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.android.test +package org.jetbrains.kotlin.lang.resolve.android.test import com.intellij.openapi.project.Project import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider @@ -22,12 +22,12 @@ import org.jetbrains.kotlin.android.AndroidConfigurationKeys import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.android.AndroidExpressionCodegen import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor 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.EnvironmentConfigFiles +import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor private class AndroidTestExternalDeclarationsProvider( val project: Project, diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt index f19d57d95e5..acdbf402d98 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt @@ -18,9 +18,7 @@ package org.jetbrains.jet.plugin.android import com.intellij.psi.PsiElement import com.intellij.refactoring.rename.RenamePsiElementProcessor -import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement import com.intellij.openapi.components.ServiceManager -import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor import com.intellij.psi.search.SearchScope import com.intellij.psi.xml.XmlAttributeValue import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper @@ -29,11 +27,11 @@ import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.impl.light.LightElement import com.intellij.openapi.module.ModuleServiceManager import com.intellij.openapi.module.Module -import org.jetbrains.jet.lang.resolve.android.nameToIdDeclaration -import org.jetbrains.jet.lang.resolve.android.idToName +import org.jetbrains.kotlin.lang.resolve.android.nameToIdDeclaration +import org.jetbrains.kotlin.lang.resolve.android.idToName import com.intellij.psi.PsiField import com.intellij.psi.PsiClass -import org.jetbrains.jet.lang.resolve.android.AndroidConst +import org.jetbrains.kotlin.lang.resolve.android.AndroidConst import com.intellij.openapi.module.ModuleUtil import com.intellij.openapi.module.ModuleUtilCore import org.jetbrains.kotlin.psi.JetProperty @@ -42,6 +40,8 @@ import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.moduleInfo import org.jetbrains.kotlin.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement +import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor public class AndroidRenameProcessor : RenamePsiElementProcessor() { diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt index 72171baf301..ea0c2940ce6 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt @@ -22,8 +22,9 @@ import com.intellij.psi.xml.XmlElement import com.intellij.psi.xml.XmlTag import com.intellij.psi.xml.XmlAttribute import org.jetbrains.jet.lang.resolve.android.AndroidResourceManager -import org.jetbrains.jet.lang.resolve.android.idToName -import org.jetbrains.jet.lang.resolve.android.AndroidConst +import org.jetbrains.kotlin.lang.resolve.android.idToName +import org.jetbrains.kotlin.lang.resolve.android.AndroidConst +import org.jetbrains.kotlin.lang.resolve.android.AndroidResourceManager class AndroidXmlVisitor( val resourceManager: AndroidResourceManager,