diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 2063c2a6cf3..b8b044efbf7 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -199,7 +199,7 @@ serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker"/> + serviceImplementation="org.jetbrains.kotlin.plugin.android.IDEAndroidUIXmlProcessor"/> diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml index acc5ee2e7d8..21d7312cd05 100644 --- a/plugins/android-idea-plugin/src/META-INF/plugin.xml +++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml @@ -12,19 +12,19 @@ org.jetbrains.android - + - + - + - - + + diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidFindMemberUsagesHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt similarity index 95% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidFindMemberUsagesHandler.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt index e543514fb96..e20736e2072 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidFindMemberUsagesHandler.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.psi.PsiElement @@ -22,9 +22,7 @@ import com.intellij.usageView.UsageInfo import com.intellij.util.Processor import com.intellij.find.findUsages.FindUsagesOptions 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.android.util.AndroidResourceUtil import java.util.ArrayList @@ -33,6 +31,8 @@ import org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecor import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.idea.util.application.runReadAction +import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement +import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor 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/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt similarity index 90% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt index c7d5fbe1ea0..4086d63cd17 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt @@ -14,24 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android +import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler import com.intellij.psi.PsiElement import com.intellij.openapi.editor.Editor -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 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.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 +import com.intellij.psi.xml.XmlAttribute +import com.intellij.openapi.actionSystem.DataContext +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import com.intellij.openapi.module.ModuleServiceManager +import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor public class AndroidGotoDeclarationHandler : GotoDeclarationHandler { @@ -61,4 +58,4 @@ public class AndroidGotoDeclarationHandler : GotoDeclarationHandler { return null } -} +} \ No newline at end of file diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt similarity index 98% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt index acdbf402d98..ae47ceaf2d4 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt @@ -14,34 +14,34 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo +import org.jetbrains.kotlin.psi.moduleInfo import com.intellij.refactoring.rename.RenamePsiElementProcessor -import com.intellij.openapi.components.ServiceManager -import com.intellij.psi.search.SearchScope +import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.psi.JetProperty import com.intellij.psi.xml.XmlAttributeValue -import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper -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 com.intellij.openapi.module.Module -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.kotlin.lang.resolve.android.AndroidConst -import com.intellij.openapi.module.ModuleUtil -import com.intellij.openapi.module.ModuleUtilCore -import org.jetbrains.kotlin.psi.JetProperty +import com.intellij.openapi.module.Module 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 -import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement +import com.intellij.psi.search.SearchScope +import com.intellij.psi.impl.light.LightElement import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor +import com.intellij.psi.xml.XmlAttribute +import org.jetbrains.kotlin.lang.resolve.android +import org.jetbrains.kotlin.lang.resolve.android.AndroidConst +import com.intellij.openapi.module.ModuleServiceManager +import org.jetbrains.android.util.AndroidResourceUtil +import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper +import com.intellij.openapi.module.ModuleUtilCore +import com.intellij.openapi.components.ServiceManager +import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement +import org.jetbrains.kotlin.lang.resolve.android.nameToIdDeclaration +import org.jetbrains.kotlin.lang.resolve.android.idToName public class AndroidRenameProcessor : RenamePsiElementProcessor() { diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidSimpleNameReferenceExtension.kt similarity index 92% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidSimpleNameReferenceExtension.kt index 068121451ef..0d9349ea6d6 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidSimpleNameReferenceExtension.kt @@ -14,16 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension -import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement -import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper -import com.intellij.psi.impl.light.LightElement import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import com.intellij.psi.PsiElement +import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement 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/AndroidXmlVisitor.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidXmlVisitor.kt similarity index 94% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidXmlVisitor.kt index ea0c2940ce6..13e78b49714 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidXmlVisitor.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android +import org.jetbrains.kotlin.lang.resolve.android.AndroidResourceManager +import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.XmlElementVisitor import com.intellij.psi.PsiElement 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.kotlin.lang.resolve.android.idToName import org.jetbrains.kotlin.lang.resolve.android.AndroidConst -import org.jetbrains.kotlin.lang.resolve.android.AndroidResourceManager +import org.jetbrains.kotlin.lang.resolve.android +import org.jetbrains.kotlin.lang.resolve.android.idToName class AndroidXmlVisitor( val resourceManager: AndroidResourceManager, @@ -50,5 +50,4 @@ class AndroidXmlVisitor( } tag?.acceptChildren(this) } -} - +} \ No newline at end of file diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidExternalDeclarationsProvider.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt similarity index 90% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidExternalDeclarationsProvider.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt index 6dd3dce013f..b969cdd85fd 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidExternalDeclarationsProvider.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt @@ -14,16 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android import com.intellij.openapi.project.Project import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider -import com.intellij.openapi.components.ServiceManager -import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor -import com.intellij.openapi.module.ModuleServiceManager import org.jetbrains.kotlin.analyzer.ModuleInfo -import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo +import com.intellij.openapi.module.ModuleServiceManager +import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor import org.jetbrains.kotlin.psi.moduleInfo public class IDEAndroidExternalDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider { diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt similarity index 78% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt index 60c7d426640..7f888bf14a6 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt @@ -14,22 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android -import com.intellij.openapi.project.Project -import com.intellij.psi.PsiElement -import java.util.HashMap -import com.intellij.psi.xml.XmlAttribute -import com.intellij.psi.PsiFile -import org.jetbrains.android.facet.AndroidFacet -import com.intellij.openapi.module.ModuleManager -import java.util.ArrayList -import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.module.Module -import com.intellij.psi.PsiManager -import org.jetbrains.jet.lang.resolve.android.AndroidResourceManager -import org.jetbrains.jet.lang.resolve.android.AndroidModuleInfo +import com.intellij.psi.PsiElement +import org.jetbrains.android.facet.AndroidFacet import kotlin.properties.Delegates +import org.jetbrains.kotlin.plugin.android.AndroidXmlVisitor +import org.jetbrains.kotlin.lang.resolve.android.AndroidResourceManager +import org.jetbrains.kotlin.lang.resolve.android.AndroidModuleInfo public class IDEAndroidResourceManager(val module: Module) : AndroidResourceManager(module.getProject()) { @@ -54,4 +47,4 @@ public class IDEAndroidResourceManager(val module: Module) : AndroidResourceMana return AndroidModuleInfo(applicationPackage, mainResDirectory) } -} +} \ No newline at end of file diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidUIXmlProcessor.kt similarity index 67% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidUIXmlProcessor.kt index bd26da7a006..b631e07949f 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidUIXmlProcessor.kt @@ -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,18 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android +package org.jetbrains.kotlin.plugin.android -import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor -import com.intellij.openapi.project.Project -import java.util.ArrayList -import com.intellij.psi.PsiFile -import org.jetbrains.jet.lang.resolve.android.AndroidWidget -import org.jetbrains.jet.lang.resolve.android.KotlinStringWriter -import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.jet.lang.resolve.android.CliAndroidResourceManager -import org.jetbrains.jet.lang.resolve.android.AndroidResourceManager import com.intellij.openapi.module.Module +import org.jetbrains.kotlin.plugin.android.IDEAndroidResourceManager +import com.intellij.psi.PsiFile +import org.jetbrains.kotlin.plugin.android.AndroidXmlVisitor +import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor +import org.jetbrains.kotlin.lang.resolve.android.AndroidWidget class IDEAndroidUIXmlProcessor(val module: Module) : AndroidUIXmlProcessor(module.getProject()) { diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/TestConst.java b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/TestConst.java similarity index 94% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/TestConst.java rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/TestConst.java index 49c083e7327..4043f99ccfa 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/TestConst.java +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/TestConst.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android; +package org.jetbrains.kotlin.plugin.android; import com.intellij.openapi.util.Key; diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/XmlAttributeValueWrapper.java similarity index 99% rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java rename to plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/XmlAttributeValueWrapper.java index d82abfcf5b9..fa57f80e451 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/XmlAttributeValueWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.android; +package org.jetbrains.kotlin.plugin.android; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt similarity index 86% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt index f35328839aa..14ff99e342e 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt @@ -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,21 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.android +package org.jetbrains.kotlin.android -import com.intellij.openapi.application.PathManager +import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.completion.CompletionType import com.intellij.openapi.util.io.FileUtil -import java.io.File -import com.intellij.ide.startup.impl.StartupManagerImpl -import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess -import com.intellij.openapi.startup.StartupManager -import com.intellij.psi.impl.PsiManagerEx -import com.intellij.psi.PsiManager -import com.android.SdkConstants -import com.intellij.codeInsight.CodeInsightSettings -import org.jetbrains.kotlin.completion.util.testCompletion import org.jetbrains.kotlin.idea.project.TargetPlatform +import org.jetbrains.kotlin.completion +import org.jetbrains.kotlin.completion.util.testCompletion +import java.io.File 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/kotlin/android/AbstractAndroidFindUsagesTest.kt similarity index 82% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt index 9b6630e9781..dc26749172a 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt @@ -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,12 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.android +package org.jetbrains.kotlin.android -import kotlin.test.assertTrue import com.intellij.codeInsight.TargetElementUtilBase -import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction -import kotlin.test.assertNotNull public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() { @@ -33,10 +30,10 @@ public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() { val targetElement = TargetElementUtilBase.findTargetElement(f.getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED or TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED) - assertNotNull(targetElement) + kotlin.test.assertNotNull(targetElement) val propUsages = f.findUsages(targetElement) - assertTrue(propUsages.notEmpty) + kotlin.test.assertTrue(propUsages.notEmpty) } -} +} \ No newline at end of file diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt similarity index 74% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt index ee1e93518db..f9edbcebeaf 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt @@ -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,14 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.android +package org.jetbrains.kotlin.android -import com.intellij.openapi.application.PathManager -import com.android.SdkConstants -import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction -import kotlin.test.fail -import kotlin.test.assertEquals import org.jetbrains.kotlin.psi.JetProperty +import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() { @@ -36,8 +32,8 @@ public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() { f.configureFromExistingVirtualFile(virtualFile) val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset()) - if (f.getElementAtCaret() !is JetProperty) fail("element at caret must be a property, not a ${f.getElementAtCaret().javaClass}") - assertEquals("\"@+id/${(f.getElementAtCaret() as JetProperty).getName()}\"", resolved?.getText()) + if (f.getElementAtCaret() !is JetProperty) kotlin.test.fail("element at caret must be a property, not a ${f.getElementAtCaret().javaClass}") + kotlin.test.assertEquals("\"@+id/${(f.getElementAtCaret() as JetProperty).getName()}\"", resolved?.getText()) } -} +} \ No newline at end of file diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt similarity index 89% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt index 21a13bf77ed..0664776f470 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt @@ -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,18 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.android +package org.jetbrains.kotlin.android -import com.intellij.openapi.command.WriteCommandAction +import org.jetbrains.kotlin.psi.JetProperty 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 com.intellij.codeInsight.navigation.actions.GotoDeclarationAction -import kotlin.test.assertEquals -import kotlin.test.assertTrue -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.psi.JetProperty +import kotlin.test.* public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() { @@ -61,4 +57,4 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() { } override fun getTestDataPath() = KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/rename/" + getTestName(true) + "/" -} \ No newline at end of file +} diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt similarity index 87% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt index 039a5f3da29..e44f1eaeb0c 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt @@ -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,19 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.android +package org.jetbrains.kotlin.android -import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor -import org.jetbrains.jet.plugin.android.IDEAndroidUIXmlProcessor -import kotlin.test.assertEquals -import org.jetbrains.jet.plugin.android.TestConst -import org.jetbrains.kotlin.android.AndroidConfigurationKeys -import com.intellij.openapi.module.ModuleManager import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.plugin.android.TestConst +import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor +import com.intellij.openapi.module.ModuleManager +import org.jetbrains.kotlin.plugin.android.IDEAndroidUIXmlProcessor import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles +import kotlin.test.assertEquals public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() { public fun doTest(path: String) { diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java similarity index 90% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java index 60deb5af694..cb0d4946e3a 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.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.android; +package org.jetbrains.kotlin.android; 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-idea-plugin/testData/android/completion") @TestDataPath("$PROJECT_ROOT") diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java similarity index 90% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java index d31982977ab..46cc5815e0d 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.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.android; +package org.jetbrains.kotlin.android; 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-idea-plugin/testData/android/findUsages") @TestDataPath("$PROJECT_ROOT") diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java similarity index 90% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java index 6aecefb54b4..6ae1b70166a 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.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.android; +package org.jetbrains.kotlin.android; 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-idea-plugin/testData/android/goto") @TestDataPath("$PROJECT_ROOT") diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java similarity index 90% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java index 8bb58c2bd0f..24db35a918e 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.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.android; +package org.jetbrains.kotlin.android; 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-idea-plugin/testData/android/rename") @TestDataPath("$PROJECT_ROOT") diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java similarity index 99% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java index d8a8416f461..e574cd41c1d 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.android; +package org.jetbrains.kotlin.android; import com.android.SdkConstants; import com.android.ide.common.rendering.RenderSecurityManager; @@ -46,6 +46,7 @@ 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.kotlin.android.KotlinAndroidTestCaseBase; import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode; import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.psi.JetFile; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java similarity index 99% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java index 707b0e781d3..7c0b2e73221 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.jet.android; +package org.jetbrains.kotlin.android; import com.android.sdklib.IAndroidTarget; import com.android.tools.idea.rendering.ResourceHelper; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java similarity index 92% rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java index 97df84b8c63..947eab2e226 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.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.android; +package org.jetbrains.kotlin.android; 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-idea-plugin/testData/android/parserResultEquality") @TestDataPath("$PROJECT_ROOT")