rename Jet* classes to Kt*

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt

@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
-import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
@@ -77,7 +77,7 @@ public class AndroidCommandLineProcessor : CommandLineProcessor {
 }
 
 public class CliAndroidDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider {
-    override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<JetFile> {
+    override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<KtFile> {
         val parser = ServiceManager.getService(project, SyntheticFileGenerator::class.java) as? CliSyntheticFileGenerator
         return parser?.getSyntheticFiles() ?: listOf()
     }

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt

@@ -17,8 +17,8 @@
 package org.jetbrains.kotlin.android.synthetic
 
 import com.intellij.openapi.util.Key
-import org.jetbrains.kotlin.lexer.JetKeywordToken
-import org.jetbrains.kotlin.lexer.JetTokens
+import org.jetbrains.kotlin.lexer.KtKeywordToken
+import org.jetbrains.kotlin.lexer.KtTokens
 
 public object AndroidConst {
     val ANDROID_USER_PACKAGE: Key<String> = Key.create<String>("ANDROID_USER_PACKAGE")
@@ -50,8 +50,8 @@ public object AndroidConst {
 
     val IGNORED_XML_WIDGET_TYPES = setOf("requestFocus", "merge", "tag", "check", "blink")
 
-    val ESCAPED_IDENTIFIERS = (JetTokens.KEYWORDS.types + JetTokens.SOFT_KEYWORDS.types)
-            .map { it as? JetKeywordToken }.filterNotNull().map { it.value }.toSet()
+    val ESCAPED_IDENTIFIERS = (KtTokens.KEYWORDS.types + KtTokens.SOFT_KEYWORDS.types)
+            .map { it as? KtKeywordToken }.filterNotNull().map { it.value }.toSet()
 
     val FQNAME_RESOLVE_PACKAGES = listOf("android.widget", "android.webkit", "android.view")
 }

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt

@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor
-import org.jetbrains.kotlin.psi.JetClassOrObject
+import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
@@ -97,7 +97,7 @@ public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
             val classBuilder: ClassBuilder,
             val state: GenerationState,
             val descriptor: ClassDescriptor,
-            val classOrObject: JetClassOrObject,
+            val classOrObject: KtClassOrObject,
             val androidClassType: AndroidClassType)
 
     override fun applyProperty(receiver: StackValue, resolvedCall: ResolvedCall<*>, c: ExpressionCodegenExtension.Context): StackValue? {
@@ -234,7 +234,7 @@ public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
     override fun generateClassSyntheticParts(
             classBuilder: ClassBuilder,
             state: GenerationState,
-            classOrObject: JetClassOrObject,
+            classOrObject: KtClassOrObject,
             descriptor: ClassDescriptor
     ) {
         if (descriptor.kind != ClassKind.CLASS || descriptor.isInner || DescriptorUtils.isLocal(descriptor)) return

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt

@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.DelegatingClassBuilder
 import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink
-import org.jetbrains.kotlin.psi.JetClass
+import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.org.objectweb.asm.*
@@ -64,7 +64,7 @@ public class AndroidOnDestroyClassBuilderInterceptorExtension : ClassBuilderInte
             internal val delegateClassBuilder: ClassBuilder,
             val bindingContext: BindingContext
     ) : DelegatingClassBuilder() {
-        private var currentClass: JetClass? = null
+        private var currentClass: KtClass? = null
         private var currentClassName: String? = null
 
         override fun getDelegate() = delegateClassBuilder
@@ -78,7 +78,7 @@ public class AndroidOnDestroyClassBuilderInterceptorExtension : ClassBuilderInte
                 superName: String,
                 interfaces: Array<out String>
         ) {
-            if (origin is JetClass) {
+            if (origin is KtClass) {
                 currentClass = origin
                 currentClassName = name
             }

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/diagnostic/ErrorsAndroid.java

@@ -18,13 +18,13 @@ package org.jetbrains.kotlin.android.synthetic.diagnostic;
 
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1;
 import org.jetbrains.kotlin.diagnostics.Errors;
-import org.jetbrains.kotlin.psi.JetExpression;
+import org.jetbrains.kotlin.psi.KtExpression;
 
 import static org.jetbrains.kotlin.diagnostics.Severity.WARNING;
 
 public interface ErrorsAndroid {
-    DiagnosticFactory1<JetExpression, String> SYNTHETIC_INVALID_WIDGET_TYPE = DiagnosticFactory1.create(WARNING);
-    DiagnosticFactory1<JetExpression, String> SYNTHETIC_UNRESOLVED_WIDGET_TYPE = DiagnosticFactory1.create(WARNING);
+    DiagnosticFactory1<KtExpression, String> SYNTHETIC_INVALID_WIDGET_TYPE = DiagnosticFactory1.create(WARNING);
+    DiagnosticFactory1<KtExpression, String> SYNTHETIC_UNRESOLVED_WIDGET_TYPE = DiagnosticFactory1.create(WARNING);
 
     @SuppressWarnings("UnusedDeclaration")
     Object _initializer = new Object() {

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidLayoutXmlFileManager.kt

@@ -24,14 +24,14 @@ import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.KtProperty
 import java.util.*
 
 public abstract class AndroidLayoutXmlFileManager(val project: Project) {
 
     public abstract val androidModuleInfo: AndroidModuleInfo?
 
-    public open fun propertyToXmlAttributes(property: JetProperty): List<PsiElement> = listOf()
+    public open fun propertyToXmlAttributes(property: KtProperty): List<PsiElement> = listOf()
 
     public fun getLayoutXmlFiles(): Map<String, List<PsiFile>> {
         val info = androidModuleInfo ?: return mapOf()

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliSyntheticFileGenerator.kt

@@ -25,7 +25,7 @@ import com.intellij.psi.impl.PsiElementFinderImpl
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.android.synthetic.AndroidConst
 import org.jetbrains.kotlin.android.synthetic.AndroidXmlHandler
-import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.KtFile
 
 public open class CliSyntheticFileGenerator(
         project: Project,
@@ -43,7 +43,7 @@ public open class CliSyntheticFileGenerator(
         CliAndroidLayoutXmlFileManager(project, manifestPath, resDirectories)
     }
 
-    public override fun getSyntheticFiles(): List<JetFile> = cachedJetFiles
+    public override fun getSyntheticFiles(): List<KtFile> = cachedJetFiles
 
     override fun extractLayoutResources(files: List<PsiFile>): List<AndroidResource> {
         val resources = arrayListOf<AndroidResource>()

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/SyntheticFileGenerator.kt

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.android.synthetic.AndroidConst
 import org.jetbrains.kotlin.android.synthetic.KotlinStringWriter
 import org.jetbrains.kotlin.android.synthetic.escapeAndroidIdentifier
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.types.Flexibility
 
 public class AndroidSyntheticFile(val name: String, val contents: String) {
@@ -42,7 +42,7 @@ public abstract class SyntheticFileGenerator(protected val project: Project) {
 
     public abstract val layoutXmlFileManager: AndroidLayoutXmlFileManager
 
-    public abstract fun getSyntheticFiles(): List<JetFile>
+    public abstract fun getSyntheticFiles(): List<KtFile>
 
     protected open fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List<AndroidSyntheticFile> {
         val commonFiles = if (generateCommonFiles) generateCommonFiles(supportV4) else listOf()
@@ -197,14 +197,14 @@ public abstract class SyntheticFileGenerator(protected val project: Project) {
         return resourceMap.values().toList()
     }
 
-    protected fun generateSyntheticJetFiles(files: List<AndroidSyntheticFile>): List<JetFile> {
+    protected fun generateSyntheticJetFiles(files: List<AndroidSyntheticFile>): List<KtFile> {
         val psiManager = PsiManager.getInstance(project)
         val applicationPackage = layoutXmlFileManager.androidModuleInfo?.applicationPackage
 
         return files.mapIndexed { index, syntheticFile ->
             val fileName = AndroidConst.SYNTHETIC_FILENAME_PREFIX + syntheticFile.name + ".kt"
             val virtualFile = LightVirtualFile(fileName, syntheticFile.contents)
-            val jetFile = psiManager.findFile(virtualFile) as JetFile
+            val jetFile = psiManager.findFile(virtualFile) as KtFile
             if (applicationPackage != null) {
                 jetFile.putUserData(AndroidConst.ANDROID_USER_PACKAGE, applicationPackage)
             }