Rename jet -> kotlin in frontend
org.jetbrains.jet -> org.jetbrains.kotlin Also rename package slicedmap to slicedMap
This commit is contained in:
@@ -17,8 +17,8 @@
|
||||
package org.jetbrains.kotlin.generators.injectors
|
||||
|
||||
import com.intellij.openapi.project.Project
|
||||
import org.jetbrains.jet.context.GlobalContext
|
||||
import org.jetbrains.jet.context.GlobalContextImpl
|
||||
import org.jetbrains.kotlin.context.GlobalContext
|
||||
import org.jetbrains.kotlin.context.GlobalContextImpl
|
||||
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
|
||||
import org.jetbrains.kotlin.resolve.*
|
||||
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM
|
||||
import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider
|
||||
import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
|
||||
import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider
|
||||
import org.jetbrains.jet.context.LazyResolveToken
|
||||
import org.jetbrains.kotlin.context.LazyResolveToken
|
||||
import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct
|
||||
import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverPostConstruct
|
||||
import org.jetbrains.kotlin.resolve.lazy.ScopeProvider
|
||||
@@ -144,7 +144,7 @@ private fun generatorForJavaDescriptorResolver() =
|
||||
parameter<BindingTrace>()
|
||||
|
||||
publicField<GlobalContextImpl>(useAsContext = true,
|
||||
init = GivenExpression("org.jetbrains.jet.context.ContextPackage.GlobalContext()"))
|
||||
init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()"))
|
||||
publicField<ModuleDescriptorImpl>(name = "module",
|
||||
init = GivenExpression(javaClass<TopDownAnalyzerFacadeForJVM>().getName() + ".createJavaModule(\"<fake-jdr-module>\")"))
|
||||
publicField<JavaDescriptorResolver>()
|
||||
@@ -215,7 +215,7 @@ private fun generatorForMacro() =
|
||||
publicField<CallResolver>()
|
||||
|
||||
field<GlobalContext>(useAsContext = true,
|
||||
init = GivenExpression("org.jetbrains.jet.context.ContextPackage.GlobalContext()"))
|
||||
init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()"))
|
||||
|
||||
field<AdditionalCheckerProvider.Empty>()
|
||||
}
|
||||
@@ -230,7 +230,7 @@ private fun generatorForTests() =
|
||||
publicField<ExpressionTypingUtils>()
|
||||
publicField<TypeResolver>()
|
||||
|
||||
field<GlobalContext>(init = GivenExpression("org.jetbrains.jet.context.ContextPackage.GlobalContext()"),
|
||||
field<GlobalContext>(init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()"),
|
||||
useAsContext = true)
|
||||
|
||||
field<JavaDeclarationCheckerProvider>()
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.generators.tests.generator.SimpleTestClassModel
|
||||
import java.io.File
|
||||
import java.util.regex.Pattern
|
||||
import junit.framework.TestCase
|
||||
import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest
|
||||
import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTest
|
||||
import org.jetbrains.jet.resolve.AbstractResolveTest
|
||||
import org.jetbrains.kotlin.parsing.AbstractJetParsingTest
|
||||
import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest
|
||||
@@ -40,8 +40,8 @@ import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest
|
||||
import org.jetbrains.kotlin.cli.AbstractKotlincExecutableTest
|
||||
import org.jetbrains.jet.repl.AbstractReplInterpreterTest
|
||||
import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
|
||||
import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest
|
||||
import org.jetbrains.jet.checkers.AbstractJetJsCheckerTest
|
||||
import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest
|
||||
import org.jetbrains.kotlin.checkers.AbstractJetJsCheckerTest
|
||||
import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest
|
||||
import org.jetbrains.jet.completion.AbstractJSBasicCompletionTest
|
||||
import org.jetbrains.jet.completion.AbstractKeywordCompletionTest
|
||||
@@ -84,7 +84,7 @@ import org.jetbrains.jet.resolve.AbstractReferenceResolveInLibrarySourcesTest
|
||||
import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest
|
||||
import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest
|
||||
import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest
|
||||
import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTestWithStdLib
|
||||
import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib
|
||||
import org.jetbrains.jet.plugin.codeInsight.AbstractInsertImportOnPasteTest
|
||||
import org.jetbrains.jet.plugin.codeInsight.AbstractLineMarkersTest
|
||||
import org.jetbrains.jet.resolve.AbstractReferenceToJavaWithWrongFileStructureTest
|
||||
@@ -129,7 +129,7 @@ import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTes
|
||||
import org.jetbrains.jet.completion.AbstractMultiFileSmartCompletionTest
|
||||
import org.jetbrains.jet.completion.handlers.AbstractCompletionCharFilterTest
|
||||
import org.jetbrains.jet.resolve.AbstractPartialBodyResolveTest
|
||||
import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTestWithJsStdLib
|
||||
import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib
|
||||
import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest
|
||||
import org.jetbrains.jet.types.AbstractJetTypeBindingTest
|
||||
import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest
|
||||
|
||||
Reference in New Issue
Block a user