rename Jet* classes to Kt*

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidFindMemberUsagesHandler.kt

@@ -32,13 +32,13 @@ import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator
 import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
 import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo
 import org.jetbrains.kotlin.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator
-import org.jetbrains.kotlin.psi.JetNamedDeclaration
-import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.KtNamedDeclaration
+import org.jetbrains.kotlin.psi.KtProperty
 import java.util.ArrayList
 
 class AndroidFindUsageHandlerDecorator : KotlinFindUsagesHandlerDecorator {
     override fun decorateHandler(element: PsiElement, forHighlightUsages: Boolean, delegate: FindUsagesHandler): FindUsagesHandler {
-        if (element !is JetNamedDeclaration) return delegate
+        if (element !is KtNamedDeclaration) return delegate
         if (!isAndroidSyntheticElement(element)) return delegate
 
         return AndroidFindMemberUsagesHandler(element, delegate)
@@ -46,14 +46,14 @@ class AndroidFindUsageHandlerDecorator : KotlinFindUsagesHandlerDecorator {
 }
 
 class AndroidFindMemberUsagesHandler(
-        private val declaration: JetNamedDeclaration,
+        private val declaration: KtNamedDeclaration,
         private val delegate: FindUsagesHandler? = null
 ) : FindUsagesHandler(declaration) {
 
     override fun getPrimaryElements(): Array<PsiElement> {
         assert(isAndroidSyntheticElement(declaration))
 
-        val property = declaration as JetProperty
+        val property = declaration as KtProperty
         val moduleInfo = declaration.getModuleInfo() as? ModuleSourceInfo ?: return super.getPrimaryElements()
         val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass<SyntheticFileGenerator>())
 
@@ -71,7 +71,7 @@ class AndroidFindMemberUsagesHandler(
     override fun getSecondaryElements(): Array<PsiElement> {
         assert(isAndroidSyntheticElement(declaration))
 
-        val property = declaration as JetProperty
+        val property = declaration as KtProperty
         val moduleInfo = declaration.getModuleInfo() as? ModuleSourceInfo ?: return super.getPrimaryElements()
         val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass<SyntheticFileGenerator>())
 

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidGotoDeclarationHandler.kt

@@ -26,16 +26,16 @@ import com.intellij.psi.xml.XmlAttribute
 import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator
 import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
 import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo
-import org.jetbrains.kotlin.idea.references.JetSimpleNameReference
-import org.jetbrains.kotlin.psi.JetProperty
-import org.jetbrains.kotlin.psi.JetSimpleNameExpression
+import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.psi.KtSimpleNameExpression
 
 public class AndroidGotoDeclarationHandler : GotoDeclarationHandler {
 
     override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
-        if (sourceElement is LeafPsiElement && sourceElement.getParent() is JetSimpleNameExpression) {
-            val resolved = JetSimpleNameReference(sourceElement.getParent() as JetSimpleNameExpression).resolve()
-            val property = resolved as? JetProperty ?: return null
+        if (sourceElement is LeafPsiElement && sourceElement.getParent() is KtSimpleNameExpression) {
+            val resolved = KtSimpleNameReference(sourceElement.getParent() as KtSimpleNameExpression).resolve()
+            val property = resolved as? KtProperty ?: return null
 
             val moduleInfo = sourceElement.getModuleInfo()
             if (moduleInfo !is ModuleSourceInfo) return null

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidRenameProcessor.kt

@@ -38,13 +38,13 @@ import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
 import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo
-import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.KtProperty
 
 public class AndroidRenameProcessor : RenamePsiElementProcessor() {
 
     override fun canProcessElement(element: PsiElement): Boolean {
         // Either renaming synthetic property, or value in layout xml, or R class field
-        return (element.namedUnwrappedElement is JetProperty &&
+        return (element.namedUnwrappedElement is KtProperty &&
                 isAndroidSyntheticElement(element.namedUnwrappedElement)) || element is XmlAttributeValue ||
                isRClassField(element)
     }
@@ -72,8 +72,8 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
             allRenames: MutableMap<PsiElement, String>,
             scope: SearchScope
     ) {
-        if (element != null && element.namedUnwrappedElement is JetProperty) {
-            renameSyntheticProperty(element.namedUnwrappedElement as JetProperty, newName, allRenames)
+        if (element != null && element.namedUnwrappedElement is KtProperty) {
+            renameSyntheticProperty(element.namedUnwrappedElement as KtProperty, newName, allRenames)
         }
         else if (element is XmlAttributeValue) {
             renameAttributeValue(element, newName, allRenames)
@@ -84,7 +84,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
     }
 
     private fun renameSyntheticProperty(
-            jetProperty: JetProperty,
+            jetProperty: KtProperty,
             newName: String,
             allRenames: MutableMap<PsiElement, String>
     ) {
@@ -132,7 +132,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
             oldPropName: String,
             processor: SyntheticFileGenerator
     ) {
-        val props = processor.getSyntheticFiles()?.flatMap { it.findChildrenByClass(javaClass<JetProperty>()).toList() }
+        val props = processor.getSyntheticFiles()?.flatMap { it.findChildrenByClass(javaClass<KtProperty>()).toList() }
         val matchedProps = props?.filter { it.getName() == oldPropName } ?: listOf()
         for (prop in matchedProps) {
             allRenames[prop] = newPropName

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt

@@ -19,14 +19,14 @@ package org.jetbrains.kotlin.android.synthetic.idea
 import com.intellij.psi.PsiElement
 import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper
 import org.jetbrains.kotlin.android.synthetic.isAndroidSyntheticElement
-import org.jetbrains.kotlin.idea.references.JetSimpleNameReference
+import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension
-import org.jetbrains.kotlin.psi.JetProperty
-import org.jetbrains.kotlin.psi.JetPsiFactory
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.psi.KtPsiFactory
 
 public class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
-    override fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean? {
-        val resolvedElement = reference.resolve() as? JetProperty ?: return null
+    override fun isReferenceTo(reference: KtSimpleNameReference, element: PsiElement): Boolean? {
+        val resolvedElement = reference.resolve() as? KtProperty ?: return null
 
         if (isAndroidSyntheticElement(resolvedElement)) {
             if (element is ValueResourceElementWrapper) {
@@ -37,7 +37,7 @@ public class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension
         return null
     }
 
-    override fun handleElementRename(reference: JetSimpleNameReference, psiFactory: JetPsiFactory, newElementName: String): PsiElement? {
+    override fun handleElementRename(reference: KtSimpleNameReference, psiFactory: KtPsiFactory, newElementName: String): PsiElement? {
         return if (newElementName.startsWith("@+id/"))
             psiFactory.createNameIdentifier(newElementName.substring(newElementName.indexOf('/') + 1))
         else

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/IDEAndroidExternalDeclarationsProvider.kt

@@ -23,11 +23,11 @@ import org.jetbrains.kotlin.android.synthetic.idea.res.IDESyntheticFileGenerator
 import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator
 import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
 import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
-import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.moduleInfo
 
 public class IDEAndroidExternalDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider {
-    override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<JetFile> {
+    override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<KtFile> {
         if (moduleInfo !is ModuleSourceInfo) return listOf()
 
         val module = moduleInfo.module

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt

@@ -23,13 +23,13 @@ import org.jetbrains.kotlin.android.synthetic.AndroidConst
 import org.jetbrains.kotlin.android.synthetic.idea.AndroidXmlVisitor
 import org.jetbrains.kotlin.android.synthetic.res.AndroidLayoutXmlFileManager
 import org.jetbrains.kotlin.android.synthetic.res.AndroidModuleInfo
-import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.KtProperty
 
 public class IDEAndroidLayoutXmlFileManager(val module: Module) : AndroidLayoutXmlFileManager(module.project) {
 
     override val androidModuleInfo: AndroidModuleInfo? by lazy { module.androidFacet?.toAndroidModuleInfo() }
 
-    override fun propertyToXmlAttributes(property: JetProperty): List<PsiElement> {
+    override fun propertyToXmlAttributes(property: KtProperty): List<PsiElement> {
         val fqPath = property.getFqName()?.pathSegments() ?: return listOf()
         if (fqPath.size() <= AndroidConst.SYNTHETIC_PACKAGE_PATH_LENGTH) return listOf()
 

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDESyntheticFileGenerator.kt

@@ -28,11 +28,11 @@ import org.jetbrains.kotlin.android.synthetic.idea.AndroidXmlVisitor
 import org.jetbrains.kotlin.android.synthetic.res.AndroidResource
 import org.jetbrains.kotlin.android.synthetic.res.AndroidWidget
 import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator
-import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.KtFile
 
 class IDESyntheticFileGenerator(val module: Module) : SyntheticFileGenerator(module.project) {
 
-    private val cachedJetFiles: CachedValue<List<JetFile>> by lazy {
+    private val cachedJetFiles: CachedValue<List<KtFile>> by lazy {
         cachedValue {
             val supportV4 = supportV4Available()
             Result.create(generateSyntheticJetFiles(generateSyntheticFiles(true, supportV4)), psiTreeChangePreprocessor)
@@ -45,7 +45,7 @@ class IDESyntheticFileGenerator(val module: Module) : SyntheticFileGenerator(mod
         module.project.getExtensions(PsiTreeChangePreprocessor.EP_NAME).first { it is AndroidPsiTreeChangePreprocessor }
     }
 
-    public override fun getSyntheticFiles(): List<JetFile> {
+    public override fun getSyntheticFiles(): List<KtFile> {
         if (!checkIfClassExist(AndroidConst.VIEW_FQNAME)) return listOf()
         return cachedJetFiles.value
     }

plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.android
 
-import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.KtProperty
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
 
 public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() {
@@ -32,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) 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())
+        if (f.getElementAtCaret() !is KtProperty) kotlin.test.fail("element at caret must be a property, not a ${f.getElementAtCaret().javaClass}")
+        kotlin.test.assertEquals("\"@+id/${(f.getElementAtCaret() as KtProperty).getName()}\"", resolved?.getText())
 
     }
 }

plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.android
 
-import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.KtProperty
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil
 import com.intellij.codeInsight.TargetElementUtilBase
 import com.intellij.refactoring.rename.RenameProcessor
@@ -41,7 +41,7 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
                 completionEditor, TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED)
 
         assert(element != null)
-        assertTrue(element is JetProperty)
+        assertTrue(element is KtProperty)
 
         RenameProcessor(f.getProject(), element, NEW_NAME, false, true).run()
 
@@ -53,7 +53,7 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
         val attributeElement = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset())
         RenameProcessor(f.getProject(), attributeElement, "@+id/$OLD_NAME", false, true).run()
 
-        assertEquals(OLD_NAME, (f.getElementAtCaret() as JetProperty).getName())
+        assertEquals(OLD_NAME, (f.getElementAtCaret() as KtProperty).getName())
     }
 
     override fun getTestDataPath() = KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/rename/" + getTestName(true) + "/"