diff --git a/.idea/artifacts/KotlinAndroidExtensions.xml b/.idea/artifacts/KotlinAndroidExtensions.xml new file mode 100644 index 00000000000..915ae4349f0 --- /dev/null +++ b/.idea/artifacts/KotlinAndroidExtensions.xml @@ -0,0 +1,21 @@ + + + $PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/extensions/ExpressionCodegenExtension.kt b/compiler/backend/src/org/jetbrains/jet/codegen/extensions/ExpressionCodegenExtension.kt index a932ca2d647..67459befb33 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/extensions/ExpressionCodegenExtension.kt +++ b/compiler/backend/src/org/jetbrains/jet/codegen/extensions/ExpressionCodegenExtension.kt @@ -17,14 +17,13 @@ package org.jetbrains.jet.codegen.extensions import org.jetbrains.jet.extensions.ProjectExtensionDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.codegen.StackValue -import org.jetbrains.jet.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.JetTypeMapper import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter -import org.jetbrains.jet.codegen.ClassBodyCodegen -import org.jetbrains.jet.codegen.ClassBuilder -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.codegen.StackValue +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.codegen.ClassBuilder +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor public trait ExpressionCodegenExtension { class object : ProjectExtensionDescriptor("org.jetbrains.kotlin.expressionCodegenExtension", javaClass()) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/PluginCliParser.kt b/compiler/cli/src/org/jetbrains/jet/cli/jvm/PluginCliParser.kt index 1a11fce9244..647210c0cc7 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/PluginCliParser.kt +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/PluginCliParser.kt @@ -17,19 +17,13 @@ package org.jetbrains.jet.cli.jvm import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments import kotlin.platform.* import java.util.jar.JarFile import java.util.jar.Attributes import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException import java.util.regex.Pattern -import org.jetbrains.jet.utils.valuesToMap -import org.jetbrains.jet.config.CompilerConfiguration import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.compiler.plugin.CliOption -import org.jetbrains.jet.cli.common.messages.MessageCollector -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation import java.net.URLClassLoader import java.net.URL import java.io.File @@ -39,6 +33,9 @@ import java.io.IOException import java.util.Enumeration import org.jetbrains.kotlin.compiler.plugin.parsePluginOption import org.jetbrains.kotlin.compiler.plugin.CliOptionValue +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.utils.valuesToMap +import org.jetbrains.kotlin.config.CompilerConfiguration public object PluginCliParser { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt index b5d844afa20..7ab68e4d788 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt @@ -34,11 +34,11 @@ import org.jetbrains.kotlin.analyzer.ModuleContent import org.jetbrains.kotlin.di.InjectorForLazyResolveWithJava import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.psi.JetFile import java.util.ArrayList import org.jetbrains.jet.extensions.ExternalDeclarationsProvider import kotlin.platform.platformStatic import com.intellij.openapi.module.Module +import org.jetbrains.kotlin.psi.JetFile public class JvmResolverForModule( override val lazyResolveSession: ResolveSession, diff --git a/compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt b/compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt index 8aef4f9ff93..f56a686fa6d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.extensions -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ModuleInfo +import org.jetbrains.kotlin.psi.JetFile public trait ExternalDeclarationsProvider { class object : ProjectExtensionDescriptor( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt index 02c688ee7ce..639043c7fe7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt @@ -32,7 +32,7 @@ import java.io.StringWriter import com.intellij.openapi.application.ApplicationManager import com.intellij.psi.PsiComment import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ModuleInfo public fun JetPsiFactory(project: Project?): JetPsiFactory = JetPsiFactory(project!!) public fun JetPsiFactory(contextElement: JetElement): JetPsiFactory = JetPsiFactory(contextElement.getProject()) diff --git a/compiler/plugin-api/plugin-api.iml b/compiler/plugin-api/plugin-api.iml index cde2d646b38..8fade408030 100644 --- a/compiler/plugin-api/plugin-api.iml +++ b/compiler/plugin-api/plugin-api.iml @@ -9,6 +9,6 @@ + - - + \ No newline at end of file diff --git a/compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfiguration.java b/compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfiguration.java deleted file mode 100644 index 35a0db766d5..00000000000 --- a/compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfiguration.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.config; - -import com.intellij.openapi.util.Key; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.*; - -@SuppressWarnings("unchecked") -public class CompilerConfiguration { - private final Map map = new HashMap(); - private boolean readOnly = false; - - @Nullable - public T get(@NotNull CompilerConfigurationKey key) { - T data = (T) map.get(key.ideaKey); - return data == null ? null : unmodifiable(data); - } - - @NotNull - public T get(@NotNull CompilerConfigurationKey key, @NotNull T defaultValue) { - T data = (T) map.get(key.ideaKey); - return data == null ? defaultValue : unmodifiable(data); - } - - @NotNull - public List getList(@NotNull CompilerConfigurationKey> key) { - List data = (List) map.get(key.ideaKey); - if (data == null) { - return Collections.emptyList(); - } - else { - return Collections.unmodifiableList(data); - } - } - - public void put(@NotNull CompilerConfigurationKey key, @Nullable T value) { - checkReadOnly(); - map.put(key.ideaKey, value); - } - - public void add(@NotNull CompilerConfigurationKey> key, @NotNull T value) { - checkReadOnly(); - Key> ideaKey = key.ideaKey; - if (map.get(ideaKey) == null) { - map.put(ideaKey, new ArrayList()); - } - List list = (List) map.get(ideaKey); - list.add(value); - } - - public void addAll(@NotNull CompilerConfigurationKey> key, @NotNull Collection values) { - checkReadOnly(); - checkForNullElements(values); - Key> ideaKey = key.ideaKey; - if (map.get(ideaKey) == null) { - map.put(ideaKey, new ArrayList()); - } - List list = (List) map.get(ideaKey); - list.addAll(values); - } - - public CompilerConfiguration copy() { - CompilerConfiguration copy = new CompilerConfiguration(); - copy.map.putAll(map); - return copy; - } - - private void checkReadOnly() { - if (readOnly) { - throw new IllegalStateException("CompilerConfiguration is read-only"); - } - } - - public void setReadOnly(boolean readOnly) { - if (readOnly != this.readOnly) { - checkReadOnly(); - this.readOnly = readOnly; - } - } - - @NotNull - private static T unmodifiable(@NotNull T object) { - if (object instanceof List) { - return (T) Collections.unmodifiableList((List) object); - } - else if (object instanceof Map) { - return (T) Collections.unmodifiableMap((Map) object); - } - else if (object instanceof Collection) { - return (T) Collections.unmodifiableCollection((Collection) object); - } - else { - return object; - } - } - - @Override - public String toString() { - return map.toString(); - } - - private static void checkForNullElements(Collection values) { - int index = 0; - for (T value : values) { - if (value == null) { - throw new IllegalArgumentException("Element " + index - + " is null, while null values in compiler configuration are not allowed"); - } - index++; - } - } -} diff --git a/compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfigurationKey.java b/compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfigurationKey.java deleted file mode 100644 index 393c89a9ffb..00000000000 --- a/compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfigurationKey.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.config; - -import com.intellij.openapi.util.Key; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; - -public class CompilerConfigurationKey { - Key ideaKey; - - private CompilerConfigurationKey(@NotNull @NonNls String name) { - ideaKey = Key.create(name); - } - - @NotNull - public static CompilerConfigurationKey create(@NotNull @NonNls String name) { - return new CompilerConfigurationKey(name); - } -} diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt index 0f84f4331ae..36ff1d18f43 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.compiler.plugin -import org.jetbrains.jet.config.CompilerConfiguration +import org.jetbrains.kotlin.config.CompilerConfiguration public trait CommandLineProcessor { public val pluginId: String diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt index e9e8ec8e629..873ef1c5f4a 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.compiler.plugin -import org.jetbrains.jet.config.CompilerConfigurationKey -import org.jetbrains.jet.config.CompilerConfiguration import com.intellij.mock.MockProject +import org.jetbrains.kotlin.config.CompilerConfigurationKey +import org.jetbrains.kotlin.config.CompilerConfiguration public trait ComponentRegistrar { class object { diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 03c9b298e76..f3d54a45ffd 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -142,7 +142,6 @@ import org.jetbrains.kotlin.completion.handlers.AbstractKeywordCompletionHandler import org.jetbrains.kotlin.idea.kdoc.AbstractKDocHighlightingTest import org.jetbrains.kotlin.addImport.AbstractAddImportTest import org.jetbrains.kotlin.idea.highlighter.* -import org.jetbrains.jet.android.AbstractCrossParserTest import org.jetbrains.jet.android.AbstractAndroidCompletionTest import org.jetbrains.jet.android.AbstractAndroidGotoTest import org.jetbrains.jet.jps.build.android.AbstractAndroidJpsTestCase @@ -151,6 +150,7 @@ 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.jet.android.AbstractParserResultEqualityTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt index 7f6f16ed81c..988bc24fa65 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.findUsages.handlers import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.psi.PsiElement -import org.jetbrains.jet.plugin.references.JetSimpleNameReference -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import org.jetbrains.kotlin.psi.JetPsiFactory public trait SimpleNameReferenceExtension { class object { diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt index 3a3833d83e6..0b5650aeef7 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt +++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -16,7 +16,6 @@ package org.jetbrains.jet.jps.build -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.CompileContext diff --git a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt index baaf4e02d84..2dc6b43b68e 100644 --- a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt +++ b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt @@ -17,40 +17,38 @@ package org.jetbrains.kotlin.android import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar -import org.jetbrains.jet.config.CompilerConfiguration import com.intellij.mock.MockProject -import org.jetbrains.jet.config.CompilerConfigurationKey import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor import org.jetbrains.kotlin.compiler.plugin.CliOption import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException import org.jetbrains.jet.extensions.ExternalDeclarationsProvider -import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.resolve.android.* import com.intellij.openapi.components.ServiceManager -import org.jetbrains.jet.utils.emptyOrSingletonList import com.intellij.openapi.project.Project import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.codegen.StackValue -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.org.objectweb.asm.Type -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.codegen.ClassBuilder import org.jetbrains.org.objectweb.asm.Opcodes.* -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.codegen.FunctionCodegen -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.org.objectweb.asm.Label -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetClassBody -import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor -import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaClassDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ModuleInfo +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.codegen.StackValue +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor +import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor +import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor +import org.jetbrains.kotlin.codegen.ClassBuilder +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.JetClassBody +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 public object AndroidConfigurationKeys { @@ -83,7 +81,7 @@ public class AndroidCommandLineProcessor : CommandLineProcessor { public class CliAndroidDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider { override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection { val parser = ServiceManager.getService(project, javaClass()) - return emptyOrSingletonList(parser.parseToPsi()) + return parser.parseToPsi() ?: listOf() } } @@ -218,7 +216,7 @@ public class AndroidComponentRegistrar : ComponentRegistrar { public override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) { val androidResPath = configuration.get(AndroidConfigurationKeys.ANDROID_RES_PATH) val androidManifest = configuration.get(AndroidConfigurationKeys.ANDROID_MANIFEST) - project.registerService(javaClass(), CliAndroidUIXmlProcessor(project, androidResPath, androidManifest)) + project.registerService(javaClass(), CliAndroidUIXmlProcessor(project, androidManifest, androidResPath)) ExternalDeclarationsProvider.registerExtension(project, CliAndroidDeclarationsProvider(project)) ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen()) diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.kt index be2de168304..16301038ff4 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.kt @@ -20,7 +20,8 @@ import com.intellij.openapi.util.Key public object AndroidConst { val ANDROID_USER_PACKAGE: Key = Key.create("ANDROID_USER_PACKAGE") - val SYNTHETIC_FILENAME: String = "ANDROIDXML.kt" + val SYNTHETIC_FILENAME: String = "ANDROIDXML" + val SYNTHETIC_PACKAGE: String = "kotlinx.android.synthetic." val ANDROID_NAMESPACE: String = "android" val ID_ATTRIBUTE_NO_NAMESPACE: String = "id" diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt index 8414452c2cd..e46b7666d21 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt @@ -19,21 +19,19 @@ package org.jetbrains.jet.lang.resolve.android import com.intellij.psi.PsiFile import com.intellij.psi.PsiElement import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.psi.JetFile import com.intellij.openapi.components.ServiceManager import com.intellij.psi.PsiField import com.intellij.psi.PsiClass -import org.jetbrains.jet.utils.emptyOrSingletonList import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.Computable import com.intellij.openapi.module.ModuleServiceManager fun isAndroidSyntheticFile(f: PsiFile?): Boolean { - return f?.getUserData(org.jetbrains.jet.lang.resolve.android.AndroidConst.ANDROID_USER_PACKAGE) != null + return f?.getUserData(AndroidConst.ANDROID_USER_PACKAGE) != null } public fun isAndroidSyntheticElement(element: PsiElement?): Boolean { - return isAndroidSyntheticFile(ApplicationManager.getApplication()!!.runReadAction(Computable { + return isAndroidSyntheticFile(ApplicationManager.getApplication().runReadAction(Computable { element?.getContainingFile() })) } diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt index e92c1681e87..c714d37ee2e 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt @@ -32,17 +32,18 @@ public class CliAndroidUIXmlProcessor( CliAndroidResourceManager(project, manifestPath, mainResDirectory) } - override fun parseSingleFile(file: PsiFile): String { - val ids: MutableCollection = ArrayList() - val handler = AndroidXmlHandler(resourceManager, { id, clazz -> ids.add(AndroidWidget(id, clazz)) }) + override fun parseSingleFile(file: PsiFile): Collection { + val widgets: MutableCollection = ArrayList() + val handler = AndroidXmlHandler(resourceManager, { id, clazz -> widgets.add(AndroidWidget(id, clazz)) }) + try { val inputStream = ByteArrayInputStream(file.getVirtualFile().contentsToByteArray()) resourceManager.saxParser.parse(inputStream, handler) - return produceKotlinProperties(KotlinStringWriter(), ids).toString() + return widgets } catch (e: Throwable) { LOG.error(e) - return "" + return listOf() } } } diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt index d1d27f9a878..4f15bcb7be6 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt @@ -17,12 +17,12 @@ package org.jetbrains.jet.lang.resolve.android trait KotlinWriter { - fun output(): StringBuffer + fun toStringBuffer(): StringBuffer } class KotlinStringWriter : KotlinWriter { - private val ctx = org.jetbrains.jet.lang.resolve.android.Context() + private val ctx = Context() private val imports = ctx.fork() private val body = ctx.fork() @@ -91,9 +91,13 @@ class KotlinStringWriter : KotlinWriter { body.newLine() } - override fun output(): StringBuffer { + override fun toStringBuffer(): StringBuffer { ctx.absorbChildren() return ctx.buffer } + + override fun toString(): String { + return ctx.buffer.toString() + } } 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/jet/lang/resolve/android/test/AbstractAndroidBoxTest.kt index f1f1a7901ae..e1ace9a7c36 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -16,20 +16,19 @@ package org.jetbrains.jet.lang.resolve.android.test -import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest -import org.jetbrains.jet.config.CompilerConfiguration import java.io.File import com.intellij.util.Processor -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.TestJdkKind -import org.jetbrains.jet.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.jet.JetTestCaseBuilder -import org.jetbrains.jet.codegen.CodegenTestFiles +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() { @@ -96,7 +95,7 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { myFiles = CodegenTestFiles.create( myEnvironment!!.getProject(), ArrayUtil.toStringArray(files), - JetTestCaseBuilder.getHomeDirectory() + "/plugins/android-compiler-plugin/testData" + JetTestUtils.getHomeDirectory() + "/plugins/android-compiler-plugin/testData" ) blackBox(); } 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/jet/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt index 9e996edcb9f..ffbb40b0e00 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt @@ -16,18 +16,15 @@ package org.jetbrains.jet.lang.resolve.android.test -import org.jetbrains.jet.codegen.AbstractBytecodeTextTest -import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.TestJdkKind -import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.android.AndroidConfigurationKeys import org.jetbrains.jet.extensions.ExternalDeclarationsProvider import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.android.AndroidExpressionCodegen -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.config.CompilerConfiguration public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTest() { 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/jet/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt index fee72b066b7..0c74f90c5e3 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt @@ -21,17 +21,16 @@ import java.io.File import java.io.IOException import java.util.Scanner import java.io.FileWriter -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.TestJdkKind -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys import org.junit.Assert import kotlin.test.fail -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles 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 org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { @@ -41,7 +40,15 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { val actual = parser.parse() - JetTestUtils.assertEqualsToFile(File(path + "/layout.kt"), actual) + val layoutFiles = File(path).listFiles { + it.isFile() && it.name.startsWith("layout") && it.name.endsWith(".kt") + }?.sortBy { it.name } ?: listOf() + + assertEquals(layoutFiles.size(), actual.size()) + + for ((index, file) in layoutFiles.withIndex()) { + JetTestUtils.assertEqualsToFile(file, actual[index]) + } } public fun doNoManifestTest(path: String) { 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/jet/lang/resolve/android/test/AndroidBoxTestGenerated.java index 626f2e5ef0b..3cea43ce2fd 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBoxTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBoxTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; 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/jet/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java index 4ae0249cea5..4a3b497235b 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java @@ -17,10 +17,9 @@ package org.jetbrains.jet.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; 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/jet/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java index 28379255a45..80d3d1827ce 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; 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/jet/lang/resolve/android/test/CompilerTestUtils.kt index 8196e62fd71..e77a35b894e 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/CompilerTestUtils.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/CompilerTestUtils.kt @@ -18,17 +18,16 @@ package org.jetbrains.jet.lang.resolve.android.test import com.intellij.openapi.project.Project import org.jetbrains.jet.extensions.ExternalDeclarationsProvider -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.utils.emptyOrSingletonList -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.android.AndroidConfigurationKeys -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.android.AndroidExpressionCodegen -import org.jetbrains.jet.config.CompilerConfiguration import com.intellij.testFramework.UsefulTestCase import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor -import org.jetbrains.jet.analyzer.ModuleInfo +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 private class AndroidTestExternalDeclarationsProvider( val project: Project, @@ -37,7 +36,7 @@ private class AndroidTestExternalDeclarationsProvider( ) : ExternalDeclarationsProvider { override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection { val parser = CliAndroidUIXmlProcessor(project, manifestPath, resPath) - return emptyOrSingletonList(parser.parseToPsi()) + return parser.parseToPsi() ?: listOf() } } diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-idea-plugin/android-idea-plugin.iml index 6a5b03f5bf2..63cc19500f0 100644 --- a/plugins/android-idea-plugin/android-idea-plugin.iml +++ b/plugins/android-idea-plugin/android-idea-plugin.iml @@ -15,5 +15,6 @@ + \ No newline at end of file diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidFindMemberUsagesHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidFindMemberUsagesHandler.kt index ef9f71a3873..e543514fb96 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidFindMemberUsagesHandler.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidFindMemberUsagesHandler.kt @@ -21,18 +21,18 @@ import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo import com.intellij.util.Processor import com.intellij.find.findUsages.FindUsagesOptions -import org.jetbrains.jet.lang.psi.JetNamedDeclaration import com.intellij.openapi.actionSystem.DataContext 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.xml.XmlAttribute -import org.jetbrains.jet.lang.psi.JetProperty import org.jetbrains.android.util.AndroidResourceUtil import java.util.ArrayList import com.intellij.find.findUsages.JavaVariableFindUsagesOptions import org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.idea.util.application.runReadAction class AndroidFindUsageHandlerDecorator : KotlinFindUsagesHandlerDecorator { override fun decorateHandler(element: PsiElement, forHighlightUsages: Boolean, delegate: FindUsagesHandler): FindUsagesHandler { diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt index 6b92c474370..c7d5fbe1ea0 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt @@ -23,15 +23,15 @@ import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.components.ServiceManager import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor import com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.jet.plugin.references.JetSimpleNameReference -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetProperty import com.intellij.psi.impl.light.LightElement import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.PsiField import com.intellij.openapi.module.ModuleServiceManager -import org.jetbrains.jet.plugin.caches.resolve.getModuleInfo -import org.jetbrains.jet.plugin.caches.resolve.ModuleSourceInfo +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo +import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo public class AndroidGotoDeclarationHandler : GotoDeclarationHandler { 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 cc9b8b4f846..f19d57d95e5 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,8 +18,6 @@ package org.jetbrains.jet.plugin.android import com.intellij.psi.PsiElement import com.intellij.refactoring.rename.RenamePsiElementProcessor -import org.jetbrains.jet.asJava.* -import org.jetbrains.jet.lang.psi.JetProperty import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement import com.intellij.openapi.components.ServiceManager import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor @@ -30,15 +28,20 @@ import org.jetbrains.android.util.AndroidResourceUtil import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.impl.light.LightElement import com.intellij.openapi.module.ModuleServiceManager -import org.jetbrains.jet.plugin.caches.resolve.getModuleInfo -import org.jetbrains.jet.plugin.caches.resolve.ModuleSourceInfo import com.intellij.openapi.module.Module -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.moduleInfo import org.jetbrains.jet.lang.resolve.android.nameToIdDeclaration import org.jetbrains.jet.lang.resolve.android.idToName import com.intellij.psi.PsiField import com.intellij.psi.PsiClass +import org.jetbrains.jet.lang.resolve.android.AndroidConst +import com.intellij.openapi.module.ModuleUtil +import com.intellij.openapi.module.ModuleUtilCore +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo +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 public class AndroidRenameProcessor : RenamePsiElementProcessor() { @@ -46,7 +49,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() { // Either renaming synthetic property, or value in layout xml, or R class field return (element.namedUnwrappedElement is JetProperty && isAndroidSyntheticElement(element.namedUnwrappedElement)) || element is XmlAttributeValue || - isRClassField(element) + isRClassField(element) } private fun isRClassField(element: PsiElement): Boolean { diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt index 5fffbe78c2e..068121451ef 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt @@ -17,13 +17,13 @@ package org.jetbrains.jet.plugin.android import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension -import org.jetbrains.jet.plugin.references.JetSimpleNameReference import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper -import org.jetbrains.jet.lang.psi.JetProperty import com.intellij.psi.impl.light.LightElement -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetPsiFactory public class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension { override fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean? { diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidExternalDeclarationsProvider.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidExternalDeclarationsProvider.kt index a0e9b20a25b..62a8e9085ec 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidExternalDeclarationsProvider.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidExternalDeclarationsProvider.kt @@ -18,13 +18,13 @@ package org.jetbrains.jet.plugin.android import com.intellij.openapi.project.Project import org.jetbrains.jet.extensions.ExternalDeclarationsProvider -import org.jetbrains.jet.analyzer.ModuleInfo -import org.jetbrains.jet.lang.psi.JetFile import com.intellij.openapi.components.ServiceManager import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor -import org.jetbrains.jet.plugin.caches.resolve.ModuleSourceInfo import com.intellij.openapi.module.ModuleServiceManager -import org.jetbrains.jet.lang.psi.moduleInfo +import org.jetbrains.kotlin.analyzer.ModuleInfo +import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.moduleInfo public class IDEAndroidExternalDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider { override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection { @@ -32,9 +32,9 @@ public class IDEAndroidExternalDeclarationsProvider(private val project: Project val module = moduleInfo.module val parser = ModuleServiceManager.getService(module, javaClass()) - val syntheticFile = parser.parseToPsi() - syntheticFile?.moduleInfo = moduleInfo + val syntheticFiles = parser.parseToPsi() + syntheticFiles?.forEach { it.moduleInfo = moduleInfo } - return if (syntheticFile != null) listOf(syntheticFile) else listOf() + return syntheticFiles ?: listOf() } } \ No newline at end of file diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt index c5a3e163a60..f35328839aa 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt @@ -16,23 +16,19 @@ package org.jetbrains.jet.android -import org.jetbrains.jet.plugin.PluginTestCaseBase import com.intellij.openapi.application.PathManager import com.intellij.codeInsight.completion.CompletionType import com.intellij.openapi.util.io.FileUtil import java.io.File -import org.jetbrains.jet.completion.util.testCompletion -import org.jetbrains.jet.plugin.project.TargetPlatform import com.intellij.ide.startup.impl.StartupManagerImpl import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess import com.intellij.openapi.startup.StartupManager -import org.jetbrains.jet.JetTestCaseBuilder -import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode import com.intellij.psi.impl.PsiManagerEx import com.intellij.psi.PsiManager -import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver import com.android.SdkConstants import com.intellij.codeInsight.CodeInsightSettings +import org.jetbrains.kotlin.completion.util.testCompletion +import org.jetbrains.kotlin.idea.project.TargetPlatform public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() { private var kotlinInternalModeOriginalValue: Boolean = false diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt index 2bf3bfb8a4f..9b6630e9781 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt @@ -16,7 +16,6 @@ package org.jetbrains.jet.android -import org.jetbrains.jet.plugin.PluginTestCaseBase import kotlin.test.assertTrue import com.intellij.codeInsight.TargetElementUtilBase import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt index 82c1a21acca..ee1e93518db 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt @@ -18,11 +18,10 @@ package org.jetbrains.jet.android import com.intellij.openapi.application.PathManager import com.android.SdkConstants -import org.jetbrains.jet.plugin.PluginTestCaseBase import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction import kotlin.test.fail import kotlin.test.assertEquals -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() { diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt index f2fb4fe05d8..77d004babea 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt @@ -21,12 +21,11 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil import com.intellij.codeInsight.TargetElementUtilBase import com.intellij.refactoring.rename.RenamePsiElementProcessor import com.intellij.refactoring.rename.RenameProcessor -import org.jetbrains.jet.plugin.PluginTestCaseBase import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction import kotlin.test.assertEquals import kotlin.test.assertTrue import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() { diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt index ca77ccf2b24..039a5f3da29 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt @@ -16,19 +16,17 @@ package org.jetbrains.jet.android -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor -import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.TestJdkKind import org.jetbrains.jet.plugin.android.IDEAndroidUIXmlProcessor -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys import kotlin.test.assertEquals import org.jetbrains.jet.plugin.android.TestConst -import org.jetbrains.jet.plugin.PluginTestCaseBase import org.jetbrains.kotlin.android.AndroidConfigurationKeys -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles import com.intellij.openapi.module.ModuleManager +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment +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 public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() { public fun doTest(path: String) { @@ -38,8 +36,8 @@ public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() val cliParser = CliAndroidUIXmlProcessor(project, path + "../AndroidManifest.xml", path + getResDir() + "/layout/") val ideParser = IDEAndroidUIXmlProcessor(ModuleManager.getInstance(project).getModules()[0]) - val cliResult = cliParser.parseToPsi()!!.getText() - val ideResult = ideParser.parseToPsi()!!.getText() + val cliResult = cliParser.parseToPsi()!!.joinToString("\n\n") + val ideResult = ideParser.parseToPsi()!!.joinToString("\n\n") assertEquals(cliResult, ideResult) } diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java index 48fe0c098cd..60deb5af694 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java @@ -17,10 +17,9 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java index 88859603a7b..d31982977ab 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java @@ -17,10 +17,9 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java index c2cbf7df56b..6aecefb54b4 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java @@ -17,10 +17,9 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java index e292aeac497..8bb58c2bd0f 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java @@ -17,10 +17,9 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java index c77b6fe680a..d8a8416f461 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java @@ -21,7 +21,6 @@ import com.android.ide.common.rendering.RenderSecurityManager; import com.intellij.analysis.AnalysisScope; import com.intellij.codeInspection.GlobalInspectionTool; import com.intellij.codeInspection.InspectionManager; -import com.intellij.codeInspection.ex.GlobalInspectionContextImpl; import com.intellij.codeInspection.ex.GlobalInspectionToolWrapper; import com.intellij.codeInspection.ex.InspectionManagerEx; import com.intellij.facet.FacetManager; @@ -43,13 +42,14 @@ import com.intellij.testFramework.TestLogger; import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; import com.intellij.testFramework.fixtures.*; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; +import com.intellij.testFramework.fixtures.impl.GlobalInspectionContextForTests; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.facet.AndroidRootUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; -import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; +import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode; +import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.io.IOException; @@ -147,7 +147,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase { } ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); - VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); kotlinInternalModeOriginalValue = KotlinInternalMode.OBJECT$.getEnabled(); KotlinInternalMode.OBJECT$.setEnabled(true); @@ -233,7 +233,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase { @Override public void tearDown() throws Exception { KotlinInternalMode.OBJECT$.setEnabled(kotlinInternalModeOriginalValue); - VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); Set builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources(); FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager(); @@ -293,10 +293,10 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase { scope.invalidate(); final InspectionManagerEx inspectionManager = (InspectionManagerEx)InspectionManager.getInstance(getProject()); - final GlobalInspectionContextImpl globalContext = + final GlobalInspectionContextForTests globalContext = CodeInsightTestFixtureImpl.createGlobalContextForTool(scope, getProject(), inspectionManager, wrapper); - InspectionTestUtil.runTool(wrapper, scope, globalContext, inspectionManager); + InspectionTestUtil.runTool(wrapper, scope, globalContext); InspectionTestUtil.compareToolResults(globalContext, wrapper, false, getTestDataPath() + globalTestDir); } diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java index f1f85ddc7a4..707b0e781d3 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java @@ -28,7 +28,6 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.util.Segment; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; @@ -38,13 +37,11 @@ import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.CodeInsightTestFixture; -import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture; import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper; import org.jetbrains.android.sdk.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; @@ -83,7 +80,7 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase { } public static String getPluginTestDataPathBase() { - return JetTestCaseBuilder.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE; + return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE; } public String getTestDataPath() { diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java index 61c2de43d12..97df84b8c63 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java @@ -17,10 +17,9 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt index 274f0a29803..c3d8a43b383 100644 --- a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt +++ b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt @@ -24,8 +24,8 @@ import java.io.File import org.jetbrains.jps.android.AndroidJpsUtil import org.jetbrains.kotlin.compiler.plugin.CliOption import org.jetbrains.kotlin.android.AndroidCommandLineProcessor -import org.jetbrains.jet.utils.PathUtil import org.jetbrains.kotlin.compiler.plugin.getPluginOptionString +import com.intellij.util.PathUtil public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider { private val jarFileName = "android-compiler-plugin.jar" @@ -42,16 +42,16 @@ public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider { } override fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List { - val inJar = PathUtil.getJarPathForClass(javaClass).isFile() + val inJar = File(PathUtil.getJarPathForClass(javaClass)).isFile() val manifestFile = getAndroidManifest(moduleBuildTarget.getModule()) return if (manifestFile != null) { listOf( if (inJar) { - val libDirectory = PathUtil.getJarPathForClass(javaClass).getParentFile().getParentFile() + val libDirectory = File(PathUtil.getJarPathForClass(javaClass)).getParentFile().getParentFile() File(libDirectory, jarFileName).getAbsolutePath() } else { // We're in tests now (in out/production/android-jps-plugin) - val kotlinProjectDirectory = PathUtil.getJarPathForClass(javaClass).getParentFile().getParentFile().getParentFile() + val kotlinProjectDirectory = File(PathUtil.getJarPathForClass(javaClass)).getParentFile().getParentFile().getParentFile() File(kotlinProjectDirectory, "dist/kotlinc/lib/$jarFileName").getAbsolutePath() }) } diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java b/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java index 0c59e68fbf1..055a63168f8 100644 --- a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java +++ b/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java @@ -17,10 +17,9 @@ package org.jetbrains.jet.jps.build.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File;