Rename jet to kotlin in Kotlin compiler infrastructure
This commit is contained in:
@@ -144,7 +144,7 @@ import org.jetbrains.kotlin.addImport.AbstractAddImportTest
|
|||||||
import org.jetbrains.kotlin.idea.highlighter.*
|
import org.jetbrains.kotlin.idea.highlighter.*
|
||||||
import org.jetbrains.kotlin.android.AbstractAndroidCompletionTest
|
import org.jetbrains.kotlin.android.AbstractAndroidCompletionTest
|
||||||
import org.jetbrains.kotlin.android.AbstractAndroidGotoTest
|
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.AbstractAndroidRenameTest
|
||||||
import org.jetbrains.kotlin.android.AbstractAndroidFindUsagesTest
|
import org.jetbrains.kotlin.android.AbstractAndroidFindUsagesTest
|
||||||
import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest
|
import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest
|
||||||
|
|||||||
+3
-3
@@ -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,11 +14,11 @@
|
|||||||
* limitations under the License.
|
* 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.openapi.extensions.ExtensionPointName
|
||||||
import com.intellij.psi.PsiElement
|
|
||||||
import org.jetbrains.kotlin.idea.references.JetSimpleNameReference
|
import org.jetbrains.kotlin.idea.references.JetSimpleNameReference
|
||||||
|
import com.intellij.psi.PsiElement
|
||||||
import org.jetbrains.kotlin.psi.JetPsiFactory
|
import org.jetbrains.kotlin.psi.JetPsiFactory
|
||||||
|
|
||||||
public trait SimpleNameReferenceExtension {
|
public trait SimpleNameReferenceExtension {
|
||||||
@@ -15,10 +15,10 @@
|
|||||||
interface="org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension"
|
interface="org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension"
|
||||||
area="IDEA_PROJECT"/>
|
area="IDEA_PROJECT"/>
|
||||||
<extensionPoint name="findUsagesHandlerDecorator"
|
<extensionPoint name="findUsagesHandlerDecorator"
|
||||||
interface="org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator"
|
interface="org.jetbrains.kotlin.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator"
|
||||||
area="IDEA_PROJECT"/>
|
area="IDEA_PROJECT"/>
|
||||||
<extensionPoint name="simpleNameReferenceExtension"
|
<extensionPoint name="simpleNameReferenceExtension"
|
||||||
interface="org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension"
|
interface="org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension"
|
||||||
area="IDEA_PROJECT"/>
|
area="IDEA_PROJECT"/>
|
||||||
</extensionPoints>
|
</extensionPoints>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetNamedDeclaration
|
|||||||
import org.jetbrains.kotlin.psi.JetClassOrObject
|
import org.jetbrains.kotlin.psi.JetClassOrObject
|
||||||
import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory
|
import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory
|
||||||
import org.jetbrains.kotlin.idea.findUsages.handlers.DelegatingFindMemberUsagesHandler
|
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
|
import com.intellij.openapi.extensions.Extensions
|
||||||
|
|
||||||
public class KotlinFindUsagesHandlerFactory(project: Project) : FindUsagesHandlerFactory() {
|
public class KotlinFindUsagesHandlerFactory(project: Project) : FindUsagesHandlerFactory() {
|
||||||
|
|||||||
+2
-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,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* 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.openapi.extensions.ExtensionPointName
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
+1
-1
@@ -27,7 +27,7 @@ import com.intellij.psi.xml.XmlAttribute
|
|||||||
import org.jetbrains.android.util.AndroidResourceUtil
|
import org.jetbrains.android.util.AndroidResourceUtil
|
||||||
import java.util.ArrayList
|
import java.util.ArrayList
|
||||||
import com.intellij.find.findUsages.JavaVariableFindUsagesOptions
|
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.JetNamedDeclaration
|
||||||
import org.jetbrains.kotlin.psi.JetProperty
|
import org.jetbrains.kotlin.psi.JetProperty
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.plugin.android
|
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 org.jetbrains.kotlin.idea.references.JetSimpleNameReference
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper
|
import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.android.jps
|
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.ModuleBuildTarget
|
||||||
import org.jetbrains.jps.incremental.CompileContext
|
import org.jetbrains.jps.incremental.CompileContext
|
||||||
import org.jetbrains.jps.model.module.JpsModule
|
import org.jetbrains.jps.model.module.JpsModule
|
||||||
|
|||||||
+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,16 +14,15 @@
|
|||||||
* limitations under the License.
|
* 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.builders.JpsBuildTestCase
|
||||||
import org.jetbrains.jps.android.model.JpsAndroidSdkProperties
|
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.JpsSimpleElement
|
||||||
import org.jetbrains.jps.model.library.sdk.JpsSdk
|
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.impl.JpsSimpleElementImpl
|
||||||
|
import org.jetbrains.jps.model.library.JpsOrderRootType
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() {
|
public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() {
|
||||||
Reference in New Issue
Block a user