From d35f36da0620ddf3329cfcf5d130bc39e2d0e940 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 10 Feb 2015 16:18:08 +0300 Subject: [PATCH] Rename jet to kotlin in Kotlin compiler infrastructure --- .../jetbrains/kotlin/generators/tests/GenerateTests.kt | 2 +- .../plugin/references/SimpleNameReferenceExtension.kt | 6 +++--- idea/src/META-INF/extensions/common.xml | 4 ++-- .../idea/findUsages/KotlinFindUsagesHandlerFactory.kt | 2 +- .../handlers/KotlinFindUsagesHandlerDecorator.kt | 4 ++-- .../plugin/android/AndroidFindMemberUsagesHandler.kt | 2 +- .../android/AndroidSimpleNameReferenceExtension.kt | 2 +- plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt | 2 +- ....kotlin.jps.build.KotlinJpsCompilerArgumentsProvider} | 0 .../jps/build/android/AbstractAndroidJpsTestCase.kt | 9 ++++----- 10 files changed, 16 insertions(+), 17 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet => kotlin}/plugin/references/SimpleNameReferenceExtension.kt (92%) rename idea/src/org/jetbrains/{jet => kotlin}/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt (91%) rename plugins/android-jps-plugin/src/META-INF/services/{org.jetbrains.jet.jps.build.KotlinJpsCompilerArgumentsProvider => org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider} (100%) rename plugins/android-jps-plugin/tests/org/jetbrains/{jet => kotlin}/jps/build/android/AbstractAndroidJpsTestCase.kt (96%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index ec7bc7ed0bb..9d3e791f621 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -144,7 +144,7 @@ import org.jetbrains.kotlin.addImport.AbstractAddImportTest import org.jetbrains.kotlin.idea.highlighter.* import org.jetbrains.kotlin.android.AbstractAndroidCompletionTest import org.jetbrains.kotlin.android.AbstractAndroidGotoTest -import org.jetbrains.jet.jps.build.android.AbstractAndroidJpsTestCase +import org.jetbrains.kotlin.jps.build.android.AbstractAndroidJpsTestCase import org.jetbrains.kotlin.android.AbstractAndroidRenameTest import org.jetbrains.kotlin.android.AbstractAndroidFindUsagesTest import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt similarity index 92% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt index 988bc24fa65..595199cfd3b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.findUsages.handlers +package org.jetbrains.kotlin.plugin.references import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetPsiFactory public trait SimpleNameReferenceExtension { diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml index 5782ea9a570..b9046b26f3f 100644 --- a/idea/src/META-INF/extensions/common.xml +++ b/idea/src/META-INF/extensions/common.xml @@ -15,10 +15,10 @@ interface="org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension" area="IDEA_PROJECT"/> diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt index 917622f9ef1..c3bc278c9dd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory import org.jetbrains.kotlin.idea.findUsages.handlers.DelegatingFindMemberUsagesHandler -import org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator +import org.jetbrains.kotlin.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator import com.intellij.openapi.extensions.Extensions public class KotlinFindUsagesHandlerFactory(project: Project) : FindUsagesHandlerFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt b/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt rename to idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt index d527f801d74..babfc90e9f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt +++ b/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.findUsages.handlers +package org.jetbrains.kotlin.plugin.findUsages.handlers import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.psi.PsiElement diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt index e20736e2072..c05fbafa821 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt @@ -27,7 +27,7 @@ import com.intellij.psi.xml.XmlAttribute 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.kotlin.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.idea.util.application.runReadAction diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidSimpleNameReferenceExtension.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidSimpleNameReferenceExtension.kt index 0d9349ea6d6..64fbb845edf 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidSimpleNameReferenceExtension.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidSimpleNameReferenceExtension.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.plugin.android -import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension +import org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension import org.jetbrains.kotlin.idea.references.JetSimpleNameReference import com.intellij.psi.PsiElement import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper diff --git a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt index c3d8a43b383..efdbdbe40f5 100644 --- a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt +++ b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.android.jps -import org.jetbrains.jet.jps.build.KotlinJpsCompilerArgumentsProvider +import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.model.module.JpsModule diff --git a/plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.jet.jps.build.KotlinJpsCompilerArgumentsProvider b/plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider similarity index 100% rename from plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.jet.jps.build.KotlinJpsCompilerArgumentsProvider rename to plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt similarity index 96% rename from plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt rename to plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt index 825acf82325..adab5e1a021 100644 --- a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt +++ b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.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,16 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build.android +package org.jetbrains.kotlin.jps.build.android import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.android.model.JpsAndroidSdkProperties -import org.jetbrains.jps.android.model.JpsAndroidSdkType -import org.jetbrains.jps.model.library.JpsOrderRootType import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.library.sdk.JpsSdk +import org.jetbrains.jps.android.model.JpsAndroidSdkType import org.jetbrains.jps.model.impl.JpsSimpleElementImpl - +import org.jetbrains.jps.model.library.JpsOrderRootType import java.io.File public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() {