Rename jet to kotlin in plugin-api
This commit is contained in:
+1
-1
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.codegen.extensions
|
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.kotlin.codegen.state.JetTypeMapper
|
||||||
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
|
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
|
||||||
import org.jetbrains.kotlin.codegen.StackValue
|
import org.jetbrains.kotlin.codegen.StackValue
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ import kotlin.Unit;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.TestOnly;
|
import org.jetbrains.annotations.TestOnly;
|
||||||
import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension;
|
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.JavaElementFinder;
|
||||||
import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
|
import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
|
||||||
import org.jetbrains.kotlin.asJava.LightClassGenerationSupport;
|
import org.jetbrains.kotlin.asJava.LightClassGenerationSupport;
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.di.InjectorForLazyResolveWithJava
|
|||||||
import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer
|
import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer
|
||||||
import com.intellij.psi.search.GlobalSearchScope
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
import java.util.ArrayList
|
import java.util.ArrayList
|
||||||
import org.jetbrains.jet.extensions.ExternalDeclarationsProvider
|
import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
|
||||||
import kotlin.platform.platformStatic
|
import kotlin.platform.platformStatic
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import org.jetbrains.kotlin.psi.JetFile
|
import org.jetbrains.kotlin.psi.JetFile
|
||||||
|
|||||||
+3
-2
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,8 +14,9 @@
|
|||||||
* limitations under the License.
|
* 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.analyzer.ModuleInfo
|
||||||
import org.jetbrains.kotlin.psi.JetFile
|
import org.jetbrains.kotlin.psi.JetFile
|
||||||
|
|
||||||
+4
-5
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,12 +14,12 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.jet.extensions
|
package org.jetbrains.kotlin.extensions
|
||||||
|
|
||||||
import com.intellij.openapi.extensions.ExtensionPointName
|
import com.intellij.openapi.extensions.ExtensionPointName
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.extensions.Extensions
|
|
||||||
import com.intellij.openapi.extensions.ExtensionPoint
|
import com.intellij.openapi.extensions.ExtensionPoint
|
||||||
|
import com.intellij.openapi.extensions.Extensions
|
||||||
|
|
||||||
public open class ProjectExtensionDescriptor<T>(name: String, private val extensionClass: Class<T>) {
|
public open class ProjectExtensionDescriptor<T>(name: String, private val extensionClass: Class<T>) {
|
||||||
public val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name)!!
|
public val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name)!!
|
||||||
@@ -42,5 +42,4 @@ public open class ProjectExtensionDescriptor<T>(name: String, private val extens
|
|||||||
|
|
||||||
return projectArea.getExtensionPoint(extensionPointName).getExtensions().toList()
|
return projectArea.getExtensionPoint(extensionPointName).getExtensions().toList()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.compiler.plugin
|
package org.jetbrains.kotlin.compiler.plugin
|
||||||
|
|
||||||
import org.jetbrains.jet.config.CompilerConfiguration
|
|
||||||
import java.util.regex.Pattern
|
import java.util.regex.Pattern
|
||||||
|
|
||||||
public class CliOption(
|
public class CliOption(
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<extensionPoint name="diagnosticSuppressor"
|
<extensionPoint name="diagnosticSuppressor"
|
||||||
interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression$DiagnosticSuppressor"/>
|
interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression$DiagnosticSuppressor"/>
|
||||||
<extensionPoint name="externalDeclarationsProvider"
|
<extensionPoint name="externalDeclarationsProvider"
|
||||||
interface="org.jetbrains.jet.extensions.ExternalDeclarationsProvider"
|
interface="org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider"
|
||||||
area="IDEA_PROJECT"/>
|
area="IDEA_PROJECT"/>
|
||||||
<extensionPoint name="expressionCodegenExtension"
|
<extensionPoint name="expressionCodegenExtension"
|
||||||
interface="org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension"
|
interface="org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension"
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import com.intellij.mock.MockProject
|
|||||||
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
|
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
|
||||||
import org.jetbrains.kotlin.compiler.plugin.CliOption
|
import org.jetbrains.kotlin.compiler.plugin.CliOption
|
||||||
import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
|
import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
|
||||||
import org.jetbrains.jet.extensions.ExternalDeclarationsProvider
|
import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
|
||||||
import org.jetbrains.jet.lang.resolve.android.*
|
import org.jetbrains.jet.lang.resolve.android.*
|
||||||
import com.intellij.openapi.components.ServiceManager
|
import com.intellij.openapi.components.ServiceManager
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
|
|||||||
-1
@@ -17,7 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.resolve.android.test
|
package org.jetbrains.jet.lang.resolve.android.test
|
||||||
|
|
||||||
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
|
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
|
||||||
import org.jetbrains.jet.extensions.ExternalDeclarationsProvider
|
|
||||||
import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension
|
import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension
|
||||||
import org.jetbrains.kotlin.android.AndroidExpressionCodegen
|
import org.jetbrains.kotlin.android.AndroidExpressionCodegen
|
||||||
import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest
|
import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
package org.jetbrains.jet.lang.resolve.android.test
|
package org.jetbrains.jet.lang.resolve.android.test
|
||||||
|
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import org.jetbrains.jet.extensions.ExternalDeclarationsProvider
|
import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
|
||||||
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
|
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
|
||||||
import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension
|
import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension
|
||||||
import org.jetbrains.kotlin.android.AndroidExpressionCodegen
|
import org.jetbrains.kotlin.android.AndroidExpressionCodegen
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
package org.jetbrains.jet.plugin.android
|
package org.jetbrains.jet.plugin.android
|
||||||
|
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import org.jetbrains.jet.extensions.ExternalDeclarationsProvider
|
import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
|
||||||
import com.intellij.openapi.components.ServiceManager
|
import com.intellij.openapi.components.ServiceManager
|
||||||
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
|
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
|
||||||
import com.intellij.openapi.module.ModuleServiceManager
|
import com.intellij.openapi.module.ModuleServiceManager
|
||||||
|
|||||||
Reference in New Issue
Block a user