Rename package jet -> kotlin in backend

org.jetbrains.jet.codegen -> org.jetbrains.kotlin.codegen
2015-01-08 22:00:59 +03:00
parent f447a860b1
commit de6e8a7493
265 changed files with 956 additions and 1026 deletions
@@ -36,7 +36,7 @@ import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor;
+import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
 import org.jetbrains.jet.context.ContextPackage;
 import org.jetbrains.jet.context.GlobalContextImpl;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import com.intellij.psi.PsiReference
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.jet.codegen.PropertyCodegen
+import org.jetbrains.kotlin.codegen.PropertyCodegen
 import org.jetbrains.kotlin.asJava.KotlinLightMethod
 import org.jetbrains.jet.lang.resolve.OverrideResolver
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
@@ -37,10 +37,10 @@ import com.sun.jdi.ReferenceType
 import com.sun.jdi.request.ClassPrepareRequest
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.jet.analyzer.AnalysisResult
-import org.jetbrains.jet.codegen.AsmUtil
-import org.jetbrains.jet.codegen.ClassBuilderFactories
-import org.jetbrains.jet.codegen.state.GenerationState
-import org.jetbrains.jet.codegen.state.JetTypeMapper
+import org.jetbrains.kotlin.codegen.AsmUtil
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
@@ -65,7 +65,7 @@ import org.jetbrains.org.objectweb.asm.Type

 import java.util.*

-import org.jetbrains.jet.codegen.binding.CodegenBinding.asmTypeForAnonymousClass
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass
 import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import com.intellij.psi.stubs.StubElement
@@ -21,7 +21,7 @@ import com.intellij.debugger.ui.tree.NodeDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.debugger.impl.DebuggerContextImpl
 import com.intellij.debugger.SourcePosition
-import org.jetbrains.jet.codegen.AsmUtil
+import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.jet.lang.psi.JetClassOrObject
 import com.intellij.debugger.impl.DebuggerContextUtil
 import com.sun.jdi.ReferenceType
@@ -101,4 +101,4 @@ public class KotlinSourcePositionProvider: SourcePositionProvider() {
        }
        return null
    }
-}
+}
@@ -22,9 +22,9 @@ import com.intellij.debugger.SourcePosition
 import com.intellij.debugger.engine.evaluation.*
 import com.intellij.debugger.engine.evaluation.expression.*
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils
-import org.jetbrains.jet.codegen.state.GenerationState
-import org.jetbrains.jet.codegen.ClassBuilderFactories
-import org.jetbrains.jet.codegen.KotlinCodegenFacade
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
 import com.intellij.testFramework.LightVirtualFile
 import org.jetbrains.jet.plugin.JetLanguage
 import org.jetbrains.jet.lang.psi.JetFile
@@ -42,13 +42,13 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.eval4j.jdi.asValue
 import org.jetbrains.jet.lang.psi.JetNamedFunction
-import org.jetbrains.jet.codegen.ClassFileFactory
+import org.jetbrains.kotlin.codegen.ClassFileFactory
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
 import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.jet.lang.psi.JetCodeFragment
 import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck
 import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.jet.codegen.CompilationErrorHandler
+import org.jetbrains.kotlin.codegen.CompilationErrorHandler
 import org.jetbrains.jet.lang.diagnostics.Severity
 import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages
 import com.sun.jdi.request.EventRequest
@@ -57,7 +57,7 @@ import com.intellij.debugger.engine.SuspendContext
 import org.jetbrains.jet.plugin.debugger.evaluate.KotlinEvaluateExpressionCache.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import com.sun.jdi.VirtualMachine
-import org.jetbrains.jet.codegen.AsmUtil
+import org.jetbrains.kotlin.codegen.AsmUtil
 import com.sun.jdi.InvalidStackFrameException
 import org.jetbrains.jet.plugin.util.application.runReadAction
 import org.jetbrains.jet.lang.psi.analysisContext
@@ -70,7 +70,7 @@ import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension
 import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.types.Flexibility
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.plugin.util.attachment.attachmentByPsiFile
@@ -33,9 +33,8 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi
 import com.sun.jdi.Field
 import com.sun.jdi.ReferenceType
 import com.sun.jdi.Type
-import com.sun.jdi.InvocationException
 import com.sun.jdi.Method
-import org.jetbrains.jet.codegen.PropertyCodegen
+import org.jetbrains.kotlin.codegen.PropertyCodegen
 import org.jetbrains.jet.lang.resolve.name.Name
 import com.intellij.debugger.engine.evaluation.EvaluateException

@@ -103,4 +102,4 @@ public class KotlinClassWithDelegatedPropertyRenderer : ClassRenderer() {
        val getterName = PropertyCodegen.getterName(Name.identifier(fieldName))
        return objRef.referenceType().methodsByName(getterName)?.firstOrNull()
    }
-}
+}
@@ -36,11 +36,11 @@ import com.intellij.ui.content.ContentManager;
 import com.intellij.util.Alarm;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.codegen.ClassBuilderFactories;
-import org.jetbrains.jet.codegen.CompilationErrorHandler;
-import org.jetbrains.jet.codegen.KotlinCodegenFacade;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.Progress;
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories;
+import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticSink;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
@@ -27,7 +27,7 @@ import com.intellij.psi.PsiMethod
 import com.intellij.psi.SyntheticElement
 import com.intellij.refactoring.util.RefactoringUtil
 import com.intellij.refactoring.rename.RenameProcessor
-import org.jetbrains.jet.codegen.PropertyCodegen
+import org.jetbrains.kotlin.codegen.PropertyCodegen
 import org.jetbrains.jet.lang.resolve.name.Name
 import com.intellij.usageView.UsageInfo
 import com.intellij.refactoring.listeners.RefactoringElementListener
@@ -35,7 +35,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes;
 import java.util.Map;
 import java.util.Set;

-import static org.jetbrains.jet.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
+import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
 import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.*;

 /**
@@ -16,7 +16,7 @@

 package org.jetbrains.jet.plugin;

-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;

 public class JetWithJdkAndRuntimeLightProjectDescriptor extends JetJdkAndLibraryProjectDescriptor {
    protected JetWithJdkAndRuntimeLightProjectDescriptor() {
@@ -36,8 +36,8 @@ import com.sun.jdi.Location;
 import com.sun.jdi.ReferenceType;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.GenerationUtils;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.MockLibraryUtil;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -26,7 +26,7 @@ import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEdito
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VfsUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;

 /**
 * Helper for configuring kotlin runtime in tested project.