From 9aef9b26434b980f7a2bf2cedb3657c20bbc2c67 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 4 Feb 2015 19:09:53 +0300 Subject: [PATCH] Rename jet to kotlin in plugin-api --- .../jet/codegen/extensions/ExpressionCodegenExtension.kt | 2 +- .../kotlin/cli/jvm/compiler/JetCoreEnvironment.java | 2 +- .../jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt | 2 +- .../extensions/ExternalDeclarationsProvider.kt | 5 +++-- .../extensions/ProjectExtensionDescriptor.kt | 9 ++++----- .../org/jetbrains/kotlin/compiler/plugin/CliOptions.kt | 1 - idea/src/META-INF/extensions/common.xml | 2 +- .../src/AndroidComponentRegistrar.kt | 2 +- .../android/test/AbstractAndroidBytecodeShapeTest.kt | 1 - .../jet/lang/resolve/android/test/CompilerTestUtils.kt | 2 +- .../android/IDEAndroidExternalDeclarationsProvider.kt | 2 +- 11 files changed, 14 insertions(+), 16 deletions(-) rename compiler/frontend/src/org/jetbrains/{jet => kotlin}/extensions/ExternalDeclarationsProvider.kt (87%) rename compiler/frontend/src/org/jetbrains/{jet => kotlin}/extensions/ProjectExtensionDescriptor.kt (95%) 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 67459befb33..f5d6cb06998 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/extensions/ExpressionCodegenExtension.kt +++ b/compiler/backend/src/org/jetbrains/jet/codegen/extensions/ExpressionCodegenExtension.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.codegen.extensions -import org.jetbrains.jet.extensions.ProjectExtensionDescriptor +import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor import org.jetbrains.kotlin.codegen.state.JetTypeMapper import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.codegen.StackValue diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java index 88ee714b9ea..499c022d82d 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java @@ -57,7 +57,7 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension; -import org.jetbrains.jet.extensions.ExternalDeclarationsProvider; +import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider; import org.jetbrains.kotlin.asJava.JavaElementFinder; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; 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 7ab68e4d788..187245be433 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 @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.di.InjectorForLazyResolveWithJava import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer import com.intellij.psi.search.GlobalSearchScope import java.util.ArrayList -import org.jetbrains.jet.extensions.ExternalDeclarationsProvider +import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider import kotlin.platform.platformStatic import com.intellij.openapi.module.Module import org.jetbrains.kotlin.psi.JetFile diff --git a/compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt rename to compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt index f56a686fa6d..0afb5d46da1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.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,8 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.extensions +package org.jetbrains.kotlin.extensions +import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.psi.JetFile diff --git a/compiler/frontend/src/org/jetbrains/jet/extensions/ProjectExtensionDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/extensions/ProjectExtensionDescriptor.kt rename to compiler/frontend/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt index 463629d65b6..3f4fd18c762 100644 --- a/compiler/frontend/src/org/jetbrains/jet/extensions/ProjectExtensionDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.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,12 @@ * limitations under the License. */ -package org.jetbrains.jet.extensions +package org.jetbrains.kotlin.extensions import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project -import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.extensions.ExtensionPoint +import com.intellij.openapi.extensions.Extensions public open class ProjectExtensionDescriptor(name: String, private val extensionClass: Class) { public val extensionPointName: ExtensionPointName = ExtensionPointName.create(name)!! @@ -42,5 +42,4 @@ public open class ProjectExtensionDescriptor(name: String, private val extens return projectArea.getExtensionPoint(extensionPointName).getExtensions().toList() } -} - +} \ No newline at end of file diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt index f317b5d7f5a..dad27b6e27b 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.compiler.plugin -import org.jetbrains.jet.config.CompilerConfiguration import java.util.regex.Pattern public class CliOption( diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml index ee88ae4cfbb..e6a8d8498bb 100644 --- a/idea/src/META-INF/extensions/common.xml +++ b/idea/src/META-INF/extensions/common.xml @@ -9,7 +9,7 @@