diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index 89aa08274dd..a949640d4b5 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.codegen.CodegenTestFiles; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java index 4bcaeb8fe42..b0b682c326e 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java index baabae72e04..1ed40f4e484 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.backend.common; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index be01c629bc0..0e1969d690c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java index b091e9d1e04..99e5a6bab94 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java index 8d1d9dd9f55..b100c93861b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; public abstract class CallGenerator { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java index 5dd22414eab..2fe545d8f12 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index 92a047a7269..2b0cc3c6645 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 304f51b6854..a1940614f5f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmAbi; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java index e2e32cf49a2..7240288c716 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; public class CodegenStatementVisitor extends JetVisitor { private final ExpressionCodegen codegen; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java index 76c983cd2ce..8c5cc9ec7e4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetParameter; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 0d7977458c1..741e4342bca 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.evaluate.EvaluatePackage; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; @@ -83,7 +83,7 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 1f758063ff1..dd7caee69a0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -34,8 +34,8 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java index 10bc594f0a6..46c07422079 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody; +import org.jetbrains.kotlin.psi.JetDeclarationWithBody; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 5c5be659f65..a4a4120e946 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.serialization.ClassData; import org.jetbrains.kotlin.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 9c8dfcb65ba..4a7134d75ca 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.codegen.context.PackageContext; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.codeFragmentUtil.CodeFragmentUtilPackage; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilPackage; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaPackageFragment; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java index 4986a511846..1b637104c48 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java @@ -20,8 +20,8 @@ import com.google.common.collect.Sets; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 6116daaffe0..2805903e805 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 05553e30824..bb4dd5b79b8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.MemberComparator; import org.jetbrains.jet.lang.resolve.java.JvmAbi; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java index 0a6f72dee27..3272943d7d6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java @@ -21,10 +21,10 @@ import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.context.FieldOwnerContext; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.org.objectweb.asm.Type; import static org.jetbrains.kotlin.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt index 2d683c88fec..48227e807e2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature import org.jetbrains.kotlin.codegen.context.MethodContext -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.backend.common.CodegenUtil import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor import kotlin.platform.platformStatic diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index 9625a835f8c..cf13ec9c363 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java index 1ace407ff42..89b50a876ab 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperClasses.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperClasses.java index d7dc005b0c0..7c68048087a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperClasses.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperClasses.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.org.objectweb.asm.Type; import java.util.Map; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java index 6295e30d0c2..839e862f6ee 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index b378a74ded0..c679f1e5882 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index 0b4e6f3764b..2e6bae6d234 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethod; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetArrayAccessExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java index 0a592caf3ba..69d7252fdf7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java @@ -23,9 +23,9 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.jet.lang.resolve.calls.model.*; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java index 9bbb816bb4b..71a6669da1d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.context.ClassContext; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import static org.jetbrains.kotlin.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index 68339a47077..f62b689a866 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping; import org.jetbrains.kotlin.cfg.WhenChecker; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index 69ad87121f6..17d249445b7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java index 78b84dd0967..3fa2e9e24b6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index fd20dfcc580..ec08c819310 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java index 22566f57ae2..16101ac5134 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.AsmTypes; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java index 72ba9681e28..a3cccf91473 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetFunctionLiteral; -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression; +import org.jetbrains.kotlin.psi.JetFunctionLiteral; +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RootInliningContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RootInliningContext.java index 2a1143d4200..b75f9f8aa67 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RootInliningContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RootInliningContext.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; import java.util.Collections; import java.util.Map; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.java index 9d57a2c3d6a..2e9256010a5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java index 9503c8d2d43..97b9111f1d5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetCallExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetCallExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySet.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySet.java index 167aaa65095..4fd104bac7b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySet.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySet.java @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.org.objectweb.asm.Type; +import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt index bb5d5c5adb1..a8e50bf5adf 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression public class ArraySize : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt index e8a2ee85ff6..d2e7344b63d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt @@ -21,8 +21,7 @@ import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.psi.JetExpression - +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.org.objectweb.asm.Opcodes.* import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive import org.jetbrains.kotlin.codegen.AsmUtil.numberFunctionOperandType diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java index 599a44c234a..78d1f18da30 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java @@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetSuperExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetSuperExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.java index 370e8f7a44b..cea92a969fd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java index 89d6197a16c..f51bd89b6ac 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java index d5627f2751b..da45bb4a16c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt index 386d9128e8f..e0dce14775b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt @@ -20,8 +20,8 @@ import com.intellij.psi.PsiElement import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.codegen.AsmUtil.genEqualsForExpressionsOnStack diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt index ac97ec72aa3..c69877d517e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt @@ -21,7 +21,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.java.AsmTypes public class HashCode : LazyIntrinsicMethod() { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java index cb685b4d4b8..2a3bcd30321 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java @@ -20,10 +20,10 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetCallExpression; -import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetCallExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt index ce88b23199a..e5c16f6a202 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.intrinsics import com.intellij.psi.PsiElement import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.AsmUtil.genIncrement import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java index c4768a5141f..37347bd5b3c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.Callable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.java index c12472f87e2..bd6325bca35 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.java @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.org.objectweb.asm.Type; +import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java index 349e66a58a0..daa18260fb0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java index 5240629db4c..aa9045b8420 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.VarargValueArgument; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java index f0efb2c160d..72e07291f55 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.inline.ReifiedTypeInliner; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.types.JetType; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java index c847aa3cff9..22bb1635745 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/LazyIntrinsicMethod.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/LazyIntrinsicMethod.java index b9899788ddb..4aa51474f0b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/LazyIntrinsicMethod.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/LazyIntrinsicMethod.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java index 977b9bfa89d..ace0c26341d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java @@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NewArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NewArray.java index b9dd1ea7a6d..a873467dd5b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NewArray.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NewArray.java @@ -20,8 +20,8 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetCallExpression; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetCallExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.java index b0f1c9eb8b6..7e261a73be6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.java index 190fc20a80d..4eaa7a0d8ca 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/RangeTo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/RangeTo.java index f7b0176a699..c09557ca961 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/RangeTo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/RangeTo.java @@ -20,8 +20,8 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt index aae816b6fba..7f5c3dc25f3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression public class StringGetChar : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt index b862ad7932d..e9d0bb42d41 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt @@ -19,9 +19,8 @@ package org.jetbrains.kotlin.codegen.intrinsics import com.intellij.psi.PsiElement import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.org.objectweb.asm.Type - import org.jetbrains.jet.lang.resolve.java.AsmTypes.JAVA_STRING_TYPE import org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ToString.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ToString.kt index c45080346c0..a86db02c11b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ToString.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ToString.kt @@ -18,11 +18,10 @@ package org.jetbrains.kotlin.codegen.intrinsics import com.intellij.psi.PsiElement import org.jetbrains.org.objectweb.asm.Type -import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.codegen.AsmUtil.genToString -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression public class ToString : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt index 6aa59cfdf32..3d0374ed37e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt @@ -21,7 +21,7 @@ import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.codegen.AsmUtil.* -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression public class UnaryMinus : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.java index 9647b35b6b1..e067ec75c28 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.java @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java index 5b5ab813345..3abf90a91bd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java @@ -27,9 +27,9 @@ import org.jetbrains.kotlin.codegen.when.MappingsClassesForWhenByEnum; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index a7a89dd9f72..3147beaac40 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java index c10377e5cf0..a33dfa834f0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.EnumValue; import org.jetbrains.org.objectweb.asm.Label; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java index a20928c79ce..692a5c70b90 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.org.objectweb.asm.Label; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java index 800d33c35cf..5d2c3d303c4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java @@ -20,7 +20,7 @@ import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.constants.EnumValue; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java index 1c0ff8b7dab..8b0ca48865e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.org.objectweb.asm.Type; import java.util.HashSet; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java index f807e34d669..c57a4d5d40c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java @@ -20,7 +20,7 @@ import com.google.common.collect.Maps; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; import org.jetbrains.org.objectweb.asm.Label; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java index f983aea31f6..9fa34bcffb8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.FrameMap; -import org.jetbrains.jet.lang.psi.JetWhenEntry; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetWhenEntry; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.NullValue; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java index 2443a093226..33ec2d08086 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java index 2fb5a53bdbb..8665486ea72 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli.common; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index c359d94f5ab..a8f264399b3 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index 5c7397f25b8..c5bbccdff88 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.config.Services; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java index f2e62f2a8f3..4b4c71f5c51 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index 422abfc99aa..f07a152b351 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.codegen.GeneratedClassLoader; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetFileType; 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 3f5565dc584..56830b5faf8 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 @@ -46,7 +46,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer; import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 25c9663f4ac..f9047d4c80b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index 4bab5967d01..df08179d4dc 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -43,8 +43,8 @@ import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.impl.CompositePackageFragmentProvider; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.parsing.JetParserDefinition; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java index 72079862d88..23d486f29fc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java index 862331fdc9e..189c140e69c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetDeclaration; import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.*; import static org.jetbrains.jet.lang.diagnostics.Severity.ERROR; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt index 395cdd57aef..a847b1fb186 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt @@ -19,10 +19,10 @@ package org.jetbrains.jet.lang.resolve.java.diagnostics import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind.* import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java index a0f07a43f97..6a5a0666eea 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java @@ -21,14 +21,14 @@ import com.intellij.util.containers.ComparatorUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; import org.jetbrains.jet.lang.types.JetType; import java.util.HashMap; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class AlternativeFieldSignatureData extends ElementAlternativeSignatureData { private JetType altReturnType; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index e8423d3068f..3a24c04181b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import java.util.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.MEMBER_SIGNATURE_CONTRAVARIANT; import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.UPPER_BOUND; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java index 5683a7931b2..345e6b6e75a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetTypeElement; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetTypeElement; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index 7a037b63fad..e5371e344db 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.java.JavaPackage; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt index 0ff2d6f7f5f..b410b554748 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt @@ -18,14 +18,14 @@ package org.jetbrains.jet.lang.resolve.kotlin import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider import org.jetbrains.jet.lang.resolve.AnnotationChecker -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.annotations.hasPlatformStaticAnnotation -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.ClassKind import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.diagnostics.DiagnosticSink import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation @@ -36,10 +36,10 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.JetTypeParameter import org.jetbrains.jet.lang.resolve.annotations.hasIntrinsicAnnotation import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeFunChecker -import org.jetbrains.jet.lang.psi.JetPropertyAccessor +import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.jet.lang.descriptors.MemberDescriptor public object JavaDeclarationCheckerProvider : AdditionalCheckerProvider { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java index 7dd0ea45429..3991e8e0dbf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java @@ -25,10 +25,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt index bfe5091c786..3ca6d1cc6c5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.kotlin.incremental import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.java.JvmClassName import java.util.HashMap diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt index 3fc06f1b966..f5b91f73357 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin.incremental import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.util.containers.MultiMap import java.util.HashMap import org.jetbrains.jet.lang.descriptors.ModuleDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt index 4f3d54d2861..fc5c41b91b4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin.incremental.cache import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.java.JvmClassName -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import java.util.HashMap import java.io.File diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt index 606261b21dd..9f6fb67c966 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt @@ -20,14 +20,14 @@ import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.AnnotationChecker -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticSink import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.descriptors.Modality import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation import org.jetbrains.jet.lang.resolve.diagnostics.SuppressDiagnosticsByAnnotations import org.jetbrains.jet.lang.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java index 964d64d23f5..23032b29cf1 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -62,7 +62,7 @@ import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.calls.CallCompleter; import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java index 0edae0d09f2..f8904910910 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -66,7 +66,7 @@ import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.calls.CallCompleter; import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.BodyResolver; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java index 511631b579c..56dd3441235 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -65,7 +65,7 @@ import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.calls.CallCompleter; import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeType.java b/compiler/frontend/src/org/jetbrains/jet/JetNodeType.java index a5a067a8250..28807abb34f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetNodeType.java +++ b/compiler/frontend/src/org/jetbrains/jet/JetNodeType.java @@ -20,8 +20,8 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetElementImpl; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElementImpl; import org.jetbrains.jet.plugin.JetLanguage; import java.lang.reflect.Constructor; diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java index 3d68bb0d8c0..31f22709d19 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java +++ b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java @@ -18,8 +18,8 @@ package org.jetbrains.jet; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.plugin.JetLanguage; public interface JetNodeTypes { diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt index 16f0e1df242..f6af254fd04 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.search.GlobalSearchScope import kotlin.properties.Delegates diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt index 77768a8b472..4e37973cf21 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.analyzer -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.di.InjectorForMacros import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java index 3e41cf55ee7..4fba3d2c8bb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java @@ -39,9 +39,9 @@ import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.diagnostics.rendering.AbstractDiagnosticWithParametersRenderer; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRenderer; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index 4388670ca31..7eef66be6b5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java index e17aac45440..1680eda75fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.diagnostics; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.kotlin.lexer.JetKeywordToken; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java index eacf832065a..788a26050fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java @@ -27,7 +27,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index b2a806f3bdd..3dd1614b318 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -23,7 +23,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt index 805f491b105..35cd3bf4b71 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.tree.TokenSet import org.jetbrains.jet.JetNodeTypes -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetKeywordToken import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.utils.sure diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java index d48aab3b058..9eaff68b2b2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java @@ -29,9 +29,9 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.psi.JetTypeConstraint; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetTypeConstraint; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.kotlin.lexer.JetKeywordToken; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java index b37a42473d4..5b073288b1a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java @@ -26,9 +26,9 @@ import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.inference.*; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt index 2805e643b10..ef7d58240b0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.evaluate import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.constants.* @@ -33,7 +33,7 @@ import org.jetbrains.jet.JetNodeTypes import java.math.BigInteger import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ConstantExpressionEvaluator private (val trace: BindingTrace) : JetVisitor, JetType>() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java index 76a6741c6a1..88ef39fe4ae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java @@ -32,9 +32,9 @@ import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeType; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementType; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetLexer; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java index 05d2dce5bdf..284e94345bf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java @@ -20,7 +20,7 @@ import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/BacktraceVisitorStatus.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/BacktraceVisitorStatus.java deleted file mode 100644 index 315891ec035..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/BacktraceVisitorStatus.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.psi; - -import org.jetbrains.annotations.NotNull; - -public class BacktraceVisitorStatus { - @NotNull - private final T data; - private final boolean abortTrace; - - public BacktraceVisitorStatus(@NotNull T data, boolean abortTrace) { - this.data = data; - this.abortTrace = abortTrace; - } - - @NotNull - public T getData() { - return data; - } - - public boolean isAbortTrace() { - return abortTrace; - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedArgumentImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedArgumentImpl.java deleted file mode 100644 index 4ffc8b36543..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedArgumentImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.psi; - -import com.intellij.lang.ASTNode; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.lexer.JetTokens; - -public class JetNamedArgumentImpl extends JetValueArgument { - public JetNamedArgumentImpl(@NotNull ASTNode node) { - super(node); - } - - public String getParameterName() { - return getParameterNameNode().getText(); - } - - private ASTNode getParameterNameNode() { - return getNode().findChildByType(JetTokens.IDENTIFIER); - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/VisitorData.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/VisitorData.java deleted file mode 100644 index d6b5786602f..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/VisitorData.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.psi; - -import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -public final class VisitorData { - public T data; - @NotNull - public final List visitedPath; - public PsiElement last; - - public VisitorData(@NotNull List visitedPath) { - this.visitedPath = visitedPath; - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java index f795a3548a0..a56387f75f4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java @@ -23,9 +23,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid; -import org.jetbrains.jet.lang.psi.debugText.DebugTextPackage; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid; +import org.jetbrains.kotlin.psi.debugText.DebugTextPackage; import java.util.ArrayList; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt index 3dec9f53e04..31876cf5c38 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.MemberDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticSink import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor @@ -25,4 +25,4 @@ public trait AnnotationChecker { public fun check(declaration: JetDeclaration, descriptor: DeclarationDescriptor, diagnosticHolder: DiagnosticSink); -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index b236a8c6bb6..e62eab1df11 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationsImpl; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java index b8e3cdc80e1..817be40ea18 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemCompleter; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java index 1d332ba38c9..bcdbe2c4d17 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java @@ -23,7 +23,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt index 9f030b06d0a..7fbc9d28181 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt @@ -17,16 +17,16 @@ package org.jetbrains.jet.lang.resolve.bindingContextUtil import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetReturnExpression +import org.jetbrains.kotlin.psi.JetReturnExpression import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.BindingContext.LABEL_TARGET import org.jetbrains.jet.lang.resolve.BindingContext.FUNCTION import org.jetbrains.jet.lang.resolve.BindingContext.DECLARATION_TO_DESCRIPTOR -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java index 67e91949c79..51b7954fa57 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.storage.ExceptionTracker; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index 416ba04edc7..c0a3a5f43ec 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -23,7 +23,7 @@ import com.intellij.util.containers.Queue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java index 1f85f66501d..9f9d05be1fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java @@ -23,9 +23,9 @@ import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.BooleanValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java index 689cb1bdf94..82aa26e8788 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cfg.JetFlowInformationProvider; import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java index 146140a2cda..1b7c514c68a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java index 59dd635245f..1819f551228 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.SubstitutionUtils; import org.jetbrains.jet.lang.types.TypeConstructor; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java index e79f110d70d..badc99e1150 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.rendering.Renderers; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemCompleter; @@ -45,7 +45,7 @@ import javax.inject.Inject; import java.util.List; import static org.jetbrains.jet.lang.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getCalleeExpressionIfAny; import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.FROM_COMPLETER; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java index 82b247fb4d2..c130431224b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java @@ -23,10 +23,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDelegationSpecifier; -import org.jetbrains.jet.lang.psi.JetDelegatorByExpressionSpecifier; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDelegationSpecifier; +import org.jetbrains.kotlin.psi.JetDelegatorByExpressionSpecifier; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; @@ -246,4 +246,4 @@ public final class DelegationResolver { @Nullable JetType resolve(@NotNull JetTypeReference reference); } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 8c1936c26ae..7ac9348a4df 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.impl.*; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.jet.lang.evaluate.EvaluatePackage; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java index 0c56374af76..046a6a3d51e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.source.SourcePackage; import java.util.ArrayList; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java index 740c9157595..9a5badd3969 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.extension.InlineAnalyzerExtension; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java index e7ff7e79ab1..6efb05eeb79 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java index 37ea298fed8..cdce6d8be9a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java @@ -21,7 +21,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMapping; import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java index d850567babf..a4ca4d6c569 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.CompositePackageFragmentProvider; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.LazyImportScope; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java index eda5472f021..aa929c26e81 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java index aa9d742fa1f..e7a3595b46c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java @@ -22,10 +22,10 @@ import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index ecf1577892a..e5e3c189c4f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PartialBodyResolveProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PartialBodyResolveProvider.kt index 225cae57d39..fe3fe233e67 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PartialBodyResolveProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PartialBodyResolveProvider.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement public open class PartialBodyResolveProvider { public open val filter: ((JetElement) -> Boolean)? @@ -25,4 +25,4 @@ public open class PartialBodyResolveProvider { class object { public val NONE: PartialBodyResolveProvider = PartialBodyResolveProvider() } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java index 2c04e8b7822..b0cfda6d95d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.AbstractScopeAdapter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java index 2a043aef1b1..3b5a1587e08 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java @@ -22,10 +22,10 @@ import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.data.DataPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index ac9ab16cb2a..8953772b5c1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -22,8 +22,8 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java index cb3f3af58ab..a8875963b8e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java @@ -19,9 +19,9 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPackageDirective; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPackageDirective; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.name.FqName; public class ScriptNameUtil { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java index 78f3e76761d..0e3a0639022 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java @@ -25,8 +25,8 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetScript; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java index caac5e4c54d..ab679846abc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index ef05c0fccbd..abdc236fd17 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; import org.jetbrains.jet.lang.descriptors.impl.*; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt index 64f24243ad5..d0023c67b1d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt @@ -19,11 +19,11 @@ package org.jetbrains.jet.lang.resolve.typeBinding import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetTypeElement -import org.jetbrains.jet.lang.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetTypeElement +import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetTypeReference import java.util.AbstractList import org.jetbrains.jet.lang.types.TypeProjection import org.jetbrains.jet.lang.descriptors.CallableDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index 16ba1395c31..30ba250a65f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt index f69f38698c7..8f438f193af 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter import org.jetbrains.jet.lang.types.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt index e339e9e22d8..7da6d4b6c1d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt @@ -28,12 +28,12 @@ import org.jetbrains.jet.lang.resolve.typeBinding.TypeBinding import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.typeBinding.createTypeBinding import org.jetbrains.jet.lang.resolve.typeBinding.createTypeBindingForReturnType -import org.jetbrains.jet.lang.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.lang.types.Variance.* import org.jetbrains.jet.lang.diagnostics.DiagnosticSink import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl import org.jetbrains.jet.lang.descriptors.impl.PropertyAccessorDescriptorImpl import org.jetbrains.jet.lang.resolve.source.getPsi import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner +import org.jetbrains.kotlin.psi.JetTypeParameterListOwner import org.jetbrains.jet.lang.resolve.BindingContext import kotlin.platform.platformStatic diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java index e74a4723734..b65ea514288 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.context.CallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt index 6f5b69dc915..b80a2128b3a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl import org.jetbrains.jet.lang.resolve.calls.context.CallCandidateResolutionContext import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData -import org.jetbrains.jet.lang.psi.ValueArgument +import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMapping import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.calls.model.ArgumentUnmapped @@ -43,13 +43,13 @@ import org.jetbrains.jet.lang.resolve.calls.callUtil.* import org.jetbrains.jet.lang.resolve.BindingContextUtils import org.jetbrains.jet.lang.resolve.calls.context.CallResolutionContext import org.jetbrains.jet.lang.types.expressions.DataFlowUtils -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetSafeQualifiedExpression +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace -import org.jetbrains.jet.lang.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetQualifiedExpression import java.util.ArrayList import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* @@ -318,4 +318,4 @@ public class CallCompleter( val expressionType = trace[BindingContext.EXPRESSION_TYPE, expression.getReceiverExpression()] return expressionType != null && TypeUtils.isNullableType(expressionType) } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java index 9ab67e9f728..4db97880b8d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index b6e67a61028..dcce2efff84 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -22,7 +22,7 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.context.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java index 5ce1df5c579..c0fa9c08877 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java index 6bb58413eb1..51c5aa5eb3c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.ChainedTemporaryBindingTrace; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; @@ -50,7 +50,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; /** * CallTransformer treats specially 'variable as function' call case, other cases keeps unchanged (base realization). diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index 6caabb63ccc..c7dd4bfddd1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -24,8 +24,8 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.context.*; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java index 3cdd7b6cef9..fdef69e7e31 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.*; import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; @@ -325,4 +325,4 @@ import static org.jetbrains.jet.lang.resolve.calls.ValueArgumentsToParametersMap } private ValueArgumentsToParametersMapper() {} -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java index dc8b51ec9ba..957d8d5a122 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.Call; +import org.jetbrains.kotlin.psi.Call; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java index b5bd3e5479c..13f928ba810 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.psi.Call; +import org.jetbrains.kotlin.psi.Call; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java index 8edef91ae67..015e65b0078 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.Call; +import org.jetbrains.kotlin.psi.Call; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.model.DataFlowInfoForArgumentsImpl; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCache.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCache.kt index c638e2cbcf1..e917659a8f0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCache.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCache.kt @@ -19,9 +19,9 @@ package org.jetbrains.jet.lang.resolve.calls.context import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import java.util.HashMap -import org.jetbrains.jet.lang.psi.Call +import org.jetbrains.kotlin.psi.Call import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy import org.jetbrains.jet.lang.resolve.calls.context.ResolutionResultsCache.CachedData @@ -85,4 +85,4 @@ public class TemporaryResolutionResultsCache(private val parentCache: Resolution is TemporaryResolutionResultsCache -> parentCache.innerCache.addData(innerCache) } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/TemporaryTraceAndCache.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/TemporaryTraceAndCache.java index 705cf848198..adb9fc3ac34 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/TemporaryTraceAndCache.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/TemporaryTraceAndCache.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.calls.context; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; public class TemporaryTraceAndCache { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt index f92b2977313..f6960c73fc8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt @@ -27,8 +27,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE import org.jetbrains.jet.lang.types.expressions.CaptureKind import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.psi.JetFunctionLiteral -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.* import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java index 5de84f4c650..2926f0b0daa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java index d35a51897ac..90333b970ee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArguments.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArguments.java index 93cbcf94fb4..1fd1605c980 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArguments.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArguments.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; public interface DataFlowInfoForArguments { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArgumentsImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArgumentsImpl.java index 2ac06e8d1c5..4e1380594f8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArgumentsImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArgumentsImpl.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.calls.model; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import java.util.Iterator; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DefaultValueArgument.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DefaultValueArgument.java index 7aadd1580e0..9c1902341c9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DefaultValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DefaultValueArgument.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.ValueArgument; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java index e3b94de6284..48a36de112d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ExpressionValueArgument.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ExpressionValueArgument.java index 5608065f7a7..660aaf1cddb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ExpressionValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ExpressionValueArgument.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java index 273eb529af2..c55e96cf69a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; public interface MutableDataFlowInfoForArguments extends DataFlowInfoForArguments { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java index c28b5f12543..1f5b8968214 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java index 292b4eb42a9..d9add21009d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java index 5a3653cb0d1..e121bddd09a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java @@ -23,9 +23,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.ValueArgument; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.ValueArgument; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedValueArgument.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedValueArgument.java index 5dfa27332a0..5cb75d99261 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedValueArgument.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.ValueArgument; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VarargValueArgument.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VarargValueArgument.java index a02836f120a..fdb7a795057 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VarargValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VarargValueArgument.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.calls.model; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import java.util.Iterator; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt index 9a74ccc70ac..4a8ce8eac25 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt @@ -21,8 +21,8 @@ import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.psi.Call -import org.jetbrains.jet.lang.psi.ValueArgument +import org.jetbrains.kotlin.psi.Call +import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus @@ -52,4 +52,4 @@ class VariableAsFunctionResolvedCallImpl( return variableCall.getTrace() } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java index 296cd0cbf0f..5a1a2e740b2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java index 808c501b866..24ebe234458 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java @@ -23,7 +23,7 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java index 15d7a375af1..218ab5bf062 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java @@ -21,7 +21,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java index f4b3198c734..2ab5d0abe7a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.tasks; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.psi.Call; +import org.jetbrains.kotlin.psi.Call; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java index b3fdcf522ad..6ee09c06404 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java @@ -21,8 +21,8 @@ import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.context.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt index 8708a23dc03..8eac21c7150 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.tasks import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.storage.StorageManager import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt index 53b79b43dab..fa218beea81 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt @@ -20,7 +20,7 @@ import com.google.common.collect.Lists import com.google.common.collect.Sets import com.intellij.openapi.progress.ProgressIndicatorProvider import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.Call +import org.jetbrains.kotlin.psi.Call import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollector diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java index 09a207cabe7..0e5e8e84da7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.calls.tasks; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java index 3fb55406a57..d6d3cabe429 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java @@ -20,11 +20,11 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java index 1bbc996e19d..f0e7c467790 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.calls.tasks; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt index f7342d6df18..56c4e449cc6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.calls.tasks -import org.jetbrains.jet.lang.psi.Call +import org.jetbrains.kotlin.psi.Call import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl import org.jetbrains.jet.lang.descriptors.annotations.Annotations @@ -47,14 +47,14 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.VariableDescriptor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.lang.types.expressions.OperatorConventions -import org.jetbrains.jet.lang.psi.JetOperationReferenceExpression +import org.jetbrains.kotlin.psi.JetOperationReferenceExpression import org.jetbrains.jet.lang.resolve.DescriptorFactory import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.ValueArgument +import org.jetbrains.kotlin.psi.ValueArgument import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetPsiUtil object DynamicCallableDescriptors { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java index 37ebfd7f267..d404c8af560 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java @@ -21,9 +21,9 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.impl.source.tree.LeafPsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.Call.CallType; -import org.jetbrains.jet.lang.psi.debugText.DebugTextPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.Call.CallType; +import org.jetbrains.kotlin.psi.debugText.DebugTextPackage; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java index 033081c9298..929dd6a2685 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt index f7852eebac2..621c7af9314 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt @@ -22,14 +22,14 @@ import org.jetbrains.jet.lang.resolve.calls.model.ArgumentUnmapped import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatchStatus -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver import org.jetbrains.jet.lang.resolve.BindingContext.CALL import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL import org.jetbrains.kotlin.utils.sure -import org.jetbrains.jet.lang.psi.psiUtil.getTextWithLocation +import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation import org.jetbrains.jet.lang.descriptors.FunctionDescriptor // resolved call @@ -176,4 +176,4 @@ public fun JetExpression.getFunctionResolvedCallWithAssert(context: BindingConte } [suppress("UNCHECKED_CAST")] return resolvedCall as ResolvedCall -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt index b5adf1edcd5..96cf8e24b79 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.types.TypeUtils import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes import org.jetbrains.jet.lang.resolve.BindingTrace diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java index 2fe01c6d02a..942f03c7196 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.psi.JetConstantExpression; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetConstantExpression; +import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java index d489f93baa4..d3226b5bf46 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java @@ -33,9 +33,9 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Severity; -import org.jetbrains.jet.lang.psi.JetAnnotated; -import org.jetbrains.jet.lang.psi.JetAnnotationEntry; -import org.jetbrains.jet.lang.psi.JetStubbedPsiUtil; +import org.jetbrains.kotlin.psi.JetAnnotated; +import org.jetbrains.kotlin.psi.JetAnnotationEntry; +import org.jetbrains.kotlin.psi.JetStubbedPsiUtil; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.constants.ArrayValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt index bfe6f6cb7a4..294fcf9fb6d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt @@ -22,10 +22,10 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.psi.JetFunction +import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1 -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0 public val FUNCTION_NO_BODY_ERRORS: List> = diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java index db3c42a3ab0..acb58f6d4d0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java index ff3eddb1247..3f4f5716aa8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.google.common.collect.*; import kotlin.Function0; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetImportDirective; +import org.jetbrains.kotlin.psi.JetImportDirective; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.kotlin.storage.NotNullLazyValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java index d20166c8f3e..32729cb711b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java @@ -20,9 +20,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt index 896bb02f02b..fa8420c9dcf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt @@ -18,10 +18,10 @@ package org.jetbrains.jet.lang.resolve.lazy import com.google.common.collect.Sets import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.JetCodeFragment -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetImportDirective -import org.jetbrains.jet.lang.psi.debugText.* +import org.jetbrains.kotlin.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetImportDirective +import org.jetbrains.kotlin.psi.debugText.* import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.Importer import org.jetbrains.jet.lang.resolve.ImportsResolver diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index 4f6d2d46ae5..cb85f17b67e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java index e5dc516c178..6492777a55c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java @@ -25,8 +25,8 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; -import org.jetbrains.jet.lang.psi.JetNamedDeclarationUtil; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetNamedDeclarationUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.NamePackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java index fcc6efa707c..27e24b25025 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java @@ -22,7 +22,7 @@ import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.NoSubpackagesInPackageScope; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.JetModuleUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java index bd12d236d74..07b148b33a7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.data; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java index 10106e253f1..2112a87f993 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.lazy.data; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; public class JetClassInfoUtil { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java index 7ac8efd02b8..e1a965cbdfd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java index 328422cd322..fee6e6d241c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java index d564d6e9036..73bfa17160a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java @@ -19,10 +19,10 @@ package org.jetbrains.jet.lang.resolve.lazy.data; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.psi.JetClassObject; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetTypeParameterList; +import org.jetbrains.kotlin.psi.JetClassObject; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetTypeParameterList; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt index a09ffd797d5..1c7dcf3c2aa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.lazy.data -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.descriptors.ClassKind import org.jetbrains.jet.lang.resolve.ScriptNameUtil import org.jetbrains.jet.lang.resolve.name.FqName diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java index 477dc2c2fbc..7ceae29f004 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index 1ea01e1e3c8..896ca5b9203 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import com.google.common.collect.ArrayListMultimap -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils import org.jetbrains.jet.lang.resolve.lazy.data.JetClassInfoUtil import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt index 4e124a7e5db..d6beddf4332 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.utils.sure import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt index 7a3412461a1..3b9b96cd05f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt index 7f9087cc36a..4b39745e86c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.storage.StorageManager import com.intellij.openapi.vfs.VirtualFile import java.util.HashSet diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index 8bd48480f1b..d99125c0cc4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -24,8 +24,8 @@ import com.google.common.collect.Sets; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPackageDirective; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPackageDirective; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.storage.NotNullLazyValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt index dc707c85628..3d0c7ade98f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import kotlin.Function0 -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.storage.StorageManager diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt index 3eb01125a58..2d859d766c2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import org.jetbrains.annotations.ReadOnly -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.name.FqName public trait PackageMemberDeclarationProvider : DeclarationProvider { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt index 43cd225de2b..0c87c8e9dc1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index e9cdc234b37..3f9a5b3d5e8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors import com.google.common.collect.Sets import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.AnnotationResolver import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.ScriptNameUtil diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt index 09d684c252d..95a25135073 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.lazy.LazyEntity -import org.jetbrains.jet.lang.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.JetAnnotationEntry import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index 81f414fe0e4..4d13ffe251e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorBase; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.ModifiersChecker; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt index 3298769bd22..68cbb506e1f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -20,7 +20,7 @@ import com.google.common.collect.Lists import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.dataClassUtils.* import org.jetbrains.jet.lang.resolve.lazy.ResolveSession diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java index eabde61dce8..a6756b59b1d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt index 647502e1e56..00eb438f677 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider import org.jetbrains.jet.lang.resolve.name.Name diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt index 3be57db7dda..6b263c0f225 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors import org.jetbrains.jet.lang.resolve.lazy.ResolveSession -import org.jetbrains.jet.lang.psi.JetScript +import org.jetbrains.kotlin.psi.JetScript import org.jetbrains.jet.lang.resolve.lazy.LazyEntity import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorNonRootImpl import org.jetbrains.jet.lang.descriptors.annotations.Annotations @@ -110,4 +110,4 @@ public class LazyScriptDescriptor( override fun accept(visitor: DeclarationDescriptorVisitor, data: D): R { return visitor.visitScriptDescriptor(this, data) as R } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java index 59a167bb4df..3155d4216d7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java index 2192b850338..9587e0fcafe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.types.JetType; public class ExpressionReceiver extends AbstractReceiverValue implements ReceiverValue { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt index d15bdc5d59b..a907d2e5bbe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName import org.jetbrains.jet.lang.resolve.name.Name @@ -29,9 +29,9 @@ import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.lang.resolve.BindingContext.* import org.jetbrains.jet.lang.diagnostics.Errors.* import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext -import org.jetbrains.jet.lang.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector +import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector import org.jetbrains.jet.lang.resolve.descriptorUtil.getClassObjectReferenceTarget -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.bindingContextUtil.recordScopeAndDataFlowInfo import kotlin.properties.Delegates diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt index 7c2564e8679..c787318c8bd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.source -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.lang.descriptors.SourceElement import com.intellij.psi.PsiElement @@ -24,4 +24,4 @@ public class KotlinSourceElement(override val psi: JetElement) : PsiSourceElemen public fun JetElement?.toSourceElement(): SourceElement = if (this == null) SourceElement.NO_SOURCE else KotlinSourceElement(this) -public fun SourceElement.getPsi(): PsiElement? = (this as? PsiSourceElement)?.psi \ No newline at end of file +public fun SourceElement.getPsi(): PsiElement? = (this as? PsiSourceElement)?.psi diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index c3ff79673d7..99bcd9f596a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java index b83d3aaf8db..f7e808d73c8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -363,4 +363,4 @@ public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor { ); return result; } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java index e6c6f9f92e4..06f7a5a96c7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.CallResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java index 7f1fe203361..3bcb6ecd8a6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java index ae2d9e56366..48ae307bc7c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.jet.lang.evaluate.EvaluatePackage; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingFacade.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingFacade.java index de17081507e..17c29e56930 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingFacade.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingFacade.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.types.JetTypeInfo; public interface ExpressionTypingFacade { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingInternals.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingInternals.java index b52cb21bd0c..e7b380e60ac 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingInternals.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingInternals.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetTypeInfo; /*package*/ interface ExpressionTypingInternals extends ExpressionTypingFacade { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java index 48c453f6651..194c132a4ca 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java index 5416e77b8ee..35adf1b0394 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; @@ -55,7 +55,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitor.java index 25f2b8d4bfd..f8b6d950aa5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitor.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.types.expressions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetVisitor; +import org.jetbrains.kotlin.psi.JetVisitor; import org.jetbrains.jet.lang.types.JetTypeInfo; /*package*/ abstract class ExpressionTypingVisitor extends JetVisitor { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java index e2e431577ec..3d006b5479d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -20,7 +20,7 @@ import com.intellij.openapi.progress.ProcessCanceledException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java index fcb410cc5e5..833b9c355f6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.context.TemporaryTraceAndCache; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java index 3a00bd6dab1..ac6ce2aab1e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; @@ -42,7 +42,7 @@ import javax.inject.Inject; import java.util.Collections; import static org.jetbrains.jet.lang.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; public class ForLoopConventionsChecker { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java index 72918d56e06..bdcd181f27e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java index 222dd701e80..c9bb7c41f56 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder; -import org.jetbrains.jet.lang.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java index a9a2f57d616..15bb5e79d7a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.Ref; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.PossiblyBareType; import org.jetbrains.jet.lang.resolve.TypeResolutionContext; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java index c33404c8f41..9a87404e6ae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.PossiblyBareType; diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java index a97084b686d..785d60f6b18 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java @@ -20,9 +20,9 @@ import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/BreakableBlockInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/BreakableBlockInfo.java index 157c8e3ac29..c905f95b2e0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/BreakableBlockInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/BreakableBlockInfo.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cfg; import com.google.common.collect.Sets; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; import java.util.Collections; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java index 9faab40b70d..b3c1b639428 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java index 6824a3ed64e..226afc2051f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index 0fac7a6303a..e8ea90d9cf6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -33,8 +33,8 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValu import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 96a982c3ba0..39ae289284b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -49,7 +49,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/LoopInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/LoopInfo.java index 9f820f97ac6..fb88cc2bb0f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/LoopInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/LoopInfo.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg; -import org.jetbrains.jet.lang.psi.JetLoopExpression; +import org.jetbrains.kotlin.psi.JetLoopExpression; public class LoopInfo extends BreakableBlockInfo { private final Label bodyEntryPoint; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java index 5ca9a9a7215..48509245531 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java @@ -34,8 +34,8 @@ import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.lang.resolve.BindingContext; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java index ca44841782a..f1eacd67a5a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.ThrowExceptionInst import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.MarkInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; public class TailRecursionDetector extends InstructionVisitorWithResult implements Function1 { private final JetElement subroutine; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt index 1500f8d54f2..09a97b43ea4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.cfg -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import com.intellij.openapi.util.TextRange import java.util.HashSet -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiWhiteSpace diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java index 68d1b541484..fe42ead596e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassKind; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java index 74efa002e61..7056df59c9b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValue.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValue.kt index 0a96cbe2a9c..ce5967835fe 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValue.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValue.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue public trait PseudoValue { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValueImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValueImpl.kt index 6663f68c027..0db63679e6a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValueImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValueImpl.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue class PseudoValueImpl( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/Pseudocode.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/Pseudocode.java index 1bf0060ae47..0d3a19407ff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/Pseudocode.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/Pseudocode.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDec import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineEnterInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; import java.util.List; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java index 0f9e65fdc01..b567fd9e31f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineEnterI import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java index 5ed2ad7af44..a1b88a8e4c7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.WriteValueInstructi import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt index 4705a848f29..7eb084e3a9a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.utils.emptyOrSingletonList public abstract class InstructionWithNext( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt index 05fde902ed7..5852da96d9e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement public trait JetElementInstruction : Instruction { public val element: JetElement diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt index 774efc36e2b..3b6eeb54b61 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement public abstract class JetElementInstructionImpl( override val element: JetElement, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt index cbcddccf85d..033df628369 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetDeclaration import kotlin.properties.Delegates public class LexicalScope(val parentScope: LexicalScope?, val element: JetElement) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt index d98b3544de4..5732bf497bf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt index ed5f4e41d93..0efb91a28f8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration public trait AccessTarget { public data class Declaration(val descriptor: VariableDescriptor): AccessTarget diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt index e73c0cad263..ec3dec2d607 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt index e0aab3b4770..2ede6a870fd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.Label import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstructionImpl diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt index 0110435ee20..cc860e9c671 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.Label import java.util.Arrays import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt index 13bb3cc5abf..103afc8a4cd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.Label import com.google.common.collect.Maps import com.google.common.collect.Lists diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt index 9d1cc3c4e2d..f8354214afb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.Label import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt index b0de80783d3..af04f5e58b0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.cfg.Label import java.util.Collections import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult -import org.jetbrains.jet.lang.psi.JetReturnExpression +import org.jetbrains.kotlin.psi.JetReturnExpression public class ReturnValueInstruction( returnExpression: JetExpression, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt index 691f1bcedf6..cafb95debdb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue -import org.jetbrains.jet.lang.psi.JetThrowExpression +import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.cfg.Label import java.util.Collections import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt index b7ea147a8b6..42646730470 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps import org.jetbrains.kotlin.cfg.pseudocode.instructions.* -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.Label public class UnconditionalJumpInstruction( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt index 4cec71106db..ce2e88a189a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.special -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode import com.google.common.collect.Lists import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/MarkInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/MarkInstruction.kt index c60e804e689..9bfe6a6ba4b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/MarkInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/MarkInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.special -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt index bf82dd53116..b388c759244 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.special -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt index 53ec459e8d7..162d7cbc978 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.special -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import java.util.Collections import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt index e65b7d56f8e..3a78bd7c4d7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.special -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import java.util.Collections import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt index 63d98d3b915..973455227b3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.special -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetVariableDeclaration -import org.jetbrains.jet.lang.psi.JetParameter +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetVariableDeclaration +import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt index adcc308abce..bee9e091e9c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cfg.pseudocode import org.jetbrains.kotlin.cfg.pseudocode.instructions.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.bindingContextUtil.* import org.jetbrains.jet.lang.resolve.calls.model.* diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index 2d8c256e606..3d0b0b84eaf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -56,7 +56,7 @@ import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.ImportsResolver; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.OverloadResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index 4bcb78d8ecc..3f07841a8bf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.calls.CallCompleter; import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index eba92a8b646..4091eb4e89e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -49,7 +49,7 @@ import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.calls.CallCompleter; import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index 3382db691b0..7a5dff0f65b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -56,7 +56,7 @@ import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.ImportsResolver; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.OverloadResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java index 428a3df5f7b..f235679ff3e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java @@ -194,7 +194,7 @@ public interface JetTokens { * Don't add KDocTokens to COMMENTS TokenSet, because it is used in JetParserDefinition.getCommentTokens(), * and therefor all COMMENTS tokens will be ignored by PsiBuilder. * - * @see org.jetbrains.jet.lang.psi.JetPsiUtil#isInComment(com.intellij.psi.PsiElement) + * @see org.jetbrains.kotlin.psi.JetPsiUtil#isInComment(com.intellij.psi.PsiElement) */ TokenSet COMMENTS = TokenSet.create(EOL_COMMENT, BLOCK_COMMENT, DOC_COMMENT, SHEBANG_COMMENT); TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.orSet(COMMENTS, TokenSet.create(WHITE_SPACE)); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/Call.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/Call.java index 08b961c2eb9..0fcbbc12fb1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/Call.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt index b5df2234158..7048fec93d6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.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,49 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.debugText +package org.jetbrains.kotlin.psi.debugText -import org.jetbrains.jet.lang.psi.JetElementImplStub -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetVisitor -import org.jetbrains.jet.lang.psi.JetModifierList -import org.jetbrains.jet.lang.psi.JetTypeParameterList -import org.jetbrains.jet.lang.psi.JetParameterList -import org.jetbrains.jet.lang.psi.JetDelegationSpecifierList -import org.jetbrains.jet.lang.psi.JetClassBody -import org.jetbrains.jet.lang.psi.JetStubbedPsiUtil -import org.jetbrains.jet.lang.psi.JetAnnotation -import org.jetbrains.jet.lang.psi.JetAnnotationEntry -import org.jetbrains.jet.lang.psi.JetClassInitializer -import org.jetbrains.jet.lang.psi.JetClassObject -import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression -import org.jetbrains.jet.lang.psi.JetDelegationSpecifier -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression -import org.jetbrains.jet.lang.psi.JetEnumEntry -import org.jetbrains.jet.lang.psi.JetInitializerList -import org.jetbrains.jet.lang.psi.JetFunctionType -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetTypeConstraintList -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetNullableType -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.psi.JetTypeArgumentList -import org.jetbrains.jet.lang.psi.JetTypeConstraint -import org.jetbrains.jet.lang.psi.JetTypeParameter -import org.jetbrains.jet.lang.psi.JetTypeProjection -import org.jetbrains.jet.lang.psi.JetUserType import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetPackageDirective -import org.jetbrains.jet.lang.psi.JetImportDirective -import org.jetbrains.jet.lang.psi.JetImportList -import org.jetbrains.jet.lang.psi.JetDynamicType // invoke this instead of getText() when you need debug text to identify some place in PSI without storing the element itself // this is need to avoid unnecessary file parses diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/FindDocComment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt similarity index 82% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/FindDocComment.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt index 423d4047662..bb94218272e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/FindDocComment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.findDocComment +package org.jetbrains.kotlin.psi.findDocComment -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.kdoc.psi.api.KDoc -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.psiUtil.siblings import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiComment diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/IfNotParsed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/IfNotParsed.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/IfNotParsed.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/IfNotParsed.java index 9e7c512e717..acb281d6363 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/IfNotParsed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/IfNotParsed.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotated.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotated.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotated.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotated.java index ae04cbfd02e..b23a6b17022 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotated.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java index 98c24eaca3e..587591327e6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotation.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotation.java similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotation.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotation.java index bd5e496773d..676abdbebad 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotation.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotationEntry.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotationEntry.java index 3b7c0e8d536..640206ae052 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotationEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.stubs.KotlinAnnotationEntryStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinAnnotationEntryStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetArrayAccessExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetArrayAccessExpression.java index ce7aaf11b25..a636abf934e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetArrayAccessExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpression.java index d38cf1dc1aa..87fb3fe32fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpressionWithTypeRHS.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpressionWithTypeRHS.java index f730ec15543..06c6c9871bd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpressionWithTypeRHS.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragment.kt similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragment.kt index f47246fc78a..6355e404e24 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragment.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragmentType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java index b1117da36f0..8d2280332f4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragmentType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.parsing.JetParser; -import org.jetbrains.jet.lang.psi.stubs.elements.JetFileElementType; +import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType; public class JetBlockCodeFragmentType extends JetFileElementType { private static final String NAME = "jet.BLOCK_CODE_FRAGMENT"; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockExpression.java index 8e4795aa1ef..43b3f946ffd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockStringTemplateEntry.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockStringTemplateEntry.java index 17fa7dd1b17..fb72c385147 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockStringTemplateEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBreakExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetBreakExpression.java index e58cf1544b9..e9196a2a3ff 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBreakExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallElement.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallElement.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java index 6133fb98daf..f968dbc8578 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallElement.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import kotlin.jvm.KotlinSignature; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallExpression.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallExpression.java index cbf7e743cfb..bd4a5977740 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableDeclaration.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableDeclaration.java index b20acbe7846..377f42ab4b3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,10 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableReferenceExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableReferenceExpression.java index 71e4a9ca675..f7ff1edbec3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableReferenceExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCatchClause.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCatchClause.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCatchClause.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetCatchClause.java index b9cc33c9448..2c0ee81f4d4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCatchClause.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCatchClause.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java index 7391bfa088d..377594cae1d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; @@ -27,9 +27,9 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.addRemoveModifier.AddRemoveModifierPackage; -import org.jetbrains.jet.lang.psi.stubs.KotlinClassStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java index 085a60e6283..6b6d9264444 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -24,14 +24,14 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Arrays; import java.util.List; -import static org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes.*; +import static org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes.*; public class JetClassBody extends JetElementImplStub> implements JetDeclarationContainer { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java index 8c966fc01c0..38e170f85ee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetClassInitializer extends JetDeclarationStub> implements JetStatementExpression { public JetClassInitializer(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassObject.java similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassObject.java index dbfb7746e4f..3156e5f8c70 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,15 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetClassObject extends JetDeclarationStub> implements JetStatementExpression { public JetClassObject(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassOrObject.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassOrObject.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java index baf4e892ac7..1ec43cfcc17 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassOrObject.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiNameIdentifierOwner; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt index edba81d98e5..43ed099f6b8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.openapi.project.Project import com.intellij.psi.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstantExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstantExpression.java index a582f143eff..dc38c150b11 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstantExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstructorCalleeExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructorCalleeExpression.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstructorCalleeExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructorCalleeExpression.java index ee1f88b425f..11c923ac85d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstructorCalleeExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructorCalleeExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetConstructorCalleeExpression extends JetExpressionImplStub> { public JetConstructorCalleeExpression(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContainerNode.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetContainerNode.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContainerNode.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetContainerNode.java index d756598b5e2..47aa286397f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContainerNode.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetContainerNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetContinueExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetContinueExpression.java index 62fed0453c1..36f8b320541 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetContinueExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclaration.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclaration.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclaration.java index 5f4ae8a136d..ef26811f345 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.util.ArrayFactory; import org.jetbrains.annotations.NotNull; @@ -33,5 +33,5 @@ public interface JetDeclaration extends JetExpression, JetModifierListOwner { }; @Nullable - public KDoc getDocComment(); + KDoc getDocComment(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationContainer.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationContainer.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationContainer.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationContainer.java index a188aeaba57..c63728b5a30 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationContainer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java index 6babb448e92..573ad9851db 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; -import org.jetbrains.jet.lang.psi.addRemoveModifier.AddRemoveModifierPackage; -import org.jetbrains.jet.lang.psi.findDocComment.FindDocCommentPackage; +import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; +import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentPackage; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationModifierList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationModifierList.java similarity index 81% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationModifierList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationModifierList.java index 508cef3e267..0439550387d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationModifierList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationModifierList.java @@ -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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinModifierListStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetDeclarationModifierList extends JetModifierList { public JetDeclarationModifierList(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationStub.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java index 6aab8b570b1..3e70efd3656 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.openapi.components.ServiceManager; @@ -24,8 +24,8 @@ import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; -import org.jetbrains.jet.lang.psi.findDocComment.FindDocCommentPackage; -import org.jetbrains.jet.lang.psi.stubs.KotlinClassOrObjectStub; +import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub; abstract class JetDeclarationStub extends JetModifierListOwnerStub implements JetDeclaration { public JetDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationWithBody.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationWithBody.java index 992e67b9f0f..08e2781248d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationWithBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegationSpecifier.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegationSpecifier.java index c491022d73f..585adeb8f8c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegationSpecifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.IStubElementType; import com.intellij.util.ArrayFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetDelegationSpecifier extends JetElementImplStub> { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegationSpecifierList.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegationSpecifierList.java index e13a94cfefd..b3c9ece5d81 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegationSpecifierList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Arrays; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorByExpressionSpecifier.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorByExpressionSpecifier.java index e1672e68aaf..7e66646324c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorByExpressionSpecifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetDelegatorByExpressionSpecifier extends JetDelegationSpecifier { public JetDelegatorByExpressionSpecifier(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperCall.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperCall.java index d64ad99663e..ac06888ecdb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperCall.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperClass.java similarity index 84% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperClass.java index 02319a86a15..45b85312368 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetDelegatorToSuperClass extends JetDelegationSpecifier { public JetDelegatorToSuperClass(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToThisCall.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToThisCall.java index 73b73163c3f..e62cee6886c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToThisCall.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDoWhileExpression.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDoWhileExpression.java index 92c54570928..657acd9b848 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDoWhileExpression.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDotQualifiedExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDotQualifiedExpression.java index d66b478684a..d87b47362ed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDotQualifiedExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import static org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes.INSIDE_DIRECTIVE_EXPRESSIONS; +import static org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes.INSIDE_DIRECTIVE_EXPRESSIONS; public class JetDotQualifiedExpression extends JetExpressionImplStub> implements JetQualifiedExpression { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDynamicType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDynamicType.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDynamicType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetDynamicType.java index 7b4869d1e5b..6076e85ec63 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDynamicType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDynamicType.java @@ -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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElement.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElement.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.java index fe42325eb42..5967c3f09a6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElement.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.NavigatablePsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java index d6f19262842..c1d3cd93c45 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImplStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImplStub.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java index f9aa00af0c9..51a05b971ea 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImplStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.extapi.psi.StubBasedPsiElementBase; import com.intellij.lang.ASTNode; @@ -28,7 +28,7 @@ import com.intellij.psi.StubBasedPsiElement; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementType; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType; import org.jetbrains.jet.plugin.JetLanguage; import java.util.Arrays; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetEnumEntry.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetEnumEntry.java index 988528b12d3..bb73db63dd1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetEnumEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -22,8 +22,8 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinClassStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetEscapeStringTemplateEntry.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetEscapeStringTemplateEntry.java index 8b4b065fd4e..c615fb341b7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetEscapeStringTemplateEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.text.StringUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpression.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpression.java index 052f67dc076..e3cd5cc2ad5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.util.ArrayFactory; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragment.kt similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragment.kt index 858f49b18a5..1fa1f84e6c6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragment.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java index 33146393fb0..64a4bc415eb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.parsing.JetParser; -import org.jetbrains.jet.lang.psi.stubs.elements.JetFileElementType; +import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType; public class JetExpressionCodeFragmentType extends JetFileElementType { private static final String NAME = "jet.EXPRESSION_CODE_FRAGMENT"; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.java index e8a9f49c88c..1cd1bab88b7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -22,7 +22,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeType; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class JetExpressionImpl extends JetElementImpl implements JetExpression { public JetExpressionImpl(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImplStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImplStub.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImplStub.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImplStub.java index 78ce8068b01..74e309ac814 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImplStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImplStub.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -23,7 +23,7 @@ import com.intellij.psi.stubs.StubElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class JetExpressionImplStub extends JetElementImplStub implements JetExpression { public JetExpressionImplStub(@NotNull T stub, @NotNull IStubElementType nodeType) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.java index 544be316e56..e953b754c09 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java index bf3bacd61c3..611c26c2e03 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.extapi.psi.PsiFileBase; import com.intellij.lang.ASTNode; @@ -31,9 +31,9 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.stubs.KotlinFileStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetPlaceHolderStubElementType; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetPlaceHolderStubElementType; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFileAnnotationList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFileAnnotationList.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFileAnnotationList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFileAnnotationList.java index b4e4242a718..5c46cdad104 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFileAnnotationList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFileAnnotationList.java @@ -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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFinallySection.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFinallySection.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFinallySection.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFinallySection.java index e54f9f117ce..708c55f33fd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFinallySection.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFinallySection.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetForExpression.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetForExpression.java index a4bd6de37f8..4d749544812 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetForExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunction.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunction.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunction.java index 143473683f2..c85de716ac5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunction.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunction.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; public interface JetFunction extends JetDeclarationWithBody, JetCallableDeclaration { - boolean isLocal(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteral.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteral.java index 73e459271de..6e4eb246318 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteral.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralArgument.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralArgument.kt similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralArgument.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralArgument.kt index 06186f5ae0d..8cee6b8e6f3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralArgument.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralArgument.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.lang.ASTNode import com.intellij.psi.PsiWhiteSpace diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralExpression.java index 53021e74774..73f687eda5e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java index 08e6d294af4..6741a5bc0c3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -22,14 +22,13 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; import java.util.Collections; import java.util.List; -abstract public class JetFunctionNotStubbed extends JetTypeParameterListOwnerNotStubbed - implements JetFunction { +public abstract class JetFunctionNotStubbed extends JetTypeParameterListOwnerNotStubbed implements JetFunction { public JetFunctionNotStubbed(@NotNull ASTNode node) { super(node); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionType.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionType.java index d57291c0740..c30488a7f45 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionTypeReceiver.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionTypeReceiver.java similarity index 84% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionTypeReceiver.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionTypeReceiver.java index c0167ea101a..bf4a2ae20d4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionTypeReceiver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionTypeReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetFunctionTypeReceiver extends JetElementImplStub> { public JetFunctionTypeReceiver(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIfExpression.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetIfExpression.java index 21d68642818..35f0a72d0d9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIfExpression.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java index 99963f9c301..d1e9eb1b90d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinImportDirectiveStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportList.java similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportList.java index 5a262cef5ff..6645a58a297 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportsFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportsFactory.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java index 801d95196fe..4bf6d5377cf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportsFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -28,10 +28,9 @@ import javax.inject.Inject; import java.util.Collection; import java.util.Map; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetImportsFactory { - @NotNull private Project project; private final Map importsCache = Maps.newHashMap(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInitializerList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInitializerList.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInitializerList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetInitializerList.java index d517c802c9e..04ade2dbeb6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInitializerList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInitializerList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Arrays; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInstanceExpressionWithLabel.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInstanceExpressionWithLabel.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInstanceExpressionWithLabel.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetInstanceExpressionWithLabel.java index f8678b8ac83..139a86f9eae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInstanceExpressionWithLabel.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInstanceExpressionWithLabel.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIsExpression.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetIsExpression.java index 6a75e06fd32..2f376d5d4eb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIsExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelReferenceExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLabelReferenceExpression.kt similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelReferenceExpression.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetLabelReferenceExpression.kt index 4dbb59c6dcc..b234a1cc27b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelReferenceExpression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLabelReferenceExpression.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.lang.ASTNode import org.jetbrains.kotlin.lexer.JetTokens diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabeledExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLabeledExpression.java similarity index 62% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabeledExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetLabeledExpression.java index 799d7c0df03..455776305c4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabeledExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLabeledExpression.java @@ -1,23 +1,5 @@ /* - * Copyright 2010-2014 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.psi; - -/* - * 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. @@ -32,6 +14,7 @@ package org.jetbrains.jet.lang.psi; * limitations under the License. */ +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLiteralStringTemplateEntry.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetLiteralStringTemplateEntry.java index cf8f001e412..7066588c00d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLiteralStringTemplateEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLoopExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLoopExpression.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLoopExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetLoopExpression.java index e7d57e09f04..d1db4b484c2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLoopExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLoopExpression.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierList.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierList.java index db6cfe90426..97e6184eb30 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierList.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; @@ -22,10 +22,10 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.stubs.IStubElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinModifierListStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwner.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwner.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwner.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwner.java index 0712b0e7809..e585a680624 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwner.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwner.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwnerStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwnerStub.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java index 60cfc21a5cd..0d04030a266 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwnerStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java @@ -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,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.addRemoveModifier.AddRemoveModifierPackage; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java index e7b0237b1fa..3219c9b118f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java index f97c1aa7a1e..a2b2191f120 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -22,7 +22,7 @@ import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNameReferenceExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNameReferenceExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java index 9dc9d33a2a9..af2cd0f1bfc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNameReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -22,8 +22,8 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinNameReferenceExpressionStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinNameReferenceExpressionStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamed.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamed.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamed.java index 77f709ab94d..16f4ab8bb0c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamed.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclaration.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclaration.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclaration.java index 60f90818ab2..e3e918145ef 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiNameIdentifierOwner; import org.jetbrains.annotations.NotNull; @@ -25,6 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; public interface JetNamedDeclaration extends JetDeclaration, PsiNameIdentifierOwner, JetStatementExpression, JetNamed { @NotNull Name getNameAsSafeName(); + @Nullable FqName getFqName(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationNotStubbed.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java index 89036a5cec5..c5b5cbe87fd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; // TODO: Remove when all named declarations get stubs @Deprecated diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java index 66f60d697d7..8f0e2c439f0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -26,12 +26,12 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinStubWithFqName; +import org.jetbrains.kotlin.psi.stubs.KotlinStubWithFqName; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; abstract class JetNamedDeclarationStub extends JetDeclarationStub implements JetNamedDeclaration { public JetNamedDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java index c98ad0440e6..69414157ee5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java index f9467ed90a3..f8dc08d1a36 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; @@ -25,10 +25,10 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinFunctionStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNullableType.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetNullableType.java index 5926a809d1a..e05ae4fdd00 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNullableType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java index d48028b4b07..8e4f0723be8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; @@ -25,8 +25,8 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.stubs.KotlinObjectStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclarationName.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclarationName.java index 1a667eb12b3..683c55a2649 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclarationName.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.JetTokens; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetObjectDeclarationName extends JetExpressionImpl { public JetObjectDeclarationName(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectLiteralExpression.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectLiteralExpression.java index eb2873c8c74..bb8c2945fe2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectLiteralExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationExpression.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationExpression.java index 54f68828c26..4739d894681 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationReferenceExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationReferenceExpression.kt similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationReferenceExpression.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationReferenceExpression.kt index f3cd6b2a041..4671dd2aff2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationReferenceExpression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationReferenceExpression.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.lang.ASTNode import org.jetbrains.jet.lang.parsing.JetExpressionParsing diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPackageDirective.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPackageDirective.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPackageDirective.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPackageDirective.java index 43e9254654a..42df9371753 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPackageDirective.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPackageDirective.java @@ -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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.SpecialNames; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameter.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameter.java index 83afd928f77..9d30960bd78 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; @@ -22,10 +22,10 @@ import com.intellij.navigation.ItemPresentationProviders; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinParameterStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinParameterStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameterList.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameterList.java index cd0be7263a8..078dd7e78f8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameterList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParenthesizedExpression.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetParenthesizedExpression.java index b0ee6856128..bb221dbe0f8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParenthesizedExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPostfixExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPostfixExpression.java index 639fd51f36b..f9439f8c431 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPostfixExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; @@ -24,6 +24,7 @@ public class JetPostfixExpression extends JetUnaryExpression { super(node); } + @Override @NotNull public JetExpression getBaseExpression() { JetExpression answer = findChildByClass(JetExpression.class); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrefixExpression.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrefixExpression.java index 160b13afe5f..014f566fede 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrefixExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.util.PsiTreeUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrimaryConstructorModifierList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructorModifierList.java similarity index 82% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrimaryConstructorModifierList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructorModifierList.java index 2552d5eadf7..9a7a9e24c0f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrimaryConstructorModifierList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructorModifierList.java @@ -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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinModifierListStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetPrimaryConstructorModifierList extends JetModifierList { public JetPrimaryConstructorModifierList(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProjectionKind.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetProjectionKind.java index ca60dd2fef5..5e6e9980bd1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProjectionKind.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.JetSingleValueToken; @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.lexer.JetTokens; public enum JetProjectionKind { IN(JetTokens.IN_KEYWORD), OUT(JetTokens.OUT_KEYWORD), STAR(JetTokens.MUL), NONE(null); - @Nullable private final JetSingleValueToken token; JetProjectionKind(@Nullable JetSingleValueToken token) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java index 61881c792d5..ae1068b4041 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; @@ -28,9 +28,9 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPropertyAccessor.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPropertyAccessor.java index 641d77602fd..f809269355b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPropertyAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyAccessorStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPropertyAccessorStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPropertyDelegate.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPropertyDelegate.java index 524a6a89a84..aea44a52658 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPropertyDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt index eb610595ad8..db0de2a20f9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.lang.ASTNode import com.intellij.openapi.project.Project @@ -25,7 +25,7 @@ import com.intellij.util.LocalTimeCounter import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.kotlin.lexer.JetKeywordToken import org.jetbrains.jet.plugin.JetFileType -import org.jetbrains.jet.lang.psi.JetPsiFactory.CallableBuilder.Target +import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target import com.intellij.openapi.util.Key import java.io.PrintWriter import java.io.StringWriter @@ -655,7 +655,7 @@ public class JetPsiFactory(private val project: Project) { public fun wrapInABlock(expression: JetExpression): JetBlockExpression { if (expression is JetBlockExpression) { - return expression as JetBlockExpression + return expression } return BlockWrapper(expression) } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUnparsingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUnparsingUtils.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUnparsingUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUnparsingUtils.java index cfa0dcf4052..dc8868e93dd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUnparsingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUnparsingUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java index 3f09e09532c..e925c392d0b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.kdoc.psi.api.KDocElement; import org.jetbrains.jet.lang.parsing.JetExpressionParsing; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.SpecialNames; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpression.java index 9f68b941732..a3d7a9e6457 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpression.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpressionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpressionImpl.kt similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpressionImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpressionImpl.kt index 3b81c910792..a521afc9bcc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpressionImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpressionImpl.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,11 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.lang.ASTNode -import com.intellij.psi.PsiElement -import org.jetbrains.annotations.Nullable import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.psi.util.PsiTreeUtil diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetReferenceExpression.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetReferenceExpression.java index 6f56c76ff3b..3cfc2bb84d9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetReferenceExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; public interface JetReferenceExpression extends JetExpression { } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetReturnExpression.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetReturnExpression.java index aa325bdbd3f..d42fe5b67e1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetReturnExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetRootPackageExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetRootPackageExpression.java index 3c417286dfd..6da06d1e176 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetRootPackageExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSafeQualifiedExpression.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetSafeQualifiedExpression.java index 559840c7c56..45809f48fee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSafeQualifiedExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetScript.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetScript.java index 0ad0240de6b..5820761bb6d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetScript.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.util.PsiTreeUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSelfType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSelfType.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSelfType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetSelfType.java index 05bf7660e48..e204b73a050 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSelfType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSelfType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt index f04992da51a..eecde588d3e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.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,17 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.lang.ASTNode import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType -import com.intellij.psi.tree.TokenSet -import org.jetbrains.annotations.Nullable -import org.jetbrains.jet.lang.parsing.JetExpressionParsing import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.kotlin.lexer.JetTokens.* public trait JetSimpleNameExpression : JetReferenceExpression { @@ -45,8 +41,8 @@ abstract class JetSimpleNameExpressionImpl(node: ASTNode) : JetExpressionImpl(no override fun getReferencedNameElementType() = getReferencedNameElementTypeImpl() - override fun accept(visitor: JetVisitor, data: D?): R { - return visitor.visitSimpleNameExpression(this, data) as R + override fun accept(visitor: JetVisitor, data: D): R { + return visitor.visitSimpleNameExpression(this, data) } override fun getReferencedNameAsName() = getReferencedNameAsNameImpl() diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameStringTemplateEntry.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameStringTemplateEntry.java index 7ce401c8c63..6d17c96ef83 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameStringTemplateEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,13 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -public class JetSimpleNameStringTemplateEntry extends JetStringTemplateEntryWithExpression -{ +public class JetSimpleNameStringTemplateEntry extends JetStringTemplateEntryWithExpression { public JetSimpleNameStringTemplateEntry(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStatementExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStatementExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStatementExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetStatementExpression.java index f3ba7e94710..6ec84e347da 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStatementExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStatementExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; /** * This is an interface to show that {@link JetExpression} is not diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateEntry.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateEntry.java index 5de6ff4b442..9772aa5423a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; @@ -29,5 +29,4 @@ public abstract class JetStringTemplateEntry extends JetElementImpl { public JetExpression getExpression() { return findChildByClass(JetExpression.class); } - } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateEntryWithExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateEntryWithExpression.java index 73265403935..72c966414b7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateEntryWithExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateExpression.java index d6806d71954..911b9983d0f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.ElementManipulators; @@ -25,7 +25,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; - public class JetStringTemplateExpression extends JetExpressionImpl implements PsiLanguageInjectionHost { private static final TokenSet TOKENS_SUITABLE_FOR_INJECTION = TokenSet.create(JetNodeTypes.LITERAL_STRING_TEMPLATE_ENTRY, JetNodeTypes.ESCAPE_STRING_TEMPLATE_ENTRY); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStubbedPsiUtil.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetStubbedPsiUtil.java index 0c48b6426c3..777648e87e3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStubbedPsiUtil.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElement; import com.intellij.psi.stubs.StubElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSuperExpression.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetSuperExpression.java index 09a627fc5be..d3407ce73ca 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSuperExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetThisExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetThisExpression.java index 4983e7237cc..e74f6ef0c8d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetThisExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisReferenceExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetThisReferenceExpression.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisReferenceExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetThisReferenceExpression.java index bfa79e4a145..565bd5d18f9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetThisReferenceExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetThrowExpression.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetThrowExpression.java index 81493680f6c..5eaff6e4630 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetThrowExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTreeVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTreeVisitor.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTreeVisitor.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTreeVisitor.java index 0b61c5b65a4..a902ae84a2e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTreeVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTreeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTreeVisitorVoid.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTreeVisitorVoid.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTreeVisitorVoid.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTreeVisitorVoid.java index 608ae63e6ac..82b4d8f4bd0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTreeVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTreeVisitorVoid.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTryExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTryExpression.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTryExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTryExpression.java index 42a3211e734..dd4bd2909df 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTryExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTryExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeArgumentList.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeArgumentList.java index 5668fc2096f..1c6736ced58 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeArgumentList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java index 22d0f1ff2b3..9ca90352f86 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java index c73b6476238..a9f969402fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.parsing.JetParser; -import org.jetbrains.jet.lang.psi.stubs.elements.JetFileElementType; +import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType; public class JetTypeCodeFragmentType extends JetFileElementType { private static final String NAME = "jet.TYPE_CODE_FRAGMENT"; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeConstraint.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeConstraint.java index fd5a0f19383..d665e81ff00 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeConstraint.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeConstraintStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinTypeConstraintStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetTypeConstraint extends JetElementImplStub { public JetTypeConstraint(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeConstraintList.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeConstraintList.java index 4cc9b36a867..8f467600949 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeConstraintList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeElement.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeElement.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeElement.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeElement.java index accb77f452c..903c621fda3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeElement.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.util.ArrayFactory; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameter.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameter.java index 093ee9f045f..832dc7b47a8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeParameterStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinTypeParameterStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterList.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterList.java index fea8467b658..5dc272d540f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwner.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwner.java index 756c3741915..a3e66664218 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwner.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerNotStubbed.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerNotStubbed.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerNotStubbed.java index bb143fdc246..a2a2c6b5269 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerNotStubbed.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerStub.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerStub.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerStub.java index 5703d54da19..3ef71c54e3b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.IStubElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinStubWithFqName; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinStubWithFqName; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeProjection.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeProjection.java index db1bd048b0b..b733f354f83 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeProjection.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeProjectionStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinTypeProjectionStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class JetTypeProjection extends JetModifierListOwnerStub { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeReference.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeReference.java index 052c4fee1f0..6530e69d5b7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes.ANNOTATION; +import static org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes.ANNOTATION; /** * Type reference element. diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypedef.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypedef.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java index e0600e5effb..de7e6924561 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypedef.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUnaryExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUnaryExpression.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUnaryExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetUnaryExpression.java index ae7893bfca7..1afb330aba5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUnaryExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUnaryExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.tree.IElementType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUserType.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetUserType.java index 79f58597a2a..9647e60a493 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUserType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgument.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgument.java index 88f9d8114ca..df4487fef52 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgument.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.impl.source.tree.LeafPsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentList.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentList.java index 8f96b590820..04fcb5785b3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentName.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentName.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentName.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentName.java index a72be35e794..693b993de8e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentName.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentName.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; @@ -30,6 +30,4 @@ public class JetValueArgumentName extends JetElementImpl { public JetSimpleNameExpression getReferenceExpression() { return (JetSimpleNameExpression) findChildByType(JetNodeTypes.REFERENCE_EXPRESSION); } - - } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVariableDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVariableDeclaration.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVariableDeclaration.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetVariableDeclaration.java index 588562d1646..9653629a2be 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVariableDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVariableDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitor.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitor.java index 8cd7e5cda97..9d387a55a36 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElementVisitor; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoid.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoid.java index a0ef325f851..5a31d91f91c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoid.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoidWithParameter.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoidWithParameter.java index ac87d004db6..4011f0a8fdc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoidWithParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenCondition.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenCondition.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenCondition.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenCondition.java index cb487c70c67..061809072b4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenCondition.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionInRange.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionInRange.java index b17eee4022f..c71857ff044 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionInRange.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionIsPattern.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionIsPattern.java index f8e83bac71b..07dcadaa1c8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionIsPattern.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionWithExpression.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionWithExpression.java index 3d06cbbc989..eda288667f8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionWithExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; @@ -35,5 +35,4 @@ public class JetWhenConditionWithExpression extends JetWhenCondition { public R accept(@NotNull JetVisitor visitor, D data) { return visitor.visitWhenConditionWithExpression(this, data); } - } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenEntry.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenEntry.java index d22f63ef5d7..bde31f64ef4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java index a6c6f2d7cc9..e503bf83973 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpression.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpression.java index c8fa88df31a..d7ddb09f83b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpression.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpressionBase.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpressionBase.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpressionBase.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpressionBase.java index f37ec780dcd..c19d5a630ad 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpressionBase.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpressionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWithExpressionInitializer.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWithExpressionInitializer.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWithExpressionInitializer.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/JetWithExpressionInitializer.java index 048ed6bf7cd..01a8148e907 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWithExpressionInitializer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWithExpressionInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/KotlinDeclarationNavigationPolicy.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinDeclarationNavigationPolicy.kt similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/KotlinDeclarationNavigationPolicy.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinDeclarationNavigationPolicy.kt index fc8e0809138..a9746e19b67 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/KotlinDeclarationNavigationPolicy.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinDeclarationNavigationPolicy.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,8 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi public trait KotlinDeclarationNavigationPolicy { public fun getNavigationElement(declaration: JetDeclaration): JetElement? -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/KotlinStringLiteralTextEscaper.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinStringLiteralTextEscaper.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/KotlinStringLiteralTextEscaper.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinStringLiteralTextEscaper.kt index a5c9b31ad11..83494aa585d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/KotlinStringLiteralTextEscaper.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinStringLiteralTextEscaper.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import com.intellij.psi.LiteralTextEscaper import com.intellij.openapi.util.TextRange import gnu.trove.TIntArrayList -import org.jetbrains.jet.lang.psi.psiUtil.getContentRange -import org.jetbrains.jet.lang.psi.psiUtil.isSingleQuoted +import org.jetbrains.kotlin.psi.psiUtil.getContentRange +import org.jetbrains.kotlin.psi.psiUtil.isSingleQuoted public class KotlinStringLiteralTextEscaper(host: JetStringTemplateExpression): LiteralTextEscaper(host) { private var sourceOffsets: IntArray? = null @@ -78,4 +78,4 @@ public class KotlinStringLiteralTextEscaper(host: JetStringTemplateExpression): override fun isOneLine(): Boolean { return myHost.isSingleQuoted() } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/TypeRefHelpers.kt similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/TypeRefHelpers.kt index 66697b2429f..8a440814ff2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/TypeRefHelpers.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.typeRefHelpers +package org.jetbrains.kotlin.psi.typeRefHelpers -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.psiUtil.siblings import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiErrorElement -import org.jetbrains.jet.lang.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull fun getTypeReference(declaration: JetCallableDeclaration): JetTypeReference? { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/ValueArgument.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/ValueArgument.java index 1a5e2512552..2a5008fdf4b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/ValueArgument.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.psi.impl.source.tree.LeafPsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/addRemoveModifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/addRemoveModifier.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt index 1c532a059e5..a417aa673cb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/addRemoveModifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.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,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.addRemoveModifier +package org.jetbrains.kotlin.psi.addRemoveModifier import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.lexer.JetTokens.* import com.intellij.psi.PsiComment import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.jet.lang.psi.JetModifierListOwner -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetModifierListOwner +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetAnnotation -import org.jetbrains.jet.lang.psi.JetModifierList -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.JetAnnotation +import org.jetbrains.kotlin.psi.JetModifierList +import org.jetbrains.kotlin.psi.psiUtil.siblings internal fun addModifier(owner: JetModifierListOwner, modifier: JetModifierKeywordToken, defaultVisibilityModifier: JetModifierKeywordToken) { val modifierList = owner.getModifierList() diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt index f94bfe4acfb..5242ef8b869 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.codeFragmentUtil +package org.jetbrains.kotlin.psi.codeFragmentUtil import com.intellij.openapi.util.Key -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetCodeFragment public val SKIP_VISIBILITY_CHECK: Key = Key.create("SKIP_VISIBILITY_CHECK") @@ -30,4 +30,4 @@ public var JetFile.skipVisibilityCheck: Boolean } set(skip: Boolean) { putUserData(SKIP_VISIBILITY_CHECK, skip) - } \ No newline at end of file + } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/JetStringTemplateExpressionManipulator.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/JetStringTemplateExpressionManipulator.kt similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/JetStringTemplateExpressionManipulator.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/JetStringTemplateExpressionManipulator.kt index 6d81d9d2d91..a9b5b3003dc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/JetStringTemplateExpressionManipulator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/JetStringTemplateExpressionManipulator.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.lang.psi.psiUtil +package org.jetbrains.kotlin.psi.psiUtil import com.intellij.psi.AbstractElementManipulator -import org.jetbrains.jet.lang.psi.JetStringTemplateExpression +import org.jetbrains.kotlin.psi.JetStringTemplateExpression import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.util.text.StringUtil public class JetStringTemplateExpressionManipulator : AbstractElementManipulator() { @@ -36,4 +36,4 @@ public class JetStringTemplateExpressionManipulator : AbstractElementManipulator override fun getRangeInElement(element: JetStringTemplateExpression): TextRange { return element.getContentRange() } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/StringTemplateExpressionManipulator.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/StringTemplateExpressionManipulator.kt similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/StringTemplateExpressionManipulator.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/StringTemplateExpressionManipulator.kt index 7c56aa4e038..d6fb9f04d1c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/StringTemplateExpressionManipulator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/StringTemplateExpressionManipulator.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.lang.psi.psiUtil +package org.jetbrains.kotlin.psi.psiUtil import com.intellij.psi.AbstractElementManipulator -import org.jetbrains.jet.lang.psi.JetStringTemplateExpression +import org.jetbrains.kotlin.psi.JetStringTemplateExpression import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.util.text.StringUtil public class StringTemplateExpressionManipulator: AbstractElementManipulator() { @@ -36,4 +36,4 @@ public class StringTemplateExpressionManipulator: AbstractElementManipulator { public fun getPackageFqName(): FqName diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetAnnotationEntryElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetAnnotationEntryElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java index 70e5ad16e7f..db3a6f70f49 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetAnnotationEntryElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.StubElement; @@ -23,10 +23,10 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetAnnotationEntry; -import org.jetbrains.jet.lang.psi.JetPsiUtil; -import org.jetbrains.jet.lang.psi.stubs.KotlinAnnotationEntryStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinAnnotationEntryStubImpl; +import org.jetbrains.kotlin.psi.JetAnnotationEntry; +import org.jetbrains.kotlin.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.stubs.KotlinAnnotationEntryStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationEntryStubImpl; import org.jetbrains.jet.lang.resolve.name.Name; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java index b8470c7f1d0..667950b7570 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.IndexSink; @@ -24,12 +24,12 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetEnumEntry; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.lang.psi.stubs.KotlinClassStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinClassStubImpl; -import org.jetbrains.jet.lang.psi.stubs.impl.Utils; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetEnumEntry; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl; +import org.jetbrains.kotlin.psi.stubs.impl.Utils; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetDotQualifiedExpressionElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetDotQualifiedExpressionElementType.java similarity index 81% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetDotQualifiedExpressionElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetDotQualifiedExpressionElementType.java index b12f711eb8b..2628f8d6ef3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetDotQualifiedExpressionElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetDotQualifiedExpressionElementType.java @@ -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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.lang.ASTNode; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression; -import org.jetbrains.jet.lang.psi.JetImportDirective; -import org.jetbrains.jet.lang.psi.JetPackageDirective; +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression; +import org.jetbrains.kotlin.psi.JetImportDirective; +import org.jetbrains.kotlin.psi.JetPackageDirective; public class JetDotQualifiedExpressionElementType extends JetPlaceHolderStubElementType { public JetDotQualifiedExpressionElementType(@NotNull @NonNls String debugName) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java index 3b223c6bd90..1bd780c14fe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.lang.*; import com.intellij.openapi.project.Project; @@ -29,8 +29,8 @@ import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.parsing.JetParser; -import org.jetbrains.jet.lang.psi.stubs.KotlinFileStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFileStubImpl; +import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl; import org.jetbrains.jet.plugin.JetLanguage; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileStubBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileStubBuilder.java similarity index 84% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileStubBuilder.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileStubBuilder.java index ed355fbb929..37f75efbf5d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileStubBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileStubBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,16 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.PsiFile; import com.intellij.psi.stubs.DefaultStubBuilder; import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFileStubImpl; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl; public class JetFileStubBuilder extends DefaultStubBuilder { + @NotNull @Override protected StubElement createStubForFile(@NotNull PsiFile file) { if (!(file instanceof JetFile)) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java index ca214698dbf..9ac807945d1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.StubElement; @@ -23,10 +23,10 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.lang.psi.stubs.KotlinFunctionStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFunctionStubImpl; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetImportDirectiveElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetImportDirectiveElementType.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetImportDirectiveElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetImportDirectiveElementType.java index 7050352cba4..372fce2fe15 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetImportDirectiveElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetImportDirectiveElementType.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; @@ -22,9 +22,9 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetImportDirective; -import org.jetbrains.jet.lang.psi.stubs.KotlinImportDirectiveStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinImportDirectiveStubImpl; +import org.jetbrains.kotlin.psi.JetImportDirective; +import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinImportDirectiveStubImpl; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetModifierListElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetModifierListElementType.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetModifierListElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetModifierListElementType.java index 94063eabe88..9bf67beeafe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetModifierListElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetModifierListElementType.java @@ -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,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetModifierList; -import org.jetbrains.jet.lang.psi.stubs.KotlinModifierListStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl; +import org.jetbrains.kotlin.psi.JetModifierList; +import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl; import java.io.IOException; -import static org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils.computeMaskFromModifierList; +import static org.jetbrains.kotlin.psi.stubs.impl.ModifierMaskUtils.computeMaskFromModifierList; public class JetModifierListElementType extends JetStubElementType { public JetModifierListElementType(@NotNull @NonNls String debugName, @NotNull Class psiClass) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetNameReferenceExpressionElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetNameReferenceExpressionElementType.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetNameReferenceExpressionElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetNameReferenceExpressionElementType.java index ca18a2e59ad..b50f938232b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetNameReferenceExpressionElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetNameReferenceExpressionElementType.java @@ -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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; @@ -22,9 +22,9 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetNameReferenceExpression; -import org.jetbrains.jet.lang.psi.stubs.KotlinNameReferenceExpressionStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl; +import org.jetbrains.kotlin.psi.JetNameReferenceExpression; +import org.jetbrains.kotlin.psi.stubs.KotlinNameReferenceExpressionStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java index a7395c5b2a5..ba7610a3047 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.StubElement; @@ -23,12 +23,12 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClassObject; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.lang.psi.stubs.KotlinObjectStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinObjectStubImpl; -import org.jetbrains.jet.lang.psi.stubs.impl.Utils; +import org.jetbrains.kotlin.psi.JetClassObject; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl; +import org.jetbrains.kotlin.psi.stubs.impl.Utils; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java index 39614c6c8a9..587631723f5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; @@ -22,9 +22,9 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.stubs.KotlinParameterStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinParameterStubImpl; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.stubs.KotlinParameterStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinParameterStubImpl; import org.jetbrains.jet.lang.resolve.name.FqName; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPlaceHolderStubElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPlaceHolderStubElementType.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPlaceHolderStubElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPlaceHolderStubElementType.java index ca0dd86eef7..cfb805528c5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPlaceHolderStubElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPlaceHolderStubElementType.java @@ -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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetElementImplStub; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl; +import org.jetbrains.kotlin.psi.JetElementImplStub; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyAccessorElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyAccessorElementType.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyAccessorElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyAccessorElementType.java index f3ad9ddfe56..fe8ce87f79a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyAccessorElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyAccessorElementType.java @@ -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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetPropertyAccessor; -import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyAccessorStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPropertyAccessorStubImpl; +import org.jetbrains.kotlin.psi.JetPropertyAccessor; +import org.jetbrains.kotlin.psi.stubs.KotlinPropertyAccessorStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyAccessorStubImpl; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java index 81ce75842a0..9db68cd1331 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.StubElement; @@ -23,10 +23,10 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPropertyStubImpl; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java index fea9bfacc72..fd9d2e784e1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -27,10 +27,10 @@ import com.intellij.util.ArrayFactory; import com.intellij.util.ReflectionUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetElementImplStub; -import org.jetbrains.jet.lang.psi.JetFunction; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetElementImplStub; +import org.jetbrains.kotlin.psi.JetFunction; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.plugin.JetLanguage; import java.lang.reflect.Array; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java index d1bc4a02f21..62e56cbb64e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.tree.TokenSet; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import static org.jetbrains.jet.JetNodeTypes.SELF_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeConstraintElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeConstraintElementType.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeConstraintElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeConstraintElementType.java index b755cc6abd3..8b28ed1b6f1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeConstraintElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeConstraintElementType.java @@ -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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetTypeConstraint; -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeConstraintStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeConstraintStubImpl; +import org.jetbrains.kotlin.psi.JetTypeConstraint; +import org.jetbrains.kotlin.psi.stubs.KotlinTypeConstraintStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeConstraintStubImpl; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeParameterElementType.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeParameterElementType.java index c198b842e01..1b8f455e77f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeParameterElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; @@ -22,9 +22,9 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetTypeParameter; -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeParameterStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeParameterStubImpl; +import org.jetbrains.kotlin.psi.JetTypeParameter; +import org.jetbrains.kotlin.psi.stubs.KotlinTypeParameterStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeParameterStubImpl; import org.jetbrains.jet.lang.types.Variance; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeProjectionElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeProjectionElementType.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeProjectionElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeProjectionElementType.java index c8b1b6ae21d..45f44142199 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeProjectionElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeProjectionElementType.java @@ -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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetTypeProjection; -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeProjectionStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeProjectionStubImpl; +import org.jetbrains.kotlin.psi.JetTypeProjection; +import org.jetbrains.kotlin.psi.stubs.KotlinTypeProjectionStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeProjectionStubImpl; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetUserTypeElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetUserTypeElementType.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetUserTypeElementType.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetUserTypeElementType.java index 4229c0705b9..67ca75ceeda 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetUserTypeElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetUserTypeElementType.java @@ -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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetUserType; -import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub; -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinUserTypeStubImpl; +import org.jetbrains.kotlin.psi.JetUserType; +import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub; +import org.jetbrains.kotlin.psi.stubs.impl.KotlinUserTypeStubImpl; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/StubIndexService.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/StubIndexService.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.java index 8e3af3a8b79..0695313c1e0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/StubIndexService.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.stubs.IndexSink; -import org.jetbrains.jet.lang.psi.stubs.*; +import org.jetbrains.kotlin.psi.stubs.*; public interface StubIndexService { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/StubIndexServiceFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexServiceFactory.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/StubIndexServiceFactory.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexServiceFactory.java index d154b704af6..c6676571055 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/StubIndexServiceFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexServiceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.elements; +package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.openapi.components.ServiceManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt similarity index 79% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt index ec89ddc8e06..50d73dc3150 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinAnnotationEntryStubImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.jet.lang.psi.JetAnnotationEntry -import org.jetbrains.jet.lang.psi.stubs.KotlinAnnotationEntryStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.stubs.KotlinAnnotationEntryStub +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import com.intellij.psi.PsiElement public class KotlinAnnotationEntryStubImpl( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinClassStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinClassStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt index bc6c05b11a6..a3a2f053cd7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinClassStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.stubs.KotlinClassStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetClassElementType +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.stubs.KotlinClassStub +import org.jetbrains.kotlin.psi.stubs.elements.JetClassElementType import org.jetbrains.jet.lang.resolve.name.FqName import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinFileStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinFileStubImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.java index a9f64402183..c81fbe46eef 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinFileStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl; +package org.jetbrains.kotlin.psi.stubs.impl; import com.google.common.collect.Lists; import com.intellij.psi.PsiClass; @@ -25,9 +25,9 @@ import com.intellij.psi.stubs.StubElement; import com.intellij.psi.tree.IStubFileElementType; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.stubs.KotlinFileStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinFunctionStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinFunctionStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt index 02a724cffb3..1543b6ccef5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinFunctionStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.stubs.KotlinFunctionStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinImportDirectiveStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinImportDirectiveStubImpl.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinImportDirectiveStubImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinImportDirectiveStubImpl.java index 9fcf45da98e..3020e7b0600 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinImportDirectiveStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinImportDirectiveStubImpl.java @@ -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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl; +package org.jetbrains.kotlin.psi.stubs.impl; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetImportDirective; -import org.jetbrains.jet.lang.psi.stubs.KotlinImportDirectiveStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.JetImportDirective; +import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class KotlinImportDirectiveStubImpl extends KotlinStubBaseImpl implements KotlinImportDirectiveStub { private final boolean isAbsoluteInRootPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinModifierListStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinModifierListStubImpl.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinModifierListStubImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinModifierListStubImpl.java index 51d1805c4ab..e989e62e31c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinModifierListStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinModifierListStubImpl.java @@ -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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl; +package org.jetbrains.kotlin.psi.stubs.impl; import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetModifierList; -import org.jetbrains.jet.lang.psi.stubs.KotlinModifierListStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetModifierListElementType; +import org.jetbrains.kotlin.psi.JetModifierList; +import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetModifierListElementType; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; public class KotlinModifierListStubImpl extends KotlinStubBaseImpl implements KotlinModifierListStub { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinNameReferenceExpressionStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinNameReferenceExpressionStubImpl.java similarity index 82% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinNameReferenceExpressionStubImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinNameReferenceExpressionStubImpl.java index 6ce3e5841e7..3e693e57191 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinNameReferenceExpressionStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinNameReferenceExpressionStubImpl.java @@ -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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl; +package org.jetbrains.kotlin.psi.stubs.impl; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetNameReferenceExpression; -import org.jetbrains.jet.lang.psi.stubs.KotlinNameReferenceExpressionStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.JetNameReferenceExpression; +import org.jetbrains.kotlin.psi.stubs.KotlinNameReferenceExpressionStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class KotlinNameReferenceExpressionStubImpl extends KotlinStubBaseImpl implements KotlinNameReferenceExpressionStub { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinObjectStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinObjectStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt index a0d5abde1b3..a3238ab0f40 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinObjectStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.stubs.KotlinObjectStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinParameterStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt similarity index 84% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinParameterStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt index 59c54345b11..c26a286c23c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinParameterStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.stubs.KotlinParameterStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.stubs.KotlinParameterStub +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPlaceHolderStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPlaceHolderStubImpl.java similarity index 82% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPlaceHolderStubImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPlaceHolderStubImpl.java index 9b63993fd9b..cb71a292097 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPlaceHolderStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPlaceHolderStubImpl.java @@ -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.lang.psi.stubs.impl; +package org.jetbrains.kotlin.psi.stubs.impl; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; -import org.jetbrains.jet.lang.psi.JetElementImplStub; -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub; +import org.jetbrains.kotlin.psi.JetElementImplStub; +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; public class KotlinPlaceHolderStubImpl>> extends KotlinStubBaseImpl implements KotlinPlaceHolderStub { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPropertyAccessorStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyAccessorStubImpl.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPropertyAccessorStubImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyAccessorStubImpl.java index b48284e9f83..66b428fd5ea 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPropertyAccessorStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyAccessorStubImpl.java @@ -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.lang.psi.stubs.impl; +package org.jetbrains.kotlin.psi.stubs.impl; import com.intellij.psi.stubs.StubElement; -import org.jetbrains.jet.lang.psi.JetPropertyAccessor; -import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyAccessorStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.JetPropertyAccessor; +import org.jetbrains.kotlin.psi.stubs.KotlinPropertyAccessorStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class KotlinPropertyAccessorStubImpl extends KotlinStubBaseImpl implements KotlinPropertyAccessorStub { private final boolean isGetter; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPropertyStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPropertyStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt index 84f2f542dce..6d11bcc67fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPropertyStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinStubBaseImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinStubBaseImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt index a8e01f770b0..c126647fd95 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinStubBaseImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.stubs.IStubElementType import com.intellij.psi.stubs.NamedStub import com.intellij.psi.stubs.StubBase import com.intellij.psi.stubs.StubElement -import org.jetbrains.jet.lang.psi.JetElementImplStub -import org.jetbrains.jet.lang.psi.stubs.KotlinClassOrObjectStub -import org.jetbrains.jet.lang.psi.stubs.KotlinStubWithFqName +import org.jetbrains.kotlin.psi.JetElementImplStub +import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub +import org.jetbrains.kotlin.psi.stubs.KotlinStubWithFqName import java.lang.reflect.Method import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeConstraintStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeConstraintStubImpl.kt similarity index 78% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeConstraintStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeConstraintStubImpl.kt index 79229b15ca5..39e1126fab2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeConstraintStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeConstraintStubImpl.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.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement -import org.jetbrains.jet.lang.psi.JetTypeConstraint -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeConstraintStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetTypeConstraint +import org.jetbrains.kotlin.psi.stubs.KotlinTypeConstraintStub +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import com.intellij.psi.PsiElement public class KotlinTypeConstraintStubImpl( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeParameterStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeParameterStubImpl.kt similarity index 82% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeParameterStubImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeParameterStubImpl.kt index ae3fbe8167d..f36ba60b36a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeParameterStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeParameterStubImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.jet.lang.psi.JetTypeParameter -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeParameterStub -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.stubs.KotlinTypeParameterStub +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import com.intellij.psi.PsiElement public class KotlinTypeParameterStubImpl( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeProjectionStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeProjectionStubImpl.java similarity index 75% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeProjectionStubImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeProjectionStubImpl.java index 10e33b93566..1f8ce9c7453 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinTypeProjectionStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinTypeProjectionStubImpl.java @@ -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,13 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl; +package org.jetbrains.kotlin.psi.stubs.impl; import com.intellij.psi.stubs.StubElement; -import org.jetbrains.jet.lang.psi.JetProjectionKind; -import org.jetbrains.jet.lang.psi.JetTypeProjection; -import org.jetbrains.jet.lang.psi.stubs.KotlinTypeProjectionStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.psi.JetProjectionKind; +import org.jetbrains.kotlin.psi.JetTypeProjection; +import org.jetbrains.kotlin.psi.stubs.KotlinTypeProjectionStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; public class KotlinTypeProjectionStubImpl extends KotlinStubBaseImpl implements KotlinTypeProjectionStub { @@ -31,6 +32,7 @@ public class KotlinTypeProjectionStubImpl extends KotlinStubBaseImpl Boolean): Int { var mask = 0 - for ((index, modifierKeywordToken) in MODIFIER_KEYWORDS_ARRAY.withIndices()) { + for ((index, modifierKeywordToken) in MODIFIER_KEYWORDS_ARRAY.withIndex()) { if (hasModifier(modifierKeywordToken)) { mask = mask or (1 shl index) } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/Utils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/Utils.kt similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/Utils.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/Utils.kt index da7228d02a8..b17698dd930 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/Utils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/Utils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi.stubs.impl +package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.util.io.StringRef diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/userDataUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.kt similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/userDataUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.kt index 1b50a645bcd..2c52d06db57 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/userDataUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import kotlin.properties.ReadWriteProperty import com.intellij.openapi.util.Key @@ -38,4 +38,4 @@ public class NotNullableUserDataProperty(val key: override fun set(thisRef: R, desc: kotlin.PropertyMetadata, value: T) { thisRef.putUserData(key, value) } -} \ No newline at end of file +} diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java index a83ea0e4513..533847960ae 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java @@ -27,7 +27,7 @@ import com.intellij.psi.impl.java.stubs.*; import com.intellij.psi.stubs.StubBase; import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetDeclaration; class ClsWrapperStubPsiFactory extends StubPsiFactory { public static final Key ORIGIN_ELEMENT = Key.create("ORIGIN_ELEMENT"); diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java index ca3e1a3ded5..a573ef75c39 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java @@ -24,8 +24,8 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.impl.light.AbstractLightClass; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java index 05c0f45905d..441161ee306 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java @@ -32,9 +32,9 @@ import com.intellij.util.SmartList; import com.intellij.util.containers.SLRUCache; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetEnumEntry; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetEnumEntry; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.KotlinFinderMarker; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt index 4dd6b53b197..e84cefac0af 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt @@ -23,7 +23,7 @@ import com.intellij.psi.impl.PsiTreeChangeEventImpl.PsiEventType.* import com.intellij.psi.impl.PsiTreeChangeEventImpl import com.intellij.psi.impl.PsiTreeChangePreprocessor import com.intellij.psi.util.PsiModificationTracker -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import com.intellij.psi.util.PsiTreeUtil /** diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index 42c65c9434b..c226462ce82 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -48,10 +48,10 @@ import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPsiUtil; -import org.jetbrains.jet.lang.psi.JetScript; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt index c8d2f437d78..6e353791e94 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiClass; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject public trait KotlinLightClass : PsiClass, KotlinLightElement { val fqName: FqName diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java index f4cb1380b45..fa2b3f83ea8 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.JetType; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt index 3651d0d0f70..4300326f210 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiManager import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.psi.JetEnumEntry +import org.jetbrains.kotlin.psi.JetEnumEntry import com.intellij.psi.PsiEnumConstantInitializer import com.intellij.psi.PsiEnumConstant diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java index f366df95288..a80fe03bfe0 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -45,7 +45,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java index 2854c867299..87fdae293f6 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java @@ -34,8 +34,8 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt index 3675e8c524d..047582f4643 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.asJava -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.psi.PsiElement public trait KotlinLightElement { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt index 0f1d29ba664..917c484db07 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.* -import org.jetbrains.jet.lang.psi.JetEnumEntry +import org.jetbrains.kotlin.psi.JetEnumEntry class KotlinLightEnumConstant( manager: PsiManager, diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java index 9168fea0b64..3a5d95b924e 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java @@ -27,7 +27,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.jet.plugin.JetLanguage; // Copied from com.intellij.psi.impl.light.LightField diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt index caa58eb9a78..4637f1a7f89 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.* -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration class KotlinLightFieldForDeclaration( manager: PsiManager, diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt index 0ae6bc491af..eb4a67782a7 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt @@ -17,6 +17,6 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiMethod -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration public trait KotlinLightMethod: PsiMethod, KotlinLightElement diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt index 1015b3b228e..f7f611becca 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt @@ -18,14 +18,14 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.impl.light.LightMethod import com.intellij.psi.* -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.plugin.JetLanguage import kotlin.properties.Delegates import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.PsiModificationTracker import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.CachedValue -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.psi.search.SearchScope import com.intellij.lang.Language import com.intellij.psi.scope.PsiScopeProcessor diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt index 6516c2701dc..87f873833a3 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiManager import com.intellij.psi.PsiMethod -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java index 7d7d9566dbc..f410445ceff 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java @@ -23,8 +23,8 @@ import com.intellij.psi.PsiParameter; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.plugin.JetLanguage; import java.util.List; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java index ddf66ab4d40..db63bce7f1f 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java @@ -21,8 +21,8 @@ import com.intellij.psi.*; import com.intellij.psi.impl.light.AbstractLightClass; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetTypeParameter; -import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner; +import org.jetbrains.kotlin.psi.JetTypeParameter; +import org.jetbrains.kotlin.psi.JetTypeParameterListOwner; import org.jetbrains.jet.plugin.JetLanguage; public class KotlinLightTypeParameter diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java index a46dccb24da..dcad360b8cd 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java @@ -33,7 +33,7 @@ import com.intellij.util.containers.ContainerUtil; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java index 2fc9008b4be..6235e8a8d9f 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java @@ -22,8 +22,8 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt index d45d6952b05..4ed19bc240b 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.impl.java.stubs.PsiJavaFileStub import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics import org.jetbrains.jet.lang.resolve.name.FqName diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java index a173acbea59..8b17df21979 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java @@ -37,7 +37,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java index 52d0a0b2aad..07f7a9d5aeb 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java @@ -25,7 +25,7 @@ import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AbstractClassBuilder; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt index bafd964becf..22686696112 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -18,19 +18,19 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetClassBody -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.psi.JetPropertyAccessor +import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.* import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind.* import org.jetbrains.jet.lang.diagnostics.Errors.* import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory.* -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics, moduleScope: GlobalSearchScope): Diagnostics? { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt index 42778dd0e03..81c21753f42 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import java.util.Collections -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import java.util.ArrayList -import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration +import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList public fun JetClassOrObject.toLightClass(): KotlinLightClass? = LightClassUtil.getPsiClass(this) as KotlinLightClass? diff --git a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java index 24fe974abf3..b8d12bccbe0 100644 --- a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java +++ b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java @@ -24,7 +24,7 @@ import com.intellij.testFramework.LightVirtualFile; import com.intellij.testFramework.TestDataFile; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.junit.Assert; diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index ca5d56da214..dbe766a1276 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -57,7 +57,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ImportPath; @@ -92,7 +92,7 @@ import java.util.regex.Pattern; import static org.jetbrains.jet.ConfigurationKind.ALL; import static org.jetbrains.jet.ConfigurationKind.JDK_AND_ANNOTATIONS; import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalysisResult; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.ANNOTATIONS_PATH_KEY; import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index c76c1edbeda..3a5e50cef6f 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -34,10 +34,10 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.diagnostics.*; -import org.jetbrains.jet.lang.psi.Call; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index c3cee5e4d8d..598f28988c1 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java index 34433906a12..e5ea494ee8e 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java @@ -34,8 +34,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.*; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.types.Flexibility; diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java index a35d69c06a6..11b9becb78e 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.checkers.CheckerTestUtil.DiagnosedRange; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt index 51f2a969eb1..3d7e1f3039b 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt @@ -37,7 +37,7 @@ import java.util.regex.Pattern import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTaskHolder import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext -import org.jetbrains.jet.lang.psi.debugText.getDebugText +import org.jetbrains.kotlin.psi.debugText.getDebugText import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate import java.lang.reflect.GenericDeclaration import java.lang.reflect.Method diff --git a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt index a7eaac8c61f..291c1f72b85 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.constants.StringValue import org.jetbrains.jet.lang.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant import java.util.HashMap -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import org.jetbrains.jet.lang.types.TypeUtils diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index 16eea2b2bb2..ea9e13efdcb 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.InlineTestUtil; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.test.TestCaseWithTmpdir; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 5e2ed13a092..e13c0bd664d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java index 897a0abd1c7..737bdfb028d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.codegen.GenerationUtils; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index f753672ab72..17e5f33bf07 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 363156d1980..7438fe2afbb 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.JetTestUtils import com.intellij.testFramework.UsefulTestCase import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import java.io.File import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.resolve.name.Name diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java index ba84b67538d..9855930b5e9 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.kotlin.psi; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.util.PsiTreeUtil; @@ -33,7 +33,7 @@ import java.util.Collection; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetPsiUtilTest extends JetLiteFixture { public void testUnquotedIdentifier() { diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt b/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt index 3b80653da42..d8133ef5490 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi +package org.jetbrains.kotlin.psi import org.junit.Assert import org.jetbrains.jet.JetLiteFixture import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression +import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles public class JetSimpleNameExpressionTest() : JetLiteFixture() { diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java index 669e6a52c34..be94485ce2a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index 2a868eb06f4..24fba28522a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt index ac6831d5387..394faea25ae 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.lang.resolve.java.JvmAnalyzerFacade diff --git a/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java index a1ada752f5e..241c9606932 100644 --- a/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java +++ b/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java @@ -27,16 +27,16 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.lang.parsing.JetParserDefinition; -import org.jetbrains.jet.lang.psi.IfNotParsed; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetPsiFactory; -import org.jetbrains.jet.lang.psi.JetVisitorVoid; +import org.jetbrains.kotlin.psi.IfNotParsed; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetVisitorVoid; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class AbstractJetParsingTest extends ParsingTestCase { static { diff --git a/compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java index f0ae4913da6..b3327cec43a 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.resolve; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; public abstract class AbstractResolveTest extends ExtensibleResolveTestCase { diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index f056d7a9fc9..4fcb89605d0 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java index 274a23d7909..e4e646e5ee2 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt index a68107a4159..7263b1ab172 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import org.junit.Assert import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment import org.jetbrains.jet.config.CompilerConfiguration diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 9b633e8cf28..744f12af9a4 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -28,8 +28,8 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetAnnotationEntry; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetAnnotationEntry; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt index b3512511f52..5c2a2909467 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.resolve.annotation import org.jetbrains.jet.analyzer.AnalysisResult -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.JetTestUtils class AnnotationDescriptorResolveWithoutAnalyzeBodyTest : AnnotationDescriptorResolveTest() { @@ -27,4 +27,4 @@ class AnnotationDescriptorResolveWithoutAnalyzeBodyTest : AnnotationDescriptorRe } override fun analyzeFile(ktFile: JetFile): AnalysisResult = JetTestUtils.analyzeFileWithoutBody(ktFile) -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index 0edfc6a19f4..857d0afb675 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -30,16 +30,16 @@ import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMapping import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jet.lang.psi.ValueArgument -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.ValueArgument +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.jet.lang.resolve.calls.callUtil.getParentResolvedCall import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public abstract class AbstractResolvedCallsTest() : JetLiteFixture() { override fun createEnvironment(): JetCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.ALL) diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt index f9dcbc4304b..1940ae58ee5 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.resolve.constraintSystem import org.jetbrains.jet.JetTestUtils import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.types.JetType diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index fd6790e294c..3ed82be6e53 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.types.Variance.* import org.jetbrains.jet.lang.types.typesApproximation.approximateCapturedTypes import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.resolve.calls.inference.createCapturedType import org.jetbrains.jet.lang.diagnostics.Severity import org.jetbrains.jet.lang.types.typesApproximation.approximateCapturedTypesIfNecessary diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java index 1d7dd7035cc..fccffee7b15 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt index e6b4b32e438..a47c8a27a45 100644 --- a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt @@ -27,12 +27,12 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil -import org.jetbrains.jet.lang.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.utils.Printer import org.jetbrains.jet.test.util.trimIndent -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.JetTestUtils.* -import org.jetbrains.jet.lang.psi.JetVariableDeclaration +import org.jetbrains.kotlin.psi.JetVariableDeclaration abstract class AbstractJetTypeBindingTest : JetLiteFixture() { override fun createEnvironment() = createEnvironmentWithMockJdk(ConfigurationKind.ALL) diff --git a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java index d5a46007ea2..724498f4e5e 100644 --- a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java @@ -20,7 +20,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.util.Collection; import java.util.Collections; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class BoundsSubstitutorTest extends KotlinTestWithEnvironment { @Override diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 633ce08a967..15a4ec80acc 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.di.InjectorForTests; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetDefaultModalityModifiersTest extends JetLiteFixture { private final JetDefaultModalityModifiersTestCase tc = new JetDefaultModalityModifiersTestCase(); diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index 65ac7cd1014..acb7d993bcd 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverloadUtil; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetOverloadTest extends JetLiteFixture { diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index edc2c211545..a89425ba616 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetOverridingTest extends JetLiteFixture { diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index b43b68909b9..e3304e27ebf 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ReceiverParameterDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.TypeResolver; @@ -53,7 +53,7 @@ import java.io.File; import java.io.IOException; import java.util.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetTypeCheckerTest extends JetLiteFixture { diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index fb9c2eafa7b..d366a5c1a6b 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; @@ -52,7 +52,7 @@ import java.io.IOException; import java.util.Collections; import java.util.Map; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @SuppressWarnings("unchecked") public class TypeSubstitutorTest extends KotlinTestWithEnvironment { diff --git a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java index 9bcf91bb2d1..be7757027f5 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java @@ -27,8 +27,8 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetTypeProjection; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetTypeProjection; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.di.InjectorForTests; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class TypeUnifierTest extends JetLiteFixture { private Set variables; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt index 1e990343b4f..d36889ae9d5 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.cfg import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import org.jetbrains.jet.lang.resolve.BindingContext import java.util.* import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java index aa4723c974c..882ddd19c86 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java index 087f15820e0..c4d3c08e372 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java @@ -27,9 +27,12 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind; import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*; -import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction; +import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineEnterInstruction; +import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction; +import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import java.io.File; import java.io.FileNotFoundException; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java index d3be8313a95..00e393775c8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java @@ -24,7 +24,7 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index e21c1ecaff6..12a7a3a2b5e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.test.TestCaseWithTmpdir; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 82d346ded6d..6071c2d3d2e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.checkers.CheckerTestUtil; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java index 7d99072678f..7ad56a74f68 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java index 5dd97ef4530..8e0adb24a50 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java @@ -31,9 +31,9 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.types.JetType; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java index b5e3ad9ce6a..e3c4fe80607 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java @@ -21,7 +21,7 @@ import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index 9a1f7355a48..11130fa6724 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.CodegenTestCase; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.InlineTestUtil; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index a856e32a0e9..98b0076269a 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -17,8 +17,7 @@ package org.jetbrains.kotlin.renderer import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.psi.JetVisitorVoid -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.descriptors.ClassDescriptor import com.intellij.openapi.editor.impl.DocumentImpl import org.jetbrains.jet.JetTestUtils @@ -28,27 +27,16 @@ import org.jetbrains.jet.ConfigurationKind import com.intellij.testFramework.UsefulTestCase import java.io.File import org.jetbrains.jet.lang.resolve.lazy.ResolveSession -import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM import org.jetbrains.jet.context.GlobalContext import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetClassObject -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetFunctionType -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetClass import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.psi.JetProperty import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.psi.JetClassInitializer import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jet.lang.psi.JetPsiFactory import org.jetbrains.jet.lang.types.DynamicTypesSettings public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment() { diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index c2e2515c694..7ed1cba6a2e 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java index 3a76254ec6c..8d812a14aad 100644 --- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java +++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.cfg.JetFlowInformationProvider; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt index c20cf6ef196..3c854040f4d 100644 --- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt +++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.lazy import java.util.HashSet -import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.siblings import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.utils.addIfNotNull import java.util.ArrayList @@ -26,9 +26,9 @@ import java.util.HashMap import com.intellij.psi.PsiElement import org.jetbrains.jet.JetNodeTypes import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider -import org.jetbrains.jet.lang.psi.psiUtil.isProbablyNothing +import org.jetbrains.kotlin.psi.psiUtil.isProbablyNothing //TODO: do resolve anonymous object's body diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt index 77f06b753e9..8d9139f2e74 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.codeInsight import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.lang.psi.psiUtil.* +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java index 0a4fb563392..47a5380c1ae 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; import javax.swing.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java index 806b6f4622d..ef2ea597441 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java @@ -28,7 +28,7 @@ import com.intellij.util.PlatformIcons; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index 07403bee09e..a66734b4cce 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt index 980770fa699..11a342da9f9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.plugin.caches.resolve -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.project.Project import org.jetbrains.jet.analyzer.AnalysisResult import com.intellij.openapi.diagnostic.Logger @@ -31,12 +31,12 @@ import org.jetbrains.jet.plugin.project.TargetPlatform import org.jetbrains.jet.plugin.project.TargetPlatform.* import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import org.jetbrains.jet.plugin.project.TargetPlatformDetector -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.utils.keysToMap import com.intellij.openapi.roots.ProjectRootModificationTracker import org.jetbrains.jet.plugin.util.ProjectRootsUtil import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt index d5a55ac78c3..6f4056dbb7e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.kotlin.asJava.KotlinWrappingLightClass import com.intellij.psi.PsiClass import com.intellij.psi.impl.compiled.ClsClassImpl -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject class KotlinLightClassForDecompiledDeclaration( private val clsClass: ClsClassImpl, diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index dfc25124533..73052b68e5d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.plugin.caches.resolve -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.project.Project import org.jetbrains.jet.analyzer.AnalysisResult @@ -38,23 +38,23 @@ import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import java.util.HashMap import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetClassInitializer -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetImportDirective -import org.jetbrains.jet.lang.psi.JetAnnotationEntry -import org.jetbrains.jet.lang.psi.JetTypeConstraint -import org.jetbrains.jet.lang.psi.JetPackageDirective -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetClassInitializer +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetImportDirective +import org.jetbrains.kotlin.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.JetTypeConstraint +import org.jetbrains.kotlin.psi.JetPackageDirective +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.CompositeBindingContext -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetDelegationSpecifierList -import org.jetbrains.jet.lang.psi.JetTypeParameter -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.lang.psi.JetCallableDeclaration -import org.jetbrains.jet.lang.psi.JetCodeFragment -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetDelegationSpecifierList +import org.jetbrains.kotlin.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.analyzer.analyzeInContext import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.jet.lang.types.TypeUtils @@ -67,7 +67,7 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode import com.intellij.openapi.project.IndexNotReadyException -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetBlockExpression public trait CacheExtension { public val platform: TargetPlatform diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt index 0b68e84e2ea..91ebb4f943c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl import com.intellij.openapi.roots.JdkOrderEntry import org.jetbrains.jet.analyzer.AnalyzerFacade import org.jetbrains.jet.analyzer.ResolverForModule -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.storage.ExceptionTracker import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.analyzer.ResolverForProject diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt index d8c01ac7027..7db041ca368 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.plugin.caches.resolve -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.analyzer.AnalysisResult import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt index 1792f30611c..06fe4abd903 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.caches.resolve import com.intellij.psi.PsiElement import org.jetbrains.kotlin.asJava.KotlinLightElement -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import com.intellij.openapi.roots.ProjectFileIndex import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.JdkOrderEntry diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt index 62c3f5ccfdb..050ca8c59e5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.plugin.caches.resolve -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.analyzer.AnalysisResult import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.ModuleDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt index 1f136d5beb0..4e2b9846853 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.codeInsight import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.decompiler.navigation.DecompiledNavigationUtils import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt index 9fbad6e17c7..db175b8d91c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt @@ -16,18 +16,18 @@ package org.jetbrains.jet.plugin.codeInsight -import org.jetbrains.jet.lang.psi.JetReferenceExpression -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid -import org.jetbrains.jet.lang.psi.JetUserType -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid +import org.jetbrains.kotlin.psi.JetUserType +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import java.util.Collections import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade -import org.jetbrains.jet.lang.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetQualifiedExpression import java.util.LinkedHashMap object JetFileReferencesResolver { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index 4b230ae29d1..9130df8e0f9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.codeInsight import com.intellij.psi.PsiElement; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.kotlin.renderer.DescriptorRenderer; @@ -33,10 +33,10 @@ import org.jetbrains.jet.analyzer.analyzeInContext import org.jetbrains.jet.lang.resolve.calls.callUtil.getCalleeExpressionIfAny import java.util.LinkedHashSet import org.jetbrains.jet.lang.resolve.ImportPath -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElement +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public object ShortenReferences { public fun process(element: JetElement) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/shorten/shortenWaitingSet.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/shorten/shortenWaitingSet.kt index 3a6d9ca195a..25f00b5c7bb 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/shorten/shortenWaitingSet.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/shorten/shortenWaitingSet.kt @@ -18,10 +18,10 @@ package org.jetbrains.jet.plugin.codeInsight.shorten import com.intellij.openapi.project.Project import com.intellij.psi.SmartPsiElementPointer -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.UserDataProperty +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.UserDataProperty import com.intellij.openapi.util.Key -import org.jetbrains.jet.lang.psi.NotNullableUserDataProperty +import org.jetbrains.kotlin.psi.NotNullableUserDataProperty import java.util.HashSet import com.intellij.openapi.application.ApplicationManager import com.intellij.psi.SmartPointerManager diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt index 0e827f56336..b317197e2e8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt @@ -21,12 +21,12 @@ import com.intellij.psi.impl.compiled.ClsFileImpl import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.annotations.TestOnly import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.decompiler.textBuilder.buildDecompiledText import org.jetbrains.jet.plugin.decompiler.textBuilder.descriptorToKey import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile public class JetClsFile(val provider: JetClassFileViewProvider) : JetFile(provider, true) { private val decompiledText = LockedClearableLazyValue(Any()) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java index d69d50e6173..1e1ee2c95ab 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java @@ -24,7 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java index e63f5677685..bd2a9310d18 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java @@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt index 198ed6da579..f8523d218e3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.plugin.decompiler.navigation -import org.jetbrains.jet.lang.psi.KotlinDeclarationNavigationPolicy -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.KotlinDeclarationNavigationPolicy +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.openapi.project.DumbService public class KotlinDeclarationNavigationPolicyImpl : KotlinDeclarationNavigationPolicy { @@ -31,4 +31,4 @@ public class KotlinDeclarationNavigationPolicyImpl : KotlinDeclarationNavigation } return null } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java index 7d1791c9387..3779162d184 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt index e569cbbbf82..392f30a49f3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt @@ -21,8 +21,8 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf.Modality -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFunctionStubImpl -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPropertyStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt index bf29703d67e..520f8b9ca8e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -19,22 +19,22 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.psi.stubs.elements.JetClassElementType -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinClassStubImpl -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinObjectStubImpl +import org.jetbrains.kotlin.psi.stubs.elements.JetClassElementType +import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetClassBody -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes -import org.jetbrains.jet.lang.psi.JetParameterList +import org.jetbrains.kotlin.psi.JetClassBody +import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.JetParameterList import org.jetbrains.jet.lang.resolve.name.ClassId -import org.jetbrains.jet.lang.psi.JetDelegationSpecifierList -import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass +import org.jetbrains.kotlin.psi.JetDelegationSpecifierList +import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName -import org.jetbrains.jet.lang.psi.JetClassObject +import org.jetbrains.kotlin.psi.JetClassObject import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.serialization.ProtoBuf.Type import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.* diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt index 06be9ff5f44..332535c420f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt @@ -25,7 +25,7 @@ import com.intellij.psi.impl.compiled.ClassFileStubBuilder import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassFinder import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassDataFinder import com.intellij.openapi.diagnostic.Logger diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt index 1545e1d8b22..e052b36a5f1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt @@ -20,38 +20,38 @@ import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetParameterList -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinParameterStubImpl +import org.jetbrains.kotlin.psi.JetParameterList +import org.jetbrains.kotlin.psi.stubs.impl.KotlinParameterStubImpl import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.psi.JetNullableType +import org.jetbrains.kotlin.psi.JetNullableType import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.JetTypeArgumentList -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeProjectionStubImpl -import org.jetbrains.jet.lang.psi.JetFunctionType -import org.jetbrains.jet.lang.psi.JetFunctionTypeReceiver +import org.jetbrains.kotlin.psi.JetTypeArgumentList +import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeProjectionStubImpl +import org.jetbrains.kotlin.psi.JetFunctionType +import org.jetbrains.kotlin.psi.JetFunctionTypeReceiver import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList -import org.jetbrains.jet.lang.psi.JetTypeParameterList +import org.jetbrains.kotlin.psi.JetTypeParameterList import org.jetbrains.kotlin.serialization.ProtoBuf.Type -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeParameterStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeParameterStubImpl import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance -import org.jetbrains.jet.lang.psi.JetTypeConstraintList -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeConstraintStubImpl +import org.jetbrains.kotlin.psi.JetTypeConstraintList +import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeConstraintStubImpl import org.jetbrains.jet.lang.resolve.name.ClassId import java.util.ArrayList import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl -import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils +import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.ModifierMaskUtils import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer -import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub +import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection -import org.jetbrains.jet.lang.psi.JetProjectionKind +import org.jetbrains.kotlin.psi.JetProjectionKind class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt index 9860aa214ae..234df1d4faa 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt @@ -17,29 +17,29 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFileStubImpl -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl -import org.jetbrains.jet.lang.psi.JetPackageDirective -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl +import org.jetbrains.kotlin.psi.JetPackageDirective +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import com.intellij.psi.stubs.StubElement import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.lang.resolve.name.ClassId -import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub +import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub import org.jetbrains.jet.lang.resolve.name.SpecialNames -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinUserTypeStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.KotlinUserTypeStubImpl import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl -import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils +import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl +import org.jetbrains.kotlin.psi.stubs.impl.ModifierMaskUtils import org.jetbrains.kotlin.serialization.ProtoBuf import com.intellij.util.io.StringRef import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer -import org.jetbrains.jet.lang.psi.stubs.impl.KotlinAnnotationEntryStubImpl -import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationEntryStubImpl +import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt index 11a9fb6e92c..f91beb218d4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt @@ -20,7 +20,7 @@ import com.intellij.lang.cacheBuilder.WordsScanner import com.intellij.lang.findUsages.FindUsagesProvider import com.intellij.psi.PsiElement import com.intellij.psi.PsiNamedElement -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* public class JetFindUsagesProvider : FindUsagesProvider { public override fun canFindUsagesFor(psiElement: PsiElement): Boolean = diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt index 82691e07c35..b82f690a5ac 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt @@ -17,42 +17,42 @@ package org.jetbrains.jet.plugin.findUsages import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetForExpression -import org.jetbrains.jet.lang.psi.JetMultiDeclaration -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetReferenceExpression -import org.jetbrains.jet.lang.psi.JetImportDirective -import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetTypeParameter -import org.jetbrains.jet.lang.psi.JetTypeConstraint -import org.jetbrains.jet.lang.psi.JetDelegationSpecifier -import org.jetbrains.jet.lang.psi.JetTypedef -import org.jetbrains.jet.lang.psi.JetTypeProjection -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetIsExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS +import org.jetbrains.kotlin.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetMultiDeclaration +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.JetImportDirective +import org.jetbrains.kotlin.psi.JetCallableReferenceExpression +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.JetTypeConstraint +import org.jetbrains.kotlin.psi.JetDelegationSpecifier +import org.jetbrains.kotlin.psi.JetTypedef +import org.jetbrains.kotlin.psi.JetTypeProjection +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetIsExpression +import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression -import org.jetbrains.jet.lang.psi.JetSuperExpression -import org.jetbrains.jet.lang.psi.JetDelegatorByExpressionSpecifier -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypesAndPredicate -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetSuperExpression +import org.jetbrains.kotlin.psi.JetDelegatorByExpressionSpecifier +import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.references.JetArrayAccessReference import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.references.JetInvokeFunctionReference import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor -import org.jetbrains.jet.lang.psi.JetAnnotationEntry -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetUnaryExpression -import org.jetbrains.jet.lang.psi.JetWhenConditionInRange -import org.jetbrains.jet.lang.psi.JetPackageDirective -import org.jetbrains.jet.lang.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetUnaryExpression +import org.jetbrains.kotlin.psi.JetWhenConditionInRange +import org.jetbrains.kotlin.psi.JetPackageDirective +import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.ClassKind @@ -61,7 +61,7 @@ import com.intellij.psi.PsiPackage import org.jetbrains.jet.lang.descriptors.VariableDescriptor import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.* import org.jetbrains.jet.plugin.caches.resolve.analyze -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypeAndBranch +import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch public object UsageTypeUtils { public fun getUsageType(element: PsiElement?): UsageTypeEnum? { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index 910836f6c44..ee169e26200 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -22,9 +22,9 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.checkers.DebugInfoUtil; -import org.jetbrains.jet.lang.psi.JetCodeFragment; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetCodeFragment; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java index 6e357b7ddb6..b820eb038b0 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java index 6604953b576..ae1d4c0f629 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java @@ -22,9 +22,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.TargetPlatform; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java index 9f3774b5bfa..3903826a967 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java @@ -20,7 +20,7 @@ import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java index 8228961eafc..69649f9318a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; -import org.jetbrains.jet.lang.psi.JetVisitorVoid; +import org.jetbrains.kotlin.psi.JetVisitorVoid; abstract class HighlightingVisitor extends JetVisitorVoid { protected AnnotationHolder holder; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt index c794518b6f9..ccb04778491 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt @@ -38,9 +38,9 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.diagnostics.Severity import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages -import org.jetbrains.jet.lang.psi.JetCodeFragment -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics import org.jetbrains.jet.plugin.util.ProjectRootsUtil @@ -49,7 +49,7 @@ import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory import org.jetbrains.jet.plugin.quickfix.QuickFixes import kotlin.platform.platformStatic -import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS +import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS public open class JetPsiChecker : Annotator, HighlightRangeExtension { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt index ca5d4e01df4..11b9f29413b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt @@ -22,10 +22,10 @@ import com.intellij.codeInspection.SuppressIntentionAction import org.jetbrains.jet.lang.diagnostics.Severity import java.util.Collections import org.jetbrains.jet.plugin.quickfix.KotlinSuppressIntentionAction -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.quickfix.AnnotationHostKind import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType class KotlinSuppressableWarningProblemGroup( private val diagnosticFactory: DiagnosticFactory<*> diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java index 7a3d1e4d5db..73f69d41962 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetExpressionWithLabel; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetExpressionWithLabel; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; class LabelsHighlightingVisitor extends HighlightingVisitor { LabelsHighlightingVisitor(AnnotationHolder holder) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java index 8e87129f443..45bf6a718b1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java @@ -22,10 +22,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.psi.JetThisExpression; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetThisExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java index 59a96d7c615..af950e51690 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java @@ -24,8 +24,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFunctionLiteral; -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression; +import org.jetbrains.kotlin.psi.JetFunctionLiteral; +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; import org.jetbrains.kotlin.lexer.JetTokens; class SoftKeywordsHighlightingVisitor extends HighlightingVisitor { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java index 38045bab9dc..3e8785931e8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java index cb17ca2601d..5251577eed2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; import org.jetbrains.jet.lang.types.JetType; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt index 60860553479..9cd2b1e1941 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.inspections import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import com.intellij.psi.PsiElementVisitor import com.intellij.codeInspection.LocalInspectionToolSession import com.intellij.codeInspection.ProblemsHolder @@ -77,4 +77,4 @@ private fun PsiElement.getOrCreateEditor(): Editor? { val editors = editorFactory.getEditors(document) return if (editors.isEmpty()) editorFactory.createEditor(document) else editors[0] -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt index 3bd1e3a6d0b..580ec6b18cf 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt @@ -17,6 +17,6 @@ package org.jetbrains.jet.plugin.inspections import org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments -import org.jetbrains.jet.lang.psi.JetTypeArgumentList +import org.jetbrains.kotlin.psi.JetTypeArgumentList public class RemoveExplicitTypeArgsInspection : IntentionBasedInspection(RemoveExplicitTypeArguments()) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt index ffe53d508e0..e9bf146784c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt @@ -17,6 +17,6 @@ package org.jetbrains.jet.plugin.inspections import org.jetbrains.jet.plugin.intentions.SimplifyNegatedBinaryExpressionIntention -import org.jetbrains.jet.lang.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetPrefixExpression -public class SimplifyBinaryNegationInspection : IntentionBasedInspection(SimplifyNegatedBinaryExpressionIntention()) \ No newline at end of file +public class SimplifyBinaryNegationInspection : IntentionBasedInspection(SimplifyNegatedBinaryExpressionIntention()) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt index 96dacc53dab..ec1e0abdeaa 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt @@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiFile -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypesAndPredicate +import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate import com.intellij.codeInsight.intention.IntentionAction public abstract class JetSelfTargetingIntention(protected val key: String, val elementType: Class) : IntentionAction { @@ -58,4 +58,4 @@ public abstract class JetSelfTargetingIntention(protected val key override fun startInWriteAction(): Boolean = true override fun toString(): String = getText() -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt index c69b5a43141..7b344344351 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt @@ -16,17 +16,17 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPrefixExpression -import org.jetbrains.jet.lang.psi.JetPostfixExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetPostfixExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetArrayAccessExpression +import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt index 14bce46e49b..6aff322929d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt @@ -17,21 +17,21 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall import org.jetbrains.jet.lang.types.TypeUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.psi.JetTypeProjection -import org.jetbrains.jet.lang.psi.Call +import org.jetbrains.kotlin.psi.JetTypeProjection +import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.di.InjectorForMacros import org.jetbrains.jet.lang.resolve.BindingTraceContext -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetTypeArgumentList -import org.jetbrains.jet.lang.psi.JetReturnExpression -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetTypeArgumentList +import org.jetbrains.kotlin.psi.JetReturnExpression +import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.psi.psiUtil.getTextWithLocation +import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.plugin.util.approximateFlexibleTypes import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt index 070c92e837d..d9195a3f8d4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt @@ -16,19 +16,19 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetPrefixExpression -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.lexer.JetSingleValueToken -import org.jetbrains.jet.lang.psi.JetOperationExpression -import org.jetbrains.jet.lang.psi.JetIsExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetOperationExpression +import org.jetbrains.kotlin.psi.JetIsExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiElement public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention("simplify.negated.binary.expression", javaClass()) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java index 337bae52c9c..314a26ee9cf 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java @@ -35,7 +35,7 @@ import com.intellij.psi.util.CachedValuesManager; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.framework.JsLibraryStdDetectionUtil; import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index 17187a03443..1d5d65d4e47 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -24,8 +24,8 @@ import com.intellij.psi.util.PsiModificationTracker; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java index 2c4a7327c8d..78a1c54688a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java index 0968fe8c25f..ba4882ef104 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java @@ -21,7 +21,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; public class TargetPlatformDetector { public static final TargetPlatformDetector INSTANCE = new TargetPlatformDetector(); diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index c75c0b38bd3..520c57facdd 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.openapi.components.ServiceManager; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetImportDirective; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetImportDirective; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt index 59db81e5096..25ce9bed55c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetCodeFragment import java.util.Collections // TODO: Replace with trait when all subclasses are translated to Kotlin diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt index 74f69eb4828..4c568d4684a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt index 4912fe48dae..df74d476213 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt @@ -18,13 +18,13 @@ package org.jetbrains.jet.plugin.quickfix import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetBlockExpression import com.intellij.psi.PsiWhiteSpace import com.intellij.openapi.editor.ScrollType -import org.jetbrains.jet.lang.psi.JetWithExpressionInitializer -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.JetWithExpressionInitializer +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.psiUtil.siblings private fun moveCaretIntoGeneratedElement(editor: Editor, element: PsiElement): Boolean { // Inspired by GenerateMembersUtils.positionCaret() diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt index 0f344f4293b..35453844062 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt @@ -22,14 +22,14 @@ import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.psi.PsiPackage import com.intellij.psi.PsiClass import com.intellij.psi.PsiMember -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.lang.resolve.name.isOneSegmentFQN -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElement -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetUserType -import org.jetbrains.jet.lang.psi +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetUserType +import org.jetbrains.kotlin.psi /** * Returns FqName for given declaration (either Java or Kotlin) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index e9decdcb082..d4a499c8662 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -41,7 +41,7 @@ import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java index 4230ac2025f..ed41209e415 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java @@ -25,8 +25,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression; -import org.jetbrains.jet.lang.psi.JetContainerNode; +import org.jetbrains.kotlin.psi.JetArrayAccessExpression; +import org.jetbrains.kotlin.psi.JetContainerNode; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt index 22dae9aa683..e84d63e86eb 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.references import com.intellij.openapi.util.TextRange import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.jet.lang.resolve.BindingContext import java.util.Collections diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java index 4e7fc334f4f..5e7108a37ba 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt index 76347b97d61..f066b84e90a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.references -import org.jetbrains.jet.lang.psi.JetMultiDeclaration +import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import com.intellij.openapi.util.TextRange @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.source.PsiSourceElement import org.jetbrains.jet.lang.resolve.source.getPsi import com.intellij.psi.PsiElement import com.intellij.util.IncorrectOperationException -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt index d60daa4986e..a8ef356e990 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt @@ -19,11 +19,11 @@ package org.jetbrains.jet.plugin.references import com.intellij.openapi.util.TextRange import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetPropertyDelegate +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetPropertyDelegate import org.jetbrains.jet.lang.resolve.BindingContext import java.util.Collections -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class JetPropertyDelegationMethodsReference(element: JetPropertyDelegate) : JetMultiReference(element) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt index a638c559ebd..9cade0cff33 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt @@ -26,9 +26,9 @@ import com.intellij.psi.PsiReference import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.BindingContext import java.util.Collections -import org.jetbrains.jet.lang.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt index faaa702b0d1..0c591aca951 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.references import com.intellij.psi.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import com.intellij.util.ProcessingContext import com.intellij.patterns.PlatformPatterns @@ -59,4 +59,4 @@ public class JetReferenceContributor() : PsiReferenceContributor() { } }) } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt index 5ffd438e310..2930a55a196 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt @@ -19,13 +19,13 @@ package org.jetbrains.jet.plugin.references import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.refactoring.fqName.changeQualifiedName -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector -import org.jetbrains.jet.lang.psi.psiUtil.getOutermostNonInterleavingQualifiedElement +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector +import org.jetbrains.kotlin.psi.psiUtil.getOutermostNonInterleavingQualifiedElement import org.jetbrains.jet.plugin.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName import org.jetbrains.jet.lang.types.expressions.OperatorConventions @@ -36,7 +36,7 @@ import com.intellij.util.IncorrectOperationException import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike import org.jetbrains.jet.plugin.caches.resolve.analyze -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypeAndBranch +import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch public class JetSimpleNameReference( jetSimpleNameExpression: JetSimpleNameExpression diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java index 275735ccb1a..d4ee2be304d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.references; import com.intellij.openapi.util.TextRange; -import org.jetbrains.jet.lang.psi.JetThisReferenceExpression; +import org.jetbrains.kotlin.psi.JetThisReferenceExpression; public class JetThisReference extends JetSimpleReference { public JetThisReference(JetThisReferenceExpression expression) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt index a60f3c620cb..8d1a08ac59f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt @@ -20,19 +20,19 @@ import com.intellij.psi.PsiReference import com.intellij.psi.PsiElement import org.jetbrains.kotlin.asJava.unwrapped import com.intellij.psi.PsiMethod -import org.jetbrains.jet.lang.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetPropertyAccessor +import org.jetbrains.kotlin.psi.JetProperty import java.util.HashSet -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention -import org.jetbrains.jet.lang.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.JetClass import com.intellij.psi.PsiPolyVariantReference import org.jetbrains.kotlin.utils.emptyOrSingletonList -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType // Navigation element of the resolved reference // For property accessor return enclosing property diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java index 563b191c8d5..a1cd6d2971b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java @@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.search.usagesSearch.*; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.AsJavaPackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt index d715ca4c2ee..ce0f5b06b6d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt @@ -17,27 +17,27 @@ package org.jetbrains.jet.plugin.search.usagesSearch import com.intellij.psi.PsiReference -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.plugin.search.usagesSearch.* import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchFilter.* -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetNamedFunction import java.util.Collections import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.asJava.LightClassUtil.PropertyAccessorsPsiMethods -import org.jetbrains.jet.lang.psi.psiUtil.* +import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.kotlin.lexer.JetSingleValueToken import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.references.* -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.util.containers.ContainerUtil import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt index 8e78b4bccb0..2f635def330 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.search.usagesSearch import com.intellij.psi.PsiConstructorCall import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.lang.psi.psiUtil.* +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiReference import org.jetbrains.jet.lang.resolve.DescriptorUtils diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java index c7fd2b5d3ff..a7838679751 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.util.ArrayList; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java index 13d67073aa1..241da388f4a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; public class JetStructureViewFactory implements PsiStructureViewFactory { @Override diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java index 827c1ce9dff..62921cfd6a5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java @@ -20,8 +20,8 @@ import com.intellij.ide.structureView.StructureViewModelBase; import com.intellij.ide.util.treeView.smartTree.NodeProvider; import com.intellij.ide.util.treeView.smartTree.Sorter; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import java.util.Arrays; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt index 008b88d63a6..c42f817557d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import java.util.ArrayList import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import com.intellij.psi.NavigatablePsiElement -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.plugin.caches.resolve.analyze public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider() { @@ -61,4 +61,4 @@ public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider(element, javaClass()) @@ -109,4 +109,4 @@ private fun getReceiverAsSimpleNameExpression(exp: JetSimpleNameExpression): Jet else -> null } -} \ No newline at end of file +} diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 2f3f81f1757..7d75346529a 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -133,7 +133,7 @@ - - - + @@ -348,15 +348,15 @@ implementationClass="org.jetbrains.jet.plugin.ktSignature.KotlinSignatureInJavaMarkerProvider"/> + forClass="org.jetbrains.kotlin.psi.JetNamedFunction"/> + forClass="org.jetbrains.kotlin.psi.JetClass"/> + forClass="org.jetbrains.kotlin.psi.JetObjectDeclaration"/> + forClass="org.jetbrains.kotlin.psi.JetProperty"/> + forClass="org.jetbrains.kotlin.psi.JetParameter"/> @@ -405,7 +405,7 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java b/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java index d28772fde90..42ee9539d03 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java @@ -29,9 +29,9 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetImportDirective; -import org.jetbrains.jet.lang.psi.JetImportList; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetImportDirective; +import org.jetbrains.kotlin.psi.JetImportList; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 7534d797bf1..78d18ab8fc4 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -28,9 +28,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetPackageDirective; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetPackageDirective; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt index 7cdb3ce5aae..9e616bca55d 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt @@ -36,7 +36,7 @@ import java.io.IOException import com.intellij.openapi.ui.ex.MessagesEx import org.jetbrains.jet.plugin.j2k.J2kPostProcessor import com.intellij.openapi.vfs.CharsetToolkit -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.utils.addIfNotNull import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFileVisitor diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java index 17782efdf2f..0eaf3786027 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java @@ -33,10 +33,10 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassKind; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.Modality; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetClassBody; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetClassBody; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; @@ -48,7 +48,7 @@ import javax.swing.*; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; /** * Changes method signature to one of provided signatures. diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java index 8c99657b069..b7ca1d3dbc8 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java @@ -32,7 +32,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt b/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt index bce3c987ba0..8f10a0f019f 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt @@ -20,12 +20,12 @@ import com.intellij.ide.actions.QualifiedNameProvider import com.intellij.psi.PsiElement import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject public class KotlinQualifiedNameProvider: QualifiedNameProvider { override fun adjustElementToCopy(element: PsiElement?) = null @@ -48,4 +48,4 @@ public class KotlinQualifiedNameProvider: QualifiedNameProvider { override fun insertQualifiedName(fqn: String?, element: PsiElement?, editor: Editor?, project: Project?) { } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index fbd684bd3c7..ea6e87acb3f 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -25,8 +25,8 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt index d2adae792d1..828f96393f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt @@ -23,13 +23,13 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.project.Project import com.intellij.psi.PsiManager import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFileVisitor import com.intellij.openapi.progress.ProgressManager -import org.jetbrains.jet.lang.psi.JetVisitorVoid -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.JetVisitorVoid +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.openapi.fileEditor.FileDocumentManager import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor @@ -42,16 +42,16 @@ import com.intellij.openapi.diff.impl.DiffPanelImpl import com.intellij.openapi.diff.ex.DiffPanelOptions import com.intellij.openapi.ui.Messages import javax.swing.SwingUtilities -import org.jetbrains.jet.lang.psi.JetNameReferenceExpression -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetNameReferenceExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade -import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody -import org.jetbrains.jet.lang.psi.JetContainerNode -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetContainerNode +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.psiUtil.siblings import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java index 943c52921d9..ad198a236c8 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java @@ -22,7 +22,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; import org.jetbrains.jet.checkers.CheckerTestUtil; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt index 4ee5fe05340..95b3c32a45d 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt @@ -29,7 +29,7 @@ import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.ui.Messages import javax.swing.SwingUtilities import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.CallableDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java index dd48d409b76..71814a4fb07 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java @@ -22,9 +22,9 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetEnumEntry; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetEnumEntry; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt index bdd17357ce4..19e3960677d 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.plugin.stubindex.* import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.scopes.JetScope import com.intellij.openapi.project.Project diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java index dc98af5bead..8f0148981c4 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java @@ -27,7 +27,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java index 0d1697cc8ed..b165f75ff35 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java @@ -26,9 +26,9 @@ import com.intellij.psi.PsiMember; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.jet.plugin.JetDescriptorIconProvider; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java index 2d59d31ae26..cef62235da2 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java @@ -33,7 +33,7 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java index e3986853665..b1127197971 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.ide.util.DefaultPsiElementCellRenderer; import com.intellij.psi.PsiElement; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java index 43775fcbe29..dd6a30f3a46 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java @@ -21,8 +21,8 @@ import com.intellij.psi.PsiElement; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 3abe707d400..7d085bd4335 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.RangeMarker import com.intellij.openapi.editor.Editor import com.intellij.codeInsight.editorActions.ReferenceTransferableData import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.openapi.project.Project @@ -39,33 +39,33 @@ import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import com.intellij.openapi.util.TextRange import java.util.Collections -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.psi.JetImportDirective -import org.jetbrains.jet.lang.psi.JetPackageDirective +import org.jetbrains.kotlin.psi.JetImportDirective +import org.jetbrains.kotlin.psi.JetPackageDirective import org.jetbrains.jet.plugin.references.JetMultiReference -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetThisExpression -import org.jetbrains.jet.lang.psi.JetSuperExpression +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetThisExpression +import org.jetbrains.kotlin.psi.JetSuperExpression import org.jetbrains.jet.plugin.conversion.copy.* import java.awt.datatransfer.UnsupportedFlavorException import java.io.IOException import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression -import org.jetbrains.jet.lang.psi.JetUserType -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetUserType +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils import org.jetbrains.jet.plugin.imports.* -import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression +import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.utils.* import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension import com.intellij.openapi.progress.ProcessCanceledException import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType //NOTE: this class is based on CopyPasteReferenceProcessor and JavaCopyPasteReferenceProcessor public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index efdf6f524cc..447f4c822cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -32,7 +32,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; @@ -46,7 +46,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class OverrideImplementMethodsHandler implements LanguageCodeInsightActionHandler { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java index aa920c2b7f3..e8246a43609 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java @@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetBlockExpression; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetBlockExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java index 0ee4cf862fa..687e67cb769 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java @@ -26,7 +26,7 @@ import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; @@ -37,7 +37,7 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class MoveDeclarationsOutHelper { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurroundDescriptor.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurroundDescriptor.java index 4afef1899bd..627e510dfe1 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurroundDescriptor.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurroundDescriptor.java @@ -21,7 +21,7 @@ import com.intellij.lang.surroundWith.Surrounder; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; public class KotlinExpressionSurroundDescriptor implements SurroundDescriptor { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java index a69fe84a1d6..2f2f7b86eb6 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java @@ -24,9 +24,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetCallExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetQualifiedExpression; +import org.jetbrains.kotlin.psi.JetCallExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetQualifiedExpression; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java index 37c21391801..ccd6ffd0394 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java @@ -23,14 +23,14 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression; -import org.jetbrains.jet.lang.psi.JetPrefixExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetParenthesizedExpression; +import org.jetbrains.kotlin.psi.JetPrefixExpression; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinNotSurrounder extends KotlinExpressionSurrounder { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java index 0e7c71beb49..4bf3dfbb484 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java @@ -23,10 +23,10 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetParenthesizedExpression; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinParenthesesSurrounder extends KotlinExpressionSurrounder { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt index 687e15e5f1b..0a055dc9d66 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt @@ -29,13 +29,13 @@ import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.progress.util.ProgressWindowWithNotification import com.intellij.openapi.project.Project import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.jet.plugin.debugger.evaluate.KotlinRuntimeTypeEvaluator -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS import org.jetbrains.jet.plugin.codeInsight.ShortenReferences -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.plugin.caches.resolve.analyzeFully diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java index dded6d72876..c15be8220f9 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java @@ -22,13 +22,13 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetConstantExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetStringTemplateEntry; -import org.jetbrains.jet.lang.psi.JetStringTemplateExpression; +import org.jetbrains.kotlin.psi.JetConstantExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetStringTemplateEntry; +import org.jetbrains.kotlin.psi.JetStringTemplateExpression; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinStringTemplateSurrounder extends KotlinExpressionSurrounder { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java index e387108fef2..bd680f2f3dc 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java @@ -25,15 +25,15 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassKind; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetWhenCondition; -import org.jetbrains.jet.lang.psi.JetWhenEntry; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetWhenCondition; +import org.jetbrains.kotlin.psi.JetWhenEntry; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinWhenSurrounder extends KotlinExpressionSurrounder { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java index 8d9e9fbe962..c5f23b8c745 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java @@ -22,12 +22,12 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; import org.jetbrains.jet.plugin.codeInsight.surroundWith.MoveDeclarationsOutHelper; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinFunctionLiteralSurrounder extends KotlinStatementsSurrounder { @Nullable diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java index 0bb13aaae04..4eaf8d34580 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java @@ -24,13 +24,13 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetBlockExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetIfExpression; +import org.jetbrains.kotlin.psi.JetBlockExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetIfExpression; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; import org.jetbrains.jet.plugin.codeInsight.surroundWith.MoveDeclarationsOutHelper; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class KotlinIfSurrounderBase extends KotlinStatementsSurrounder { @@ -72,4 +72,4 @@ public abstract class KotlinIfSurrounderBase extends KotlinStatementsSurrounder protected abstract String getCodeTemplate(); protected abstract boolean isGenerateDefaultInitializers(); -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java index f784707d8ba..ab609fced0d 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.codeInsight.surroundWith.statement; import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetTryExpression; +import org.jetbrains.kotlin.psi.JetTryExpression; public class KotlinTryCatchFinallySurrounder extends KotlinTrySurrounderBase { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java index fa28200a5fb..9d4ea498d5f 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.codeInsight.surroundWith.statement; import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetTryExpression; +import org.jetbrains.kotlin.psi.JetTryExpression; public class KotlinTryCatchSurrounder extends KotlinTrySurrounderBase { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryFinallySurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryFinallySurrounder.java index b10e54d7205..e7ddf34f399 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryFinallySurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTryFinallySurrounder.java @@ -23,9 +23,9 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetFinallySection; -import org.jetbrains.jet.lang.psi.JetTryExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetFinallySection; +import org.jetbrains.kotlin.psi.JetTryExpression; public class KotlinTryFinallySurrounder extends KotlinTrySurrounderBase { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java index ca8b0d67954..8598ef51865 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java @@ -23,14 +23,14 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetBlockExpression; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetTryExpression; +import org.jetbrains.kotlin.psi.JetBlockExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetTryExpression; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; import org.jetbrains.jet.plugin.codeInsight.surroundWith.MoveDeclarationsOutHelper; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class KotlinTrySurrounderBase extends KotlinStatementsSurrounder { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinComponentUnwrapper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinComponentUnwrapper.java index 54e8e5d5316..e8676793e7e 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinComponentUnwrapper.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinComponentUnwrapper.java @@ -20,8 +20,8 @@ import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; public abstract class KotlinComponentUnwrapper extends KotlinUnwrapRemoveBase { public KotlinComponentUnwrapper(String key) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinLambdaUnwrapper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinLambdaUnwrapper.java index f262fba9b48..4ecfd80ebe7 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinLambdaUnwrapper.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinLambdaUnwrapper.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; public class KotlinLambdaUnwrapper extends KotlinUnwrapRemoveBase { public KotlinLambdaUnwrapper(String key) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java index ac021d0880b..cb0cefcad74 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java @@ -21,9 +21,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiWhiteSpace; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetBlockExpression; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetBlockExpression; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; @@ -89,4 +89,4 @@ public abstract class KotlinUnwrapRemoveBase extends AbstractUnwrapper(), true) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/completion/confidence/UnfocusedPossibleFunctionParameter.java b/idea/src/org/jetbrains/jet/plugin/completion/confidence/UnfocusedPossibleFunctionParameter.java index b9d4c4b02b6..29d5980c1c9 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/confidence/UnfocusedPossibleFunctionParameter.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/confidence/UnfocusedPossibleFunctionParameter.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; public class UnfocusedPossibleFunctionParameter extends CompletionConfidence { @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt index 7dbccdee1ea..87b66e03917 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt @@ -33,9 +33,9 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import com.intellij.openapi.project.Project import com.intellij.psi.PsiDocumentManager import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.completion.ExpectedInfos -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.jet.plugin.util.application.runWriteAction import org.jetbrains.jet.plugin.refactoring.EmptyValidator diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt index 28f02dee1a9..39b75bd02d2 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt @@ -20,14 +20,14 @@ import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.completion.InsertionContext import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetImportDirective +import org.jetbrains.kotlin.psi.JetImportDirective import com.intellij.codeInsight.AutoPopupController import com.intellij.psi.codeStyle.CodeStyleSettingsManager import com.intellij.openapi.project.Project import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper import com.intellij.openapi.editor.Document @@ -35,17 +35,17 @@ import org.jetbrains.jet.lang.types.JetType import com.intellij.openapi.util.TextRange import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS import org.jetbrains.jet.plugin.codeInsight.ShortenReferences -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetTypeArgumentList +import org.jetbrains.kotlin.psi.JetTypeArgumentList import com.intellij.codeInsight.lookup.Lookup import org.jetbrains.jet.plugin.completion.isAfterDot diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt index 027a8b85294..1c5fb22f8e0 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt @@ -19,13 +19,13 @@ package org.jetbrains.jet.plugin.completion.handlers import com.intellij.codeInsight.completion.InsertionContext import com.intellij.codeInsight.lookup.LookupElement import com.intellij.psi.PsiDocumentManager -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode import com.intellij.psi.PsiClass -import org.jetbrains.jet.lang.psi.JetNameReferenceExpression +import org.jetbrains.kotlin.psi.JetNameReferenceExpression import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt index 954afc40719..79d0909dd77 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.jet.plugin.completion.ExpectedInfo import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import com.intellij.codeInsight.lookup.LookupElementBuilder -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.completion.InsertionContext import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler @@ -60,4 +60,4 @@ object KeywordValues { { info -> if (info.type.isMarkedNullable()) ExpectedInfoClassification.matches(TypeSubstitutor.EMPTY) else ExpectedInfoClassification.notMatches }, { LookupElementBuilder.create("null").bold().assignSmartCompletionPriority(SmartCompletionItemPriority.NULL) }) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt index 2f91ad83f98..8ad692f635a 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.completion.smart import org.jetbrains.jet.plugin.completion.ExpectedInfo -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import com.intellij.codeInsight.lookup.LookupElement import com.intellij.ui.LayeredIcon import com.intellij.codeInsight.lookup.LookupElementBuilder @@ -99,4 +99,4 @@ class MultipleArgumentsItemProvider(val bindingContext: BindingContext, else null } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt index e0fb1c427a1..5cb35df22c3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.completion.smart import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.lang.types.* import com.intellij.codeInsight.lookup.* @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf import org.jetbrains.jet.plugin.util.FuzzyType import org.jetbrains.jet.plugin.util.fuzzyReturnType import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor -import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression +import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression trait InheritanceItemsSearcher { fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt index adc95b46041..24dc7b7f5f3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt @@ -33,7 +33,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.jet.plugin.completion.LookupElementFactory import org.jetbrains.jet.lang.types.TypeSubstitutor import org.jetbrains.jet.plugin.util.fuzzyReturnType -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.plugin.completion.isVisible // adds java static members, enum members and members from class object diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index dff21a04014..d265c35e158 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.resolve.PossiblyBareType import org.jetbrains.jet.lang.types.JetTypeImpl import org.jetbrains.jet.lang.descriptors.annotations.Annotations @@ -59,7 +59,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.resolveTopLevelClass import org.jetbrains.jet.lang.types.TypeProjectionImpl import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt index c1a807b910e..c352d489ee0 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.completion.smart -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.descriptors.VariableDescriptor import java.util.Collections @@ -96,4 +96,4 @@ class TypesWithSmartCasts(val bindingContext: BindingContext) { return ProcessDataFlowInfoResult(variableToType, notNullVariables) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt index 4be72f35bea..03b72016eff 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.InsertHandler import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.completion.InsertionContext import com.intellij.psi.PsiDocumentManager -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import java.util.HashSet import com.intellij.codeInsight.lookup.LookupElementDecorator diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt index 31a6910c931..9f9e2a8c72b 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt @@ -27,7 +27,7 @@ import com.intellij.openapi.util.Ref import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.* import org.jetbrains.kotlin.j2k.* -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.editor.JetEditorOptions import java.awt.datatransfer.Transferable import com.intellij.openapi.util.TextRange diff --git a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt index d6d381f072a..c91bffe4988 100644 --- a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt +++ b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt @@ -23,14 +23,14 @@ import com.intellij.psi.PsiFile import com.intellij.openapi.vfs.VirtualFile import com.intellij.coverage.CoverageSuitesBundle import java.io.File -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.debugger.JetPositionManager import org.jetbrains.jet.plugin.caches.resolve.getModuleInfo -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.openapi.roots.ProjectRootManager -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import com.intellij.psi.PsiElement import java.util.LinkedHashSet import com.intellij.psi.PsiClass @@ -40,7 +40,7 @@ import com.intellij.coverage.PackageAnnotator import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.roots.CompilerModuleExtension import com.intellij.coverage.JavaCoverageAnnotator -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.diagnostic.Logger @@ -217,4 +217,4 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() { return classNames } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt index a5568614748..97ae7db4e33 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt @@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.debugger import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck +import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck public class DiagnosticSuppressorForDebugger : DiagnosticsWithSuppression.DiagnosticSuppressor { override fun isSuppressed(diagnostic: Diagnostic): Boolean { @@ -36,4 +36,4 @@ public class DiagnosticSuppressorForDebugger : DiagnosticsWithSuppression.Diagno return false } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt index d9a4d01bc3f..bbc0b0ccf72 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt @@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.callUtil.* import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt index 59e41b8c7a4..b98e536fc76 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt @@ -25,18 +25,18 @@ import com.intellij.debugger.engine.evaluation.TextWithImportsImpl import com.intellij.debugger.engine.evaluation.CodeFragmentKind import org.jetbrains.jet.plugin.JetFileType import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetReferenceExpression -import org.jetbrains.jet.lang.psi.JetThisExpression -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetOperationExpression -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetSuperExpression -import org.jetbrains.jet.lang.psi.JetCodeFragment -import org.jetbrains.jet.lang.psi.JetUserType -import org.jetbrains.jet.lang.psi.JetImportDirective -import org.jetbrains.jet.lang.psi.JetPackageDirective +import org.jetbrains.kotlin.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.JetThisExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetOperationExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetSuperExpression +import org.jetbrains.kotlin.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetUserType +import org.jetbrains.kotlin.psi.JetImportDirective +import org.jetbrains.kotlin.psi.JetPackageDirective class KotlinEditorTextProvider : EditorTextProvider { override fun getEditorText(elementAtCaret: PsiElement): TextWithImports? { diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt index 5adbbe40af3..11c7f884e4b 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import com.intellij.debugger.engine.MethodFilter import com.intellij.debugger.engine.BasicStepMethodFilter diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt index c10cfdec444..d32073b6b87 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt @@ -22,14 +22,14 @@ import com.intellij.openapi.project.Project import com.intellij.debugger.impl.DebuggerContextImpl import com.intellij.debugger.SourcePosition import org.jetbrains.kotlin.codegen.AsmUtil -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.debugger.impl.DebuggerContextUtil import com.sun.jdi.ReferenceType import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.resolve.java.JvmClassName import com.intellij.psi.JavaPsiFacade -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.sun.jdi.AbsentInformationException import com.sun.jdi.ClassNotPreparedException import com.intellij.debugger.ui.tree.FieldDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt index 19619be4f81..70eb2379c25 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.debugger import com.intellij.psi.search.FilenameIndex import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.diagnostic.Logger @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import com.intellij.openapi.roots.libraries.LibraryUtil import com.intellij.openapi.module.impl.scopes.LibraryScope import com.intellij.openapi.roots.LibraryOrderEntry -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.module.impl.scopes.JdkScope import com.intellij.openapi.roots.JdkOrderEntry -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.descriptorUtil.module import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt index bc40b7e358d..589137fbaff 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -22,16 +22,16 @@ import com.intellij.psi.PsiElement import com.intellij.openapi.project.Project import com.intellij.psi.JavaCodeFragment import org.jetbrains.jet.plugin.JetFileType -import org.jetbrains.jet.lang.psi.JetExpressionCodeFragment +import org.jetbrains.kotlin.psi.JetExpressionCodeFragment import com.intellij.psi.PsiCodeBlock import com.intellij.debugger.engine.evaluation.CodeFragmentKind import org.jetbrains.jet.plugin.debugger.KotlinEditorTextProvider import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetBlockCodeFragment +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetBlockCodeFragment import org.jetbrains.kotlin.asJava.KotlinLightClass import com.intellij.debugger.DebuggerManagerEx -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.jet.lang.types.JetType import com.intellij.util.concurrency.Semaphore import java.util.concurrent.atomic.AtomicReference diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt index 6c2ffaee5dc..c0e85de7e64 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.PsiModificationTracker -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetCodeFragment import com.intellij.debugger.SourcePosition import com.intellij.debugger.engine.evaluation.EvaluationContextImpl import java.util.ArrayList @@ -97,4 +97,4 @@ class KotlinEvaluateExpressionCache(val project: Project) { override fun iterator() = list.iterator() } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt index ea38f753daf..321cf61989f 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -27,7 +27,7 @@ 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 +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.psi.PsiFileFactory import com.intellij.openapi.vfs.CharsetToolkit @@ -41,12 +41,12 @@ import org.jetbrains.eval4j.jdi.makeInitialFrame 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.kotlin.psi.JetNamedFunction 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 org.jetbrains.kotlin.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.codegen.CompilationErrorHandler import org.jetbrains.jet.lang.diagnostics.Severity @@ -60,7 +60,7 @@ import com.sun.jdi.VirtualMachine 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 +import org.jetbrains.kotlin.psi.analysisContext import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap @@ -72,7 +72,7 @@ import com.intellij.openapi.project.Project import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.jet.lang.types.Flexibility -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.util.attachment.attachmentByPsiFile import com.intellij.openapi.diagnostic.Attachment import org.jetbrains.jet.plugin.util.attachment.mergeAttachments diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt index af605c124fc..43b99ff0c36 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt @@ -35,10 +35,10 @@ import com.intellij.psi.PsiElement import com.sun.jdi.ClassType import com.sun.jdi.Value import org.jetbrains.eval4j.jdi.* -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.types.JetType import org.jetbrains.org.objectweb.asm.Type as AsmType -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.java.JvmAbi public abstract class KotlinRuntimeTypeEvaluator( diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt index 1b787f63ce9..f719009e4ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.ErrorMessage import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import org.jetbrains.jet.plugin.refactoring.createTempCopy -import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck +import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionData import org.jetbrains.jet.plugin.refactoring.extractFunction.performAnalysis @@ -32,13 +32,13 @@ import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionOptions import org.jetbrains.jet.plugin.util.application.runReadAction import com.intellij.psi.PsiManager import com.intellij.psi.impl.PsiModificationTrackerImpl -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.intentions.InsertExplicitTypeArguments import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionGeneratorOptions import org.jetbrains.jet.plugin.refactoring.extractFunction.generateDeclaration import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode -import org.jetbrains.jet.lang.psi.psiUtil.replaced +import org.jetbrains.kotlin.psi.psiUtil.replaced fun getFunctionForExtractedFragment( codeFragment: JetCodeFragment, diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java b/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java index 94abc90b835..3c520481df0 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.editor; import com.intellij.codeInsight.editorActions.BackspaceHandlerDelegate; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; public class KotlinBackspaceHandler extends BackspaceHandlerDelegate { private boolean deleteGt; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt b/idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt index acf4013b022..e413c56c898 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt @@ -26,10 +26,10 @@ import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegate import com.intellij.codeInsight.CodeInsightSettings import com.intellij.psi.PsiDocumentManager import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.tree.TokenSet diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt b/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt index 1392328cd09..5c52da474b0 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt @@ -24,19 +24,19 @@ import com.intellij.util.text.CharArrayUtil import com.intellij.psi.codeStyle.CodeStyleSettingsManager import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetForExpression -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetFunctionLiteral import com.intellij.psi.tree.TokenSet import org.jetbrains.jet.JetNodeTypes -import org.jetbrains.jet.lang.psi.JetLoopExpression +import org.jetbrains.kotlin.psi.JetLoopExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() { { diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java b/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java index b3a043e86d2..3d1cf8674eb 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java @@ -44,7 +44,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.lexer.JetTokens; public class KotlinTypedHandler extends TypedHandlerDelegate { diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinDoWhileFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinDoWhileFixer.kt index 77201f526cb..4e91d3961ca 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinDoWhileFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinDoWhileFixer.kt @@ -20,8 +20,8 @@ import com.intellij.lang.SmartEnterProcessorWithFixers import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetDoWhileExpression -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetDoWhileExpression +import org.jetbrains.kotlin.psi.JetBlockExpression public class KotlinDoWhileFixer : SmartEnterProcessorWithFixers.Fixer() { override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, psiElement: PsiElement) { @@ -62,4 +62,4 @@ public class KotlinDoWhileFixer : SmartEnterProcessorWithFixers.Fixer() { override val keyword = "for" diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt index 979cf1fa814..9df1c42e662 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt @@ -20,13 +20,13 @@ import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class KotlinFunctionDeclarationBodyFixer : SmartEnterProcessorWithFixers.Fixer() { diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionParametersFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionParametersFixer.kt index a5a042715f9..3aa99c8a879 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionParametersFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionParametersFixer.kt @@ -20,7 +20,7 @@ import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction public class KotlinFunctionParametersFixer : SmartEnterProcessorWithFixers.Fixer() { @@ -48,4 +48,4 @@ public class KotlinFunctionParametersFixer : SmartEnterProcessorWithFixers.Fixer } } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinIfConditionFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinIfConditionFixer.kt index 621476c3ce1..8be3f1ec04f 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinIfConditionFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinIfConditionFixer.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.util.TextRange @@ -31,4 +31,4 @@ public class KotlinIfConditionFixer : MissingConditionFixer() { override fun getLeftParenthesis(element: JetIfExpression) = element.getLeftParenthesis() override fun getRightParenthesis(element: JetIfExpression) = element.getRightParenthesis() override fun getBody(element: JetIfExpression) = element.getThen() -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt index 3a83be9147e..e06648f5a8c 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt @@ -20,10 +20,10 @@ import com.intellij.lang.SmartEnterProcessorWithFixers import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetWhileExpression -import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.lang.psi.JetLoopExpression -import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetWhileExpression +import org.jetbrains.kotlin.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetLoopExpression +import org.jetbrains.kotlin.psi.JetForExpression public class KotlinMissingForOrWhileBodyFixer : SmartEnterProcessorWithFixers.Fixer() { override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, element: PsiElement) { diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingIfBranchFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingIfBranchFixer.kt index f346a69dec3..57f3d0966a4 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingIfBranchFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingIfBranchFixer.kt @@ -21,9 +21,9 @@ import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.jet.plugin.formatter.JetBlock -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetBlockExpression public class KotlinMissingIfBranchFixer : SmartEnterProcessorWithFixers.Fixer() { override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, element: PsiElement) { diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingWhenBodyFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingWhenBodyFixer.kt index d53672fa617..5f308e14b15 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingWhenBodyFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingWhenBodyFixer.kt @@ -20,7 +20,7 @@ import com.intellij.lang.SmartEnterProcessorWithFixers import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetWhenExpression public class KotlinMissingWhenBodyFixer : SmartEnterProcessorWithFixers.Fixer() { override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, element: PsiElement) { @@ -46,4 +46,4 @@ public class KotlinMissingWhenBodyFixer : SmartEnterProcessorWithFixers.Fixer null else -> getWhenKeywordElement() } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhenSubjectCaretFixer.kt b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhenSubjectCaretFixer.kt index 3da11c84eec..c114db19f85 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhenSubjectCaretFixer.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhenSubjectCaretFixer.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import com.intellij.lang.SmartEnterProcessorWithFixers import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetWhenExpression public class KotlinWhenSubjectCaretFixer : SmartEnterProcessorWithFixers.Fixer() { override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, element: PsiElement) { @@ -34,4 +34,4 @@ public class KotlinWhenSubjectCaretFixer : SmartEnterProcessorWithFixers.Fixer() { override val keyword = "while" @@ -27,4 +27,4 @@ public class KotlinWhileConditionFixer: MissingConditionFixer{ @@ -36,4 +36,4 @@ public class KotlinWordSelectionFilter : Condition{ else -> true } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java index 7c7c332571c..2924464092e 100644 --- a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java +++ b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java @@ -27,7 +27,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt index 17365c5ada9..864aadc1bfc 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiNamedElement import com.intellij.refactoring.util.RefactoringDescriptionLocation import com.intellij.usageView.UsageViewLongNameLocation -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.jet.plugin.search.usagesSearch.descriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt index f091bee2f7b..390e63c2059 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt @@ -21,9 +21,9 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.usages.Usage import com.intellij.usages.rules.ImportFilteringRule import com.intellij.usages.rules.PsiElementUsage -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetImportDirective -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetImportDirective +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType public class JetImportFilteringRule : ImportFilteringRule() { public override fun isVisible(usage: Usage): Boolean { diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinDeclarationGroupRuleProvider.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinDeclarationGroupRuleProvider.kt index d4b59282d7e..6b49d9e211f 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinDeclarationGroupRuleProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinDeclarationGroupRuleProvider.kt @@ -21,12 +21,12 @@ import com.intellij.usages.UsageGroup import com.intellij.usages.Usage import com.intellij.psi.util.PsiTreeUtil import com.intellij.usages.rules.UsageGroupingRule -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import com.intellij.usages.PsiNamedElementUsageGroupBase -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.usages.impl.FileStructureGroupRuleProvider import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction public class KotlinDeclarationGroupRuleProvider : FileStructureGroupRuleProvider { public class KotlinDeclarationGroupingRule : UsageGroupingRule { diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindUsagesHandlerFactory.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindUsagesHandlerFactory.kt index 816ca98aca2..74279672f3e 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindUsagesHandlerFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindUsagesHandlerFactory.kt @@ -20,17 +20,17 @@ import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesHandlerFactory import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindClassUsagesHandler import org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindMemberUsagesHandler import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import com.intellij.find.findUsages.FindUsagesOptions -import org.jetbrains.jet.lang.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.JetTypeParameter import org.jetbrains.jet.plugin.findUsages.handlers.KotlinTypeParameterFindUsagesHandler -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetNamedDeclaration -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.find.findUsages.FindUsagesManager import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory import com.intellij.psi.PsiMethod diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java index 97a43b035b7..dead1312dfc 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiMethod; import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java index cb1c7ee0113..62e11ab3bee 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java @@ -26,7 +26,7 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.StateRestoringCheckBox; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java index fceb324864e..8d25d24a273 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java @@ -22,7 +22,7 @@ import com.intellij.find.findUsages.FindUsagesOptions; import com.intellij.openapi.project.Project; import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; public class KotlinTypeParameterFindUsagesDialog extends CommonFindUsagesDialog { public KotlinTypeParameterFindUsagesDialog( diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java index 26277a8667b..5cff29c3bc9 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.findUsages.dialogs; import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchPackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt index e4f22f72a13..71d8a7fca2d 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt @@ -23,7 +23,7 @@ import com.intellij.util.Processor import com.intellij.find.findUsages.FindUsagesOptions import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory import kotlin.properties.Delegates -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import com.intellij.psi.PsiMethod import com.intellij.find.findUsages.JavaFindUsagesHandler import com.intellij.find.findUsages.JavaMethodFindUsagesOptions diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt index ae9238c4206..84d4bf17f5b 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -26,7 +26,7 @@ import com.intellij.psi.search.PsiElementProcessorAdapter import com.intellij.usageView.UsageInfo import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinFindClassUsagesDialog diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java index 10d10cb7334..79e8a594535 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java @@ -30,10 +30,10 @@ import com.intellij.usageView.UsageInfo; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.plugin.findUsages.*; import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinFindFunctionUsagesDialog; import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinFindPropertyUsagesDialog; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt index 8ac81da530e..11b5340d8fb 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.actionSystem.DataContext import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo import com.intellij.util.Processor -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinTypeParameterFindUsagesDialog import org.jetbrains.jet.plugin.search.usagesSearch.DefaultSearchHelper diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java index 0a3477ec183..2636300f4b7 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java @@ -30,7 +30,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; -import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java index 9a48afbc313..e7cf39899cc 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java @@ -25,11 +25,11 @@ import com.intellij.psi.*; import com.intellij.util.ArrayUtil; import kotlin.Function1; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; public class HierarchyUtils { @@ -77,4 +77,4 @@ public class HierarchyUtils { //noinspection unchecked return PsiUtilPackage.getParentOfTypesAndPredicate(element, false, ArrayUtil.EMPTY_CLASS_ARRAY, IS_OVERRIDE_HIERARCHY_ELEMENT); } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 5be0b09a1b9..03fefa084d0 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -31,8 +31,8 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java index 36b9194b75d..4b3d0568b1a 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java index 31c0e2b2a66..7a1ecb9b8f5 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java index d94b5c0747a..f8e58a01474 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java @@ -29,8 +29,8 @@ import com.intellij.util.containers.HashMap; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.Map; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java index 28a5f45c4c3..b6e4c654ca9 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java @@ -25,7 +25,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index 83225edfab0..b666356d813 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -34,7 +34,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt index e1b71dc3f80..a20bbb09bd9 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod import com.intellij.psi.PsiMethod import com.intellij.psi.ElementDescriptionUtil import com.intellij.refactoring.util.RefactoringDescriptionLocation -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.asJava.unwrapped class KotlinOverrideHierarchyBrowser( diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt index 957a1ce07ef..8a7f0fb1769 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt @@ -24,7 +24,7 @@ import com.intellij.openapi.fileEditor.FileEditor import org.jetbrains.jet.plugin.JetFileType import com.intellij.psi.PsiManager import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.icons.AllIcons import com.intellij.ide.actions.ActivateToolWindowAction import com.intellij.notification.EventLog diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index 09dd7a21909..d39e3d8baaf 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -37,8 +37,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.Modality; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.highlighter.markers.MarkersPackage; import org.jetbrains.jet.plugin.highlighter.markers.ResolveWithParentsResult; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiCheckerAndHighlightingUpdater.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiCheckerAndHighlightingUpdater.java index 703445fe154..e9d34b3fd92 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiCheckerAndHighlightingUpdater.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiCheckerAndHighlightingUpdater.java @@ -20,7 +20,7 @@ import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; public class JetPsiCheckerAndHighlightingUpdater extends JetPsiChecker { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt index b1792b0ae8a..bd1ced2c3e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt @@ -22,9 +22,9 @@ import com.intellij.psi.PsiClass import com.intellij.psi.CommonClassNames import com.intellij.openapi.progress.ProgressManager import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction fun collectContainingClasses(methods: Collection): Set { val classes = HashSet() diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt index 6e7f46d8ca6..6493fc25cdc 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.highlighter.markers -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import com.intellij.psi.search.PsiElementProcessor import com.intellij.psi.PsiClass import org.jetbrains.jet.plugin.JetBundle diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt index 3f7581e5665..d0948cb16cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt @@ -34,7 +34,7 @@ import org.jetbrains.annotations.TestOnly import com.intellij.codeInsight.daemon.GutterIconNavigationHandler import java.util.ArrayList import com.intellij.util.Function -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt index 5c4ee7f1c67..5385208c908 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt @@ -23,8 +23,8 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt index 22b68f7c3ac..1d8efd05b21 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt @@ -21,14 +21,14 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.progress.ProgressIndicatorProvider import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.jet.lang.resolve.name.* import org.jetbrains.jet.plugin.references.JetReference import java.util.HashSet import java.util.ArrayList import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class KotlinImportOptimizer() : ImportOptimizer { @@ -98,4 +98,4 @@ public class KotlinImportOptimizer() : ImportOptimizer { return usedQualifiedNames } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt b/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt index 3a8b0e05306..1d2102740db 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt +++ b/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.inspections -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.intentions.attributeCallReplacements.ReplaceGetIntention -public class ExplicitGetInspection : IntentionBasedInspection(ReplaceGetIntention()) \ No newline at end of file +public class ExplicitGetInspection : IntentionBasedInspection(ReplaceGetIntention()) diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt index b61fac4a93d..631413b0c8d 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt +++ b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt @@ -17,6 +17,6 @@ package org.jetbrains.jet.plugin.inspections import org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToElvisIntention -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetIfExpression public class IfThenToElvisInspection : IntentionBasedInspection(IfThenToElvisIntention()) diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt index 10de83c51ff..eab86f15361 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt +++ b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt @@ -17,6 +17,6 @@ package org.jetbrains.jet.plugin.inspections import org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetIfExpression public class IfThenToSafeAccessInspection : IntentionBasedInspection(IfThenToSafeAccessIntention()) diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt index 7057592ef35..5a8b79130e2 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetExpressionImpl -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetExpressionImpl +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.editor.Editor import com.intellij.lang.ASTNode import org.jetbrains.jet.JetNodeTypes diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt index 5ab75659b96..d6c72a8f74a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt @@ -17,20 +17,20 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.jet.plugin.codeInsight.ShortenReferences -import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression +import org.jetbrains.kotlin.psi.JetCallableReferenceExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import kotlin.properties.Delegates import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.lang.psi.JetThrowExpression -import org.jetbrains.jet.lang.psi.psiUtil.replaced +import org.jetbrains.kotlin.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetThrowExpression +import org.jetbrains.kotlin.psi.psiUtil.replaced import org.jetbrains.jet.plugin.caches.resolve.analyze public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention( diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt index d93209fce24..efe70a37e19 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt @@ -17,16 +17,16 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle -import org.jetbrains.jet.lang.psi.JetThrowExpression -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetThrowExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt index f5d3f9e4760..60d9011db89 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetPsiUtil import java.util.LinkedList diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt index bf70ca8c7e2..afd40b01d8b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt @@ -16,16 +16,16 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetParenthesizedExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPrefixExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.impl.source.tree.PsiErrorElementImpl -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetConstantExpression -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetConstantExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import java.util.LinkedList import org.jetbrains.jet.plugin.JetBundle diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt index 9daf3216d67..0782c983eec 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt @@ -21,9 +21,9 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ConvertToBlockBodyAction : PsiElementBaseIntentionAction() { override fun getFamilyName(): String = JetBundle.message("convert.to.block.body.action.family.name") diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt index a355dfd9262..1cd962552cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt @@ -1,16 +1,16 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetStringTemplateExpression +import org.jetbrains.kotlin.psi.JetStringTemplateExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetStringTemplateEntry -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetStringTemplateEntryWithExpression -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetStringTemplateEntry +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.BindingContextUtils import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.jet.plugin.caches.resolve.analyze public class ConvertToConcatenatedStringIntention : JetSelfTargetingIntention("convert.to.concatenated.string.intention", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt index 4d9a5aacb1b..0b1adedc2c2 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt @@ -21,13 +21,13 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.openapi.util.TextRange import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ConvertToExpressionBodyAction : PsiElementBaseIntentionAction() { override fun getFamilyName(): String = JetBundle.message("convert.to.expression.body.action.family.name") diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt index 7a0bc8396c8..cc2da6fc61b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetForExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetOperationExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetOperationExpression public class ConvertToForEachFunctionCallIntention : JetSelfTargetingIntention("convert.to.for.each.function.call.intention", javaClass()) { override fun isApplicableTo(element: JetForExpression): Boolean { @@ -64,4 +64,4 @@ public class ConvertToForEachFunctionCallIntention : JetSelfTargetingIntention( "insert.curly.brackets.to.string.template", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt index 02ec9b74196..9b2bde5a057 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt @@ -17,12 +17,12 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.types.ErrorUtils import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.psi.JetTypeArgumentList +import org.jetbrains.kotlin.psi.JetTypeArgumentList import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.caches.resolve.analyze @@ -77,4 +77,4 @@ public class InsertExplicitTypeArguments : JetSelfTargetingIntention("invert.if.condition", javaClass()) { fun checkForNegation(element: JetUnaryExpression): Boolean { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt index be1800e6f7c..6b35771af2a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import com.intellij.openapi.editor.Editor import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers @@ -110,4 +110,4 @@ public class MakeTypeExplicitInLambdaIntention : JetSelfTargetingIntention( diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt index 857fc0f3fe9..37f480f59f1 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument +import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument import org.jetbrains.jet.plugin.util.psiModificationUtil.moveInsideParentheses import org.jetbrains.jet.plugin.caches.resolve.analyzeFully diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt index 4114106eec1..0378bab9237 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt @@ -17,12 +17,12 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetLabeledExpression -import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetLabeledExpression +import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument import org.jetbrains.jet.lang.resolve.calls.callUtil.getValueArgumentsInParentheses public class MoveLambdaOutsideParenthesesIntention : JetSelfTargetingIntention( @@ -53,4 +53,4 @@ public class MoveLambdaOutsideParenthesesIntention : JetSelfTargetingIntention( "remove.unnecessary.curly.brackets.from.string.template", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt index 42ac30eb24b..c0559b91170 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt @@ -23,9 +23,9 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.IncorrectOperationException -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.jet.plugin.JetBundle public class RemoveUnnecessaryParenthesesIntention : JetSelfTargetingIntention( diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt index 0d949ee08db..d1419285d21 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiTreeUtil import com.intellij.refactoring.rename.RenameProcessor import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.JetBundle import com.intellij.psi.codeStyle.CodeStyleManager import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt index f3cbb4ce537..26952e489f5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt @@ -22,17 +22,17 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.caches.resolve.analyze -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ReplaceItWithExplicitFunctionLiteralParamIntention() : PsiElementBaseIntentionAction() { override fun invoke(project: Project, editor: Editor, element: PsiElement) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt index 0546a7d8a54..205c2a43929 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.lexer.JetTokens public class ReplaceWithDotQualifiedMethodCallIntention : JetSelfTargetingIntention("replace.with.dot.qualified.method.call.intention", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt index b4ee03a1974..ca38815f83f 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt @@ -16,15 +16,15 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetCallExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.lang.psi.JetValueArgument -import org.jetbrains.jet.lang.psi.JetPsiUnparsingUtils -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetValueArgument +import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.codeInsight.hint.HintManager import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze @@ -110,4 +110,4 @@ public open class ReplaceWithInfixFunctionCallIntention : JetSelfTargetingIntent parent.replace(replacement) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt index 6937e848c3f..daa3c8688a9 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt index 0e56cc79fed..82250bc96dd 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetPsiUnparsingUtils +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils public class ReplaceWithTraditionalAssignmentIntention : JetSelfTargetingIntention("replace.with.traditional.assignment.intention", javaClass()) { override fun isApplicableTo(element: JetBinaryExpression): Boolean { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt index cb4970ccea4..28dffd77936 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt @@ -17,17 +17,17 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetParenthesizedExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import com.intellij.psi.tree.IElementType import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.psiUtil.copied -import org.jetbrains.jet.lang.psi.psiUtil.replaced +import org.jetbrains.kotlin.psi.psiUtil.copied +import org.jetbrains.kotlin.psi.psiUtil.replaced import org.jetbrains.jet.plugin.caches.resolve.analyze public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingIntention( diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java index b3e65dde306..9becc8aa1e5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.ErrorUtils; @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt index 92b40420961..094391018a5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt @@ -16,16 +16,16 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetPsiUtil public class SplitIfIntention : JetSelfTargetingIntention("split.if", javaClass()) { override fun isApplicableTo(element: JetExpression): Boolean { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt b/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt index 8dba5b30d90..31d1426c608 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.util.JetPsiPrecedences import org.jetbrains.kotlin.lexer.JetTokens.* import org.jetbrains.jet.lang.types.expressions.OperatorConventions diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java b/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java index e975e842b3d..5d10ef16833 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; public interface Transformer { @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt index 844081c33fe..259a94fce15 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.intentions -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.FunctionDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt index 815a19dd341..239733b29b9 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.plugin.intentions.attributeCallReplacements -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetCallExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.psi.ValueArgument +import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument import org.jetbrains.jet.lang.resolve.calls.model.VarargValueArgument diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt index 4e457771c80..d67a8755ff5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory public open class ReplaceBinaryInfixIntention : AttributeCallReplacementIntention("replace.binary.operator.with.infix") { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt index 7b9f8303c72..52a9ac664c2 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.plugin.intentions.attributeCallReplacements -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.openapi.editor.Editor import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression public open class ReplaceContainsIntention : AttributeCallReplacementIntention("replace.contains.with.in") { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceGetIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceGetIntention.kt index b0c56eb5991..cdec42be078 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceGetIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceGetIntention.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory public open class ReplaceGetIntention : AttributeCallReplacementIntention("replace.get.with.index") { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt index 6718938b743..0857bdfc6b6 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory public open class ReplaceInvokeIntention : AttributeCallReplacementIntention("replace.invoke.with.call") { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt index 7ebf749208f..c191d9d0929 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory public open class ReplaceUnaryPrefixIntention : AttributeCallReplacementIntention("replace.unary.operator.with.prefix") { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java index f67d6750ebc..1c7bd676094 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java @@ -20,12 +20,12 @@ import com.google.common.base.Predicate; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class BranchedFoldingUtils { private BranchedFoldingUtils() { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java index 7bc0a46346d..45b241b45bc 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java @@ -21,10 +21,10 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.intentions.declarations.DeclarationUtils; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class BranchedUnfoldingUtils { private BranchedUnfoldingUtils() { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java index 7f3d8531209..06172342c8f 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java @@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetIfExpression; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetIfExpression; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.plugin.intentions.Transformer; public enum FoldableKind implements Transformer { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt index c65a8d8e16b..82943d4fab1 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt @@ -16,33 +16,33 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler -import org.jetbrains.jet.lang.psi.JetSafeQualifiedExpression +import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.inline.KotlinInlineValHandler -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory import org.jetbrains.jet.lang.resolve.BindingContextUtils import org.jetbrains.jet.lang.descriptors.VariableDescriptor import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.search.LocalSearchScope -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetThrowExpression -import org.jetbrains.jet.lang.psi.JetPostfixExpression -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetThrowExpression +import org.jetbrains.kotlin.psi.JetPostfixExpression +import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.lang.resolve.bindingContextUtil.isUsedAsStatement -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.plugin.caches.resolve.analyze val NULL_PTR_EXCEPTION = "NullPointerException" diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java index 2c754f12e90..0fb836dd657 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java @@ -19,10 +19,10 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.JetReturnExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetReturnExpression; import org.jetbrains.jet.plugin.intentions.Transformer; public enum UnfoldableKind implements Transformer { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt index 1846c6c6286..b6000bdf34f 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt @@ -16,10 +16,10 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiUnparsingUtils.* -import org.jetbrains.jet.lang.psi.psiUtil.* +import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils.* +import org.jetbrains.kotlin.psi.psiUtil.* import java.util.ArrayList import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.PsiWhiteSpace diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt index a61f6ccb02e..f3959fc4a5a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetPostfixExpression +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPostfixExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable import org.jetbrains.jet.plugin.intentions.JetTypeLookupExpression import com.intellij.codeInsight.template.TemplateEditingAdapter @@ -28,9 +28,9 @@ import com.intellij.codeInsight.template.impl.TemplateManagerImpl import com.intellij.codeInsight.template.Template import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition -import org.jetbrains.jet.lang.psi.JetThrowExpression +import org.jetbrains.kotlin.psi.JetThrowExpression import com.intellij.codeInsight.template.TemplateBuilderImpl import com.intellij.psi.PsiDocumentManager import org.apache.commons.lang.StringEscapeUtils.escapeJava diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt index 16b735aefa0..4f362afb2ad 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import org.jetbrains.jet.plugin.intentions.branchedTransformations.* -import org.jetbrains.jet.lang.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor public class EliminateWhenSubjectIntention : JetSelfTargetingIntention("eliminate.when.subject", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt index 559ebd6de92..245c383cc1c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt index e64974e67db..6de328c3460 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import org.jetbrains.jet.plugin.intentions.branchedTransformations.* -import org.jetbrains.jet.lang.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor public class FlattenWhenIntention : JetSelfTargetingIntention("flatten.when", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt index 5db3b8f4951..2ebe8787a89 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import org.jetbrains.jet.plugin.intentions.branchedTransformations.BranchedFoldingUtils import org.jetbrains.jet.plugin.intentions.branchedTransformations.FoldableKind import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetWhenExpression public open class FoldBranchedExpressionIntention( val kind: FoldableKind, elementType: Class diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt index 80a9e309038..787a52b717d 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt @@ -18,18 +18,18 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.intentions.branchedTransformations.evaluatesTo import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull import org.jetbrains.jet.plugin.intentions.branchedTransformations.getNonNullExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.replace import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable -import org.jetbrains.jet.lang.psi.JetPostfixExpression +import org.jetbrains.kotlin.psi.JetPostfixExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineBaseExpressionIfApplicableWithPrompt import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle -import org.jetbrains.jet.lang.psi.JetThrowExpression +import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpressionOrEmptyBlock import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt index 30814a57983..ded398c4c04 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle import org.jetbrains.jet.plugin.intentions.branchedTransformations.evaluatesTo @@ -30,9 +30,9 @@ import org.jetbrains.jet.plugin.intentions.branchedTransformations.replace import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineLeftSideIfApplicableWithPrompt import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments -import org.jetbrains.jet.lang.psi.JetThrowExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetThrowExpression +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetExpression public class IfThenToElvisIntention : JetSelfTargetingIntention("if.then.to.elvis", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt index 07fdc7ee7f6..3df8ba83adf 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt @@ -18,17 +18,17 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull import org.jetbrains.jet.plugin.intentions.branchedTransformations.getNonNullExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpressionOrEmptyBlock import org.jetbrains.jet.plugin.intentions.branchedTransformations.replace -import org.jetbrains.jet.lang.psi.JetSafeQualifiedExpression +import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineReceiverIfApplicableWithPrompt diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.kt index e9520acd9d7..72590027832 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.jet.lang.psi.JetWhenExpression -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.intentions.branchedTransformations.* diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt index 552d6696273..503ef5330ce 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import org.jetbrains.jet.plugin.intentions.branchedTransformations.* -import org.jetbrains.jet.lang.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor public class IntroduceWhenSubjectIntention : JetSelfTargetingIntention("introduce.when.subject", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/MergeWhenIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/MergeWhenIntention.kt index cbd6979e8f4..c9836c1900d 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/MergeWhenIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/MergeWhenIntention.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import org.jetbrains.jet.plugin.intentions.branchedTransformations.* -import org.jetbrains.jet.lang.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor public class MergeWhenIntention : JetSelfTargetingIntention("merge.when", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt index af065ba0981..5fbf2dc7cf2 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt @@ -16,15 +16,15 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions -import org.jetbrains.jet.lang.psi.JetSafeQualifiedExpression +import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStatement diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt index 95c236846c2..bafb71cebbc 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.* import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetReturnExpression -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetReturnExpression +import org.jetbrains.kotlin.psi.JetProperty public open class UnfoldBranchedExpressionIntention( val kind: UnfoldableKind, elementType: Class diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.kt index d0cc5b2a9d8..d171e954180 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.jet.lang.psi.JetWhenExpression -import org.jetbrains.jet.lang.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetWhenExpression +import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.intentions.branchedTransformations.* diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java index c2d7c885f36..cce557e7c33 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; @@ -42,7 +42,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.DECLARATION_TO_DESCRIPTOR; public class ConvertMemberToExtension extends BaseIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java index 124a9cff38d..78ed2cc847d 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java @@ -19,14 +19,14 @@ package org.jetbrains.jet.plugin.intentions.declarations; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class DeclarationUtils { private DeclarationUtils() { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.kt index 0ba955aeb7e..8e0b1a2b268 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.intentions.declarations import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention public class SplitPropertyDeclarationIntention : JetSelfTargetingIntention("split.property.declaration", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java index cf9b491f0ae..80eaa42c1da 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java @@ -42,7 +42,7 @@ 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.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.InfinitePeriodicalTask; import org.jetbrains.jet.plugin.util.LongRunningReadTask; diff --git a/idea/src/org/jetbrains/jet/plugin/internal/Location.java b/idea/src/org/jetbrains/jet/plugin/internal/Location.java index 387d9399783..1de18718eb4 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/Location.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/Location.java @@ -23,7 +23,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; public class Location { @Nullable diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt b/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt index 1647c3b4f44..7f8a8fe8b88 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt +++ b/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.j2k import org.jetbrains.kotlin.j2k.ResolverForConverter -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor public object IdeaResolverForConverter : ResolverForConverter { diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt index 045ae47f801..714e3e9b041 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.j2k import org.jetbrains.kotlin.j2k.PostProcessor -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult diff --git a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt b/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt index b1add2a7335..05f61178b75 100644 --- a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt @@ -19,13 +19,13 @@ package org.jetbrains.jet.plugin.joinLines import com.intellij.codeInsight.editorActions.JoinRawLinesHandlerDelegate import com.intellij.openapi.editor.Document import com.intellij.psi.PsiFile -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.lang.psi.JetContainerNode -import org.jetbrains.jet.lang.psi.JetWhenEntry -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetContainerNode +import org.jetbrains.kotlin.psi.JetWhenEntry +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetPsiFactory public class JoinBlockIntoSingleStatementHandler : JoinRawLinesHandlerDelegate { override fun tryJoinRawLines(document: Document, file: PsiFile, start: Int, end: Int): Int { diff --git a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt b/idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt index c1233fd6eae..0d98cf35e13 100644 --- a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt @@ -16,16 +16,16 @@ package org.jetbrains.jet.plugin.joinLines -import org.jetbrains.jet.lang.psi.psiUtil.siblings -import org.jetbrains.jet.lang.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.psiUtil.parents import com.intellij.codeInsight.editorActions.JoinRawLinesHandlerDelegate import com.intellij.openapi.editor.Document import com.intellij.psi.PsiFile -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiComment import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java index 6997495eac5..08afba03d56 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java @@ -43,7 +43,7 @@ import com.intellij.testFramework.LightVirtualFile; import com.intellij.ui.awt.RelativePoint; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.plugin.JetFileType; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java index ddac28bd949..3428c8998af 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java @@ -27,7 +27,7 @@ import com.intellij.psi.util.PsiUtilBase; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/KotlinShortenFQNamesProcessor.kt b/idea/src/org/jetbrains/jet/plugin/liveTemplates/KotlinShortenFQNamesProcessor.kt index a1adfea0ca7..ae0c1f75bbd 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/KotlinShortenFQNamesProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/KotlinShortenFQNamesProcessor.kt @@ -26,7 +26,7 @@ import com.intellij.codeInsight.CodeInsightBundle import com.intellij.psi.PsiDocumentManager import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import com.intellij.psi.util.PsiUtilBase -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile public class KotlinShortenFQNamesProcessor : TemplateOptionalProcessor { override fun processText(project: Project, template: Template, document: Document, templateRange: RangeMarker, editor: Editor) { @@ -50,4 +50,4 @@ public class KotlinShortenFQNamesProcessor : TemplateOptionalProcessor { } override fun isVisible(template: Template) = false -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java index 4232a9da599..0d7ce0f447d 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassKind; import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java index 087791cb5bc..5cc1b790ad6 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java index 6b9956671c6..e373f2de2f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java @@ -33,8 +33,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassKind; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java index a171a3c761f..60db6ab7bf8 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java @@ -22,8 +22,8 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFunction; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetFunction; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.plugin.JetBundle; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java index a516c2083fe..54809eca1f9 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java @@ -34,8 +34,8 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.JetVisibilityChecker; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java index 682c63b00cd..d9ca2f45ffa 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; -import org.jetbrains.jet.lang.psi.JetClass; +import org.jetbrains.kotlin.psi.JetClass; public class JetClassPresenter implements ItemPresentationProvider { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java index e4d317f7402..776e718660e 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.presentation; import com.intellij.navigation.ColoredItemPresentation; import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.TextAttributesKey; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; -import org.jetbrains.jet.lang.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetIconProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java index 7371a1a8708..17111dabb9f 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java @@ -22,9 +22,9 @@ import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetObjectPresenter.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetObjectPresenter.java index 55f821bd845..dbdec273318 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetObjectPresenter.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetObjectPresenter.java @@ -18,11 +18,11 @@ package org.jetbrains.jet.plugin.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; public class JetObjectPresenter implements ItemPresentationProvider { @Override public ItemPresentation getPresentation(JetObjectDeclaration item) { return new JetDefaultNamedDeclarationPresentation(item); } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetParameterPresenter.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetParameterPresenter.java index 54b34f3be1a..fa0e748690a 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetParameterPresenter.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetParameterPresenter.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetParameter; public class JetParameterPresenter implements ItemPresentationProvider { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetPropertyPresenter.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetPropertyPresenter.java index cd141b8d50b..26afc54b61d 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetPropertyPresenter.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetPropertyPresenter.java @@ -18,11 +18,11 @@ package org.jetbrains.jet.plugin.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetProperty; public class JetPropertyPresenter implements ItemPresentationProvider { @Override public ItemPresentation getPresentation(JetProperty item) { return new JetDefaultNamedDeclarationPresentation(item); } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java index ea63c6435ec..b8f7f1986c3 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.project; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.stubindex.JetExactPackagesIndex; import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java index 19d7669a6c7..a9acd37f35a 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java +++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java @@ -22,8 +22,8 @@ import com.intellij.ide.projectView.impl.nodes.AbstractPsiBasedNode; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import org.jetbrains.jet.lang.psi.JetClassObject; -import org.jetbrains.jet.lang.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetClassObject; +import org.jetbrains.kotlin.psi.JetPsiUtil; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java index 6ab926752de..51a7cfb407c 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java +++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java @@ -23,9 +23,9 @@ import com.intellij.ide.projectView.impl.nodes.AbstractPsiBasedNode; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.jet.plugin.JetIconProvider; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java index ed177bd0ab4..4b9882b607c 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java +++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java @@ -23,7 +23,7 @@ import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java index d2b65995dfe..d74570d3346 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java +++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java @@ -20,9 +20,9 @@ import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.projectView.impl.nodes.PsiFileNode; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java index edb3fc28fc6..5b5ee1c2e50 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java @@ -26,10 +26,10 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import org.jetbrains.jet.lang.psi.JetClassBody; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassBody; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetIconProvider; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java index 654ecd79e27..85d0a848c50 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java @@ -21,9 +21,9 @@ import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import org.jetbrains.jet.lang.psi.JetClassObject; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetClassObject; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDeclaration; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java index e5e6993f528..686255a3263 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java @@ -26,12 +26,12 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetFunction; -import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFunction; +import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class AddFunctionBodyFix extends JetIntentionAction { public AddFunctionBodyFix(@NotNull JetFunction element) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java index d87defa07f9..d50800cbde8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java @@ -27,10 +27,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetCallElement; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetCallElement; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java index 634b9258835..79d72d0ab27 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java @@ -26,8 +26,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java index 27fd3a22276..a89bf422391 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java @@ -24,9 +24,9 @@ import com.intellij.psi.PsiNameIdentifierOwner; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetModifierListOwner; -import org.jetbrains.jet.lang.psi.JetPropertyAccessor; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetModifierListOwner; +import org.jetbrains.kotlin.psi.JetPropertyAccessor; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java index a255a743f28..f20f46b8ad9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java @@ -33,10 +33,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetCallElement; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetValueArgument; +import org.jetbrains.kotlin.psi.JetCallElement; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetValueArgument; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; @@ -51,7 +51,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class AddNameToArgumentFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java index 0a33f20cc85..5e1ccf3c8d1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java @@ -27,10 +27,10 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java index 967077ae60b..d3e5e3832cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.PluginJetFilesProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java index d98e84843f3..d475e8c30a2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java @@ -23,10 +23,10 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class AddSemicolonAfterFunctionCallFix extends JetIntentionAction { private final JetFunctionLiteralArgument functionLiteralArgument; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java index c13375caccc..e9342742e76 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java @@ -27,11 +27,11 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.expressions.TypeReconstructionUtil; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class AddStarProjectionsFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java index 498db49b6b5..49ada17812c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java @@ -27,13 +27,13 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPsiFactory; -import org.jetbrains.jet.lang.psi.JetWhenEntry; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetWhenEntry; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class AddWhenElseBranchFix extends JetIntentionAction { private static final String ELSE_ENTRY_TEXT = "else -> {}"; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt index 40428e36485..093c14a0a86 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt @@ -27,11 +27,11 @@ import com.intellij.psi.PsiFile import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.PsiShortNamesCache import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.psiUtil.* +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.jet.lang.resolve.name.FqName diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java index f53aa8393ee..0f7590520bf 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; @@ -34,7 +34,7 @@ import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class CastExpressionFix extends JetIntentionAction { private final JetType type; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java index 22f1ee6ae81..0c27455c65c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java @@ -24,12 +24,12 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeAccessorTypeFix extends JetIntentionAction { private JetType type; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java index 29a9e7b5a74..c3fc3795e0a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; @@ -43,7 +43,7 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import java.util.LinkedList; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction { private final JetType type; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java index d963214ccc5..90b3b8cc7bd 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetFunctionLiteral; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFunctionLiteral; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java index a8246917856..5f57248bcb2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; @@ -48,7 +48,7 @@ import java.util.LinkedList; import java.util.List; import static org.jetbrains.jet.lang.diagnostics.Errors.COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeFunctionReturnTypeFix extends JetIntentionAction { private final JetType type; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java index f10a4d180d0..ba16e815136 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index e489c013bac..4f681b6aca5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -38,7 +38,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.FunctionDescriptorUtil; import org.jetbrains.jet.lang.resolve.VisibilityUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java index 49754580f25..538ad7de86a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java @@ -22,16 +22,16 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeParameterTypeFix extends JetIntentionAction { private final JetType type; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java index 8d03981d6f2..87d59427974 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java @@ -22,10 +22,10 @@ import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeToBackingFieldFix extends JetIntentionAction { public ChangeToBackingFieldFix(@NotNull JetSimpleNameExpression element) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java index c08d21b068d..a242df90ab1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; @@ -34,7 +34,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeToConstructorInvocationFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java index e36aa569e39..bae6228adde 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java @@ -21,11 +21,11 @@ import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeToFunctionInvocationFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java index 056882ac686..4583359bb17 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java @@ -22,10 +22,10 @@ import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeToPropertyNameFix extends JetIntentionAction { public ChangeToPropertyNameFix(@NotNull JetSimpleNameExpression element) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java index 52d6cab2af2..a981e73ac58 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java @@ -22,14 +22,14 @@ import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetTypeElement; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetTypeElement; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.types.expressions.TypeReconstructionUtil; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeToStarProjectionFix extends JetIntentionAction { public ChangeToStarProjectionFix(@NotNull JetTypeElement element) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java index dacac964580..64c7c159496 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java @@ -25,16 +25,16 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeTypeFix extends JetIntentionAction { private final JetType type; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java index 0b78ce33dbc..fd57f44fc6a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java @@ -25,16 +25,16 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeVariableMutabilityFix implements IntentionAction { private boolean isVar; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java index e71c89d201a..dc4983ee424 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; @@ -44,7 +44,7 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import java.util.LinkedList; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ChangeVariableTypeFix extends JetIntentionAction { private final static Logger LOG = Logger.getInstance(ChangeVariableTypeFix.class); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java index 906d266b087..1dbc2332000 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java @@ -28,9 +28,9 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.Visibilities; import org.jetbrains.jet.lang.descriptors.Visibility; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetModifierListOwner; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetModifierListOwner; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java index 727e5587a48..a94a664ba03 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java @@ -27,14 +27,14 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPostfixExpression; -import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPostfixExpression; +import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @SuppressWarnings("IntentionDescriptionNotFoundInspection") public class ExclExclCallFix implements IntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java index d5e0212d72c..151404b5ccc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.actions.OptimizeImportsProcessor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ImportInsertHelperImpl extends ImportInsertHelper { /** diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java b/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java index 01195bf51cb..2cdce1fe87e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java @@ -24,8 +24,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetCodeFragment; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetCodeFragment; +import org.jetbrains.kotlin.psi.JetFile; public abstract class JetIntentionAction implements IntentionAction { protected @NotNull T element; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java index 9285faa086a..80d5a89d2ce 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java @@ -27,7 +27,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; import static org.jetbrains.kotlin.lexer.JetTokens.ANNOTATION_KEYWORD; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java index e555a492734..51a55c2614c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java @@ -30,9 +30,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetCallableDeclaration; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetCallableDeclaration; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java index 2930b95d5f6..33282a4f7bf 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; @@ -45,7 +45,7 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class MapPlatformClassToKotlinFix extends JetIntentionAction { private static final String PRIMARY_USAGE = "PrimaryUsage"; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java index 7977b0e8eaf..f43ee88bd07 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java @@ -26,13 +26,13 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPsiUtil; -import org.jetbrains.jet.lang.psi.JetWhenEntry; -import org.jetbrains.jet.lang.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetWhenEntry; +import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class MoveWhenElseBranchFix extends JetIntentionAction { public MoveWhenElseBranchFix(@NotNull JetWhenExpression element) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java index db228ccf6e7..533ec588c73 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java index 8e12df4ee77..eed685c3979 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.quickfix; -import org.jetbrains.jet.lang.psi.JetClass; +import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler; import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.*; import org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index 20b42f0cb27..e4d1e8e0515 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java index 5f12ce7f7b4..1c779fa73da 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java @@ -26,9 +26,9 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetFunction; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFunction; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java index 7d8dd7f1949..a181c99a765 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java index 18ca8d52366..410c5bd20f4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java @@ -26,7 +26,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java index bf82e2fcef0..40d87f5e041 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java @@ -21,9 +21,9 @@ import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNullableType; -import org.jetbrains.jet.lang.psi.JetTypeElement; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNullableType; +import org.jetbrains.kotlin.psi.JetTypeElement; import org.jetbrains.jet.plugin.JetBundle; public class RemoveNullableFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java index 55b22fdb73b..680408e59ee 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java @@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java index a88207c5799..f563126c73e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java @@ -23,7 +23,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java index 67549c87ba9..b7a22894527 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java @@ -21,10 +21,10 @@ import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetBundle; public class RemoveRightPartOfBinaryExpressionFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java index f609daaf469..46e02ec7a7b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java @@ -24,8 +24,8 @@ import com.intellij.psi.impl.PsiImplUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetDelegationSpecifier; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetDelegationSpecifier; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java index 2b11aa09870..0942e3f5cf8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java @@ -25,9 +25,9 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.jet.plugin.JetBundle; public class RemoveValVarFromParameterFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java index 6a945768cfe..b7b5a0787dc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java @@ -27,8 +27,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java index 153116c16d8..c9453db93ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java @@ -24,10 +24,10 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ReplaceCallFix implements IntentionAction { private final boolean toSafe; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java index 10f4f84fbf5..d39103a8419 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java @@ -22,13 +22,13 @@ import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetQualifiedExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetQualifiedExpression; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class ReplaceInfixCallFix extends JetIntentionAction { public ReplaceInfixCallFix(@NotNull JetBinaryExpression element) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java index 0de67ed34f2..fc5731b3888 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java @@ -21,10 +21,10 @@ import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public abstract class ReplaceOperationInBinaryExpressionFix extends JetIntentionAction { private final String operation; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java index 84970bb5b4e..ddddeec810d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java @@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index c4d3e70f20f..9faf266f85d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -29,7 +29,7 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.IncorrectOperationException import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.name.Name @@ -66,7 +66,7 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind import org.jetbrains.jet.plugin.util.isAny import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.psiUtil.siblings import org.jetbrains.jet.plugin.refactoring.getLineCount private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList" diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt index 9a80731b547..137c109d50c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder import java.util.Collections -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.JetType import kotlin.properties.Delegates @@ -12,8 +12,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.util.supertypes import org.jetbrains.jet.lang.types.ErrorUtils import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassInfo import org.jetbrains.jet.plugin.util.makeNotNullable @@ -143,4 +143,4 @@ class PropertyInfo(name: String, ) : CallableInfo(name, receiverTypeInfo, returnTypeInfo, possibleContainers, typeParameterInfos) { override val kind: CallableKind get() = CallableKind.PROPERTY override val parameterInfos: List get() = Collections.emptyList() -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt index 8d4da8f8c04..6c6fe04b047 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt @@ -7,24 +7,24 @@ import com.intellij.codeInsight.template.TextResult import com.intellij.codeInsight.lookup.LookupElement import java.util.LinkedHashSet import com.intellij.psi.PsiDocumentManager -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetParameter +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetParameter import java.util.HashSet import org.jetbrains.jet.plugin.refactoring.CollectingValidator import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetCallableDeclaration import java.util.Collections import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.ClassKind -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetParameterList -import org.jetbrains.jet.lang.psi.JetNamedDeclaration -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.JetParameterList +import org.jetbrains.kotlin.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType /** * Special Expression for parameter names based on its type. @@ -183,4 +183,4 @@ private object ValVarExpression: Expression() { override fun calculateQuickResult(context: ExpressionContext?): Result? = calculateResult(context) override fun calculateLookupItems(context: ExpressionContext?): Array? = cachedLookupElements -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 545c8979b66..28efa9143ce 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -6,13 +6,13 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope import java.util.LinkedHashSet -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetTypeConstraint -import org.jetbrains.jet.lang.psi.JetMultiDeclarationEntry -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetVariableDeclaration -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetTypeConstraint +import org.jetbrains.kotlin.psi.JetMultiDeclarationEntry +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetVariableDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import com.intellij.refactoring.psi.SearchUtils import org.jetbrains.jet.plugin.references.JetSimpleNameReference import java.util.HashSet @@ -22,20 +22,20 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.TypeProjectionImpl import org.jetbrains.jet.lang.types.JetTypeImpl -import org.jetbrains.jet.lang.psi.psiUtil.getAssignmentByLHS +import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.jet.lang.resolve.bindingContextUtil.isUsedAsStatement import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetPropertyDelegate -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetPropertyDelegate +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils import org.jetbrains.jet.lang.resolve.name.FqName import kotlin.properties.Delegates import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.jet.plugin.util.makeNotNullable -import org.jetbrains.jet.lang.psi.JetAnnotationEntry -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType private fun JetType.contains(inner: JetType): Boolean { return JetTypeChecker.DEFAULT.equalTypes(this, inner) || getArguments().any { inner in it.getType() } @@ -222,4 +222,4 @@ private fun JetType.substitute(substitution: JetTypeSubstitution, variance: Vari } } -fun JetExpression.getExpressionForTypeGuess() = getAssignmentByLHS()?.getRight() ?: this \ No newline at end of file +fun JetExpression.getExpressionForTypeGuess() = getAssignmentByLHS()?.getRight() ?: this diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt index b551e6b958c..d830b06ada3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt @@ -8,14 +8,14 @@ import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetAnnotationEntry -import org.jetbrains.jet.lang.psi.JetUserType +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.JetUserType import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall -import org.jetbrains.jet.lang.psi.JetCallElement -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor -import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression +import org.jetbrains.kotlin.psi.JetDelegatorToSuperCall +import org.jetbrains.kotlin.psi.JetCallElement +import org.jetbrains.kotlin.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression import java.util.Collections import org.jetbrains.jet.plugin.caches.resolve.analyze @@ -73,4 +73,4 @@ public object CreateClassFromCallWithConstructorCalleeActionFactory : JetSingleI ) return CreateClassFromUsageFix(callElement, classInfo) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt index 9a1ab265a11..30035b27d79 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt @@ -2,11 +2,11 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetTypeReference -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.lang.types.Variance @@ -14,8 +14,8 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetAnnotationEntry import java.util.Collections public object CreateClassFromConstructorCallActionFactory: JetSingleIntentionActionFactory() { @@ -78,4 +78,4 @@ public object CreateClassFromConstructorCallActionFactory: JetSingleIntentionAct ) return CreateClassFromUsageFix(callExpr, classInfo) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt index 09e7d4c92bf..e1f28d1fd08 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt @@ -2,27 +2,27 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetTypeReference import java.util.Collections import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.psi.psiUtil.getAssignmentByLHS -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetImportDirective +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetImportDirective import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo -import org.jetbrains.jet.lang.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.JetReferenceExpression import java.util.Arrays -import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression -import org.jetbrains.jet.lang.psi.psiUtil.isDotReceiver +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.psiUtil.isDotReceiver import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import org.jetbrains.jet.lang.resolve.name.FqName diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt index c36bdfe7541..f40d8f7e46c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt @@ -5,13 +5,13 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import java.util.Collections -import org.jetbrains.jet.lang.psi.JetUserType -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetUserType +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass -import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression +import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass +import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt index 416089b8d9a..1dd10dff6ee 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt @@ -17,11 +17,11 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.JetBundle import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.PsiElement import com.intellij.psi.PsiDirectory import org.jetbrains.jet.plugin.JetFileType @@ -118,4 +118,4 @@ public class CreateClassFromUsageFix( CommandProcessor.getInstance().executeCommand(project, { builder.build() }, getText(), null) } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt index 1707dfe0f0d..6871dd3be23 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt @@ -1,13 +1,13 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import com.intellij.psi.JavaPsiFacade -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.ModuleDescriptor @@ -16,14 +16,14 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.psi.Call +import org.jetbrains.kotlin.psi.Call import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.receivers.Qualifier import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.noSubstitutions import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix import org.jetbrains.jet.plugin.quickfix.DelegatingIntentionAction import org.jetbrains.jet.plugin.JetBundle @@ -113,4 +113,4 @@ private fun JetSimpleNameExpression.getCreatePackageFixIfApplicable(targetParent override fun getText(): String = JetBundle.message("create.0.from.usage", "package '${fullName}'") } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt index f4a094800ad..8cd7dd42727 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt @@ -3,7 +3,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.jet.lang.types.Variance diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt index d86f51b49fa..80bb7ac7a09 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt @@ -1,22 +1,22 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.JetBundle import com.intellij.openapi.project.Project import com.intellij.openapi.command.CommandProcessor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.plugin.refactoring.chooseContainerElementIfNecessary -import org.jetbrains.jet.lang.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import java.util.HashSet -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement public class CreateCallableFromUsageFix( originalExpression: JetExpression, diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt index 60b77ba454e..3e0584ce81a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt @@ -6,8 +6,8 @@ import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.lang.resolve.dataClassUtils.* import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetMultiDeclaration -import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetMultiDeclaration +import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* @@ -36,4 +36,4 @@ object CreateComponentFunctionActionFactory : JetSingleIntentionActionFactory() return CreateCallableFromUsageFix(multiDeclaration!!, FunctionInfo(name.getIdentifier(), ownerType, returnType)) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt index 2bfc9b973e4..0307c37994d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt @@ -3,28 +3,28 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.receivers.Qualifier import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetExpression import java.util.Collections import org.jetbrains.jet.plugin.refactoring.getExtractionContainers -import org.jetbrains.jet.lang.psi.JetClassBody -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.psiUtil.getAssignmentByLHS +import org.jetbrains.kotlin.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetTypeReference import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetAnnotationEntry +import org.jetbrains.kotlin.psi.JetAnnotationEntry import org.jetbrains.jet.plugin.caches.resolve.analyze object CreateFunctionOrPropertyFromCallActionFactory : JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt index ad2c4f6fe97..73a0e763b80 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt @@ -4,7 +4,7 @@ import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression +import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import java.util.Collections @@ -22,4 +22,4 @@ object CreateGetFunctionActionFactory : JetSingleIntentionActionFactory() { val returnType = TypeInfo(accessExpr, Variance.OUT_VARIANCE) return CreateCallableFromUsageFix(accessExpr, FunctionInfo("get", arrayType, returnType, Collections.emptyList(), parameters)) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt index b76929fb4cd..6ed5488485b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt @@ -7,7 +7,7 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* @@ -20,4 +20,4 @@ object CreateHasNextFunctionActionFactory : JetSingleIntentionActionFactory() { val returnType = TypeInfo(KotlinBuiltIns.getInstance().getBooleanType(), Variance.OUT_VARIANCE) return CreateCallableFromUsageFix(forExpr, FunctionInfo("hasNext", ownerType, returnType)) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt index 1ee69155472..41b4e3f3112 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt @@ -4,9 +4,9 @@ import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression +import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt index 852f2c70010..182ca9f232c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt @@ -3,10 +3,10 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetForExpression -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.caches.resolve.analyzeFully diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt index 51f992050e4..b222f26e16b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt @@ -3,12 +3,12 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateNextFunctionActionFactory : JetSingleIntentionActionFactory() { @@ -21,4 +21,4 @@ object CreateNextFunctionActionFactory : JetSingleIntentionActionFactory() { val returnType = TypeInfo(variableExpr, Variance.OUT_VARIANCE) return CreateCallableFromUsageFix(forExpr, FunctionInfo("next", ownerType, returnType)) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt index 9a074af255e..1b43f756c1c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt @@ -7,11 +7,11 @@ import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInf import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.FunctionInfo -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallableInfo import com.intellij.util.SmartList @@ -65,4 +65,4 @@ object CreatePropertyDelegateAccessorsActionFactory : JetSingleIntentionActionFa return CreateCallableFromUsageFix(expression, callableInfos) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt index c988eb481e2..0295fca8c80 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt @@ -4,15 +4,15 @@ import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression +import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.jet.lang.types.Variance import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import java.util.Collections -import org.jetbrains.jet.lang.psi.JetOperationExpression -import org.jetbrains.jet.lang.psi.JetUnaryExpression +import org.jetbrains.kotlin.psi.JetOperationExpression +import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.types.ErrorUtils @@ -49,4 +49,4 @@ object CreateSetFunctionActionFactory : JetSingleIntentionActionFactory() { val returnType = TypeInfo(builtIns.getUnitType(), Variance.OUT_VARIANCE) return CreateCallableFromUsageFix(accessExpr, FunctionInfo("set", arrayType, returnType, Collections.emptyList(), parameters)) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt index 813b2d42227..dcf6f21b403 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt @@ -3,13 +3,13 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.Variance import java.util.Collections -import org.jetbrains.jet.lang.psi.JetUnaryExpression +import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* public object CreateUnaryOperationActionFactory: JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt index 58482adbb3d..91115b0f131 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt @@ -4,28 +4,28 @@ import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.jet.plugin.JetBundle import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElement -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement +import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallableBuilderConfiguration import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.createBuilder import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallablePlacement import com.intellij.openapi.command.CommandProcessor -import org.jetbrains.jet.lang.psi.psiUtil.parents -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.intentions.ConvertToBlockBodyAction -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.plugin.refactoring.getExtractionContainers -import org.jetbrains.jet.lang.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.PropertyInfo -import org.jetbrains.jet.lang.psi.psiUtil.getAssignmentByLHS +import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt index dac2e7e02f5..96134013568 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt @@ -1,36 +1,36 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElement -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement +import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetClassInitializer -import org.jetbrains.jet.lang.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetPropertyAccessor +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetClassInitializer +import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getTypeParameters import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes import java.util.LinkedHashSet import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor import org.jetbrains.jet.plugin.refactoring.changeSignature.JetValVar -import org.jetbrains.jet.lang.psi.JetEnumEntry -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetEnumEntry +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.psiUtil.getAssignmentByLHS +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt index 1ce493e18db..e64bad67421 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt @@ -19,20 +19,20 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo -import org.jetbrains.jet.lang.psi.JetValueArgument -import org.jetbrains.jet.lang.psi.JetCallElement -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.JetValueArgument +import org.jetbrains.kotlin.psi.JetCallElement +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.refactoring.canRefactor -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.jet.lang.descriptors.FunctionDescriptor public object CreateParameterByNamedArgumentActionFactory: JetSingleIntentionActionFactory() { @@ -66,4 +66,4 @@ public object CreateParameterByNamedArgumentActionFactory: JetSingleIntentionAct ) return CreateParameterFromUsageFix(functionDescriptor, context, parameterInfo, argument) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt index 64d53e8f79e..7d44c46408c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.jet.plugin.JetBundle import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData import org.jetbrains.jet.lang.resolve.BindingContext @@ -51,4 +51,4 @@ public class CreateParameterFromUsageFix( runChangeSignature(project, functionDescriptor, config, bindingContext, defaultValueContext, getText()) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java index 9c53d99e991..6d286515ebb 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.ErrorUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java index 3d1ab7907d4..b4fef74f39b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java @@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.refactoring; import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetVisitorVoid; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetVisitorVoid; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java index 19e70ad1b9b..e6099266b10 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java @@ -22,7 +22,7 @@ import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.changeSignature.ChangeSignatureHandler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureHandler; import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractKotlinFunctionHandler; import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java index 52094b8f7c8..b82a36e1874 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java @@ -39,8 +39,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt index 28e8141be80..a9a691c97c7 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.asJava.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.jet.lang.descriptors.Visibility -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt index 96ec3e8a152..e2c02a18a5d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java index eb85baf41e3..27122065c83 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java @@ -52,7 +52,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.Visibilities; import org.jetbrains.jet.lang.descriptors.Visibility; -import org.jetbrains.jet.lang.psi.JetTypeCodeFragment; +import org.jetbrains.kotlin.psi.JetTypeCodeFragment; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; @@ -66,7 +66,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetChangeSignatureDialog extends ChangeSignatureDialogBase< JetParameterInfo, diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java index 8206a134605..6a43519ed05 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index 6b9868d0fc9..6866095f14b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java index d017c46b1cc..ad3222bc551 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java @@ -23,10 +23,10 @@ import com.intellij.refactoring.changeSignature.ParameterTableModelBase; import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import com.intellij.util.ui.ColumnInfo; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.jet.plugin.JetFileType; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetFunctionParameterTableModel extends ParameterTableModelBase> { private final Project project; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt index 632ec893962..875ad8de158 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt @@ -18,15 +18,15 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature import com.intellij.lang.ASTNode import com.intellij.refactoring.changeSignature.ParameterInfo -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetModifierList +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetModifierList public class JetParameterInfo( val originalIndex: Int = -1, @@ -128,4 +128,4 @@ public class JetParameterInfo( return buffer.toString() } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt index fe3336a8467..04f60d6b75f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature.usages -import org.jetbrains.jet.lang.psi.JetCallElement +import org.jetbrains.kotlin.psi.JetCallElement import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeInfo import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetFunction +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.jet.lang.descriptors.FunctionDescriptor public abstract class JavaMethodKotlinUsageWithDelegate( diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt index 6387990a915..44d5a91482f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature.usages -import org.jetbrains.jet.lang.psi.JetEnumEntry +import org.jetbrains.kotlin.psi.JetEnumEntry import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeInfo -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.JetDelegatorToSuperCall +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class JetEnumEntryWithoutSuperCallUsage(enumEntry: JetEnumEntry) : JetUsageInfo(enumEntry) { override fun processUsage(changeInfo: JetChangeInfo, element: JetEnumEntry): Boolean { @@ -41,4 +41,4 @@ public class JetEnumEntryWithoutSuperCallUsage(enumEntry: JetEnumEntry) : JetUsa return true } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionCallUsage.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionCallUsage.java index 0d0566a6cf7..c859c5ae6fd 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionCallUsage.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionCallUsage.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature.usages; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeInfo; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo; @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetFunctionCallUsage extends JetUsageInfo { private final JetFunctionDefinitionUsage callee; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java index ec01afbf915..3c66b789dd3 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.types.JetType; @@ -47,7 +47,7 @@ import org.jetbrains.jet.plugin.refactoring.changeSignature.JetValVar; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetFunctionDefinitionUsage extends JetUsageInfo { @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetParameterUsage.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetParameterUsage.java index a595c49042b..c4ebf9a0a59 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetParameterUsage.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetParameterUsage.java @@ -17,11 +17,11 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature.usages; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeInfo; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class JetParameterUsage extends JetUsageInfo { private final JetParameterInfo parameterInfo; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt index b8b28be2748..4b26b086a06 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.lang.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.types.JetType diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java index 07eb2df077b..94370977924 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.refactoring.copy.CopyFilesOrDirectoriesHandler; import com.intellij.refactoring.copy.CopyHandlerDelegateBase; -import org.jetbrains.jet.lang.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.jet.plugin.refactoring.move.moveFilesOrDirectories.KotlinMoveFilesOrDirectoriesHandler; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractFunctionAction.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractFunctionAction.kt index 5ab8f34a28a..14cf3fcb7ba 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractFunctionAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractFunctionAction.kt @@ -20,7 +20,7 @@ import com.intellij.refactoring.actions.BasePlatformRefactoringAction import com.intellij.psi.PsiElement import com.intellij.refactoring.RefactoringActionHandler import com.intellij.lang.refactoring.RefactoringSupportProvider -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider public abstract class AbstractExtractFunctionAction: BasePlatformRefactoringAction() { @@ -42,4 +42,4 @@ public class ExtractFunctionAction: AbstractExtractFunctionAction() { public class ExtractFunctionToScopeAction: AbstractExtractFunctionAction() { override fun getRefactoringHandler(provider: RefactoringSupportProvider): RefactoringActionHandler? = (provider as? JetRefactoringSupportProvider)?.getExtractFunctionToScopeHandler() -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt index 121c8590e69..17dc108ac35 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt @@ -28,14 +28,14 @@ import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil import com.intellij.refactoring.HelpID import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle import org.jetbrains.jet.plugin.refactoring.extractFunction.ui.KotlinExtractFunctionDialog -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.jet.lang.psi.psiUtil.getOutermostParentContainedIn +import org.jetbrains.kotlin.psi.psiUtil.getOutermostParentContainedIn import org.jetbrains.jet.plugin.refactoring.checkConflictsInteractively import org.jetbrains.jet.plugin.util.application.executeWriteCommand -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetBlockExpression import kotlin.test.fail import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status import com.intellij.openapi.ui.popup.JBPopupFactory @@ -44,7 +44,7 @@ import javax.swing.event.HyperlinkEvent import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.ui.awt.RelativePoint import com.intellij.openapi.ui.popup.Balloon.Position -import org.jetbrains.jet.lang.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange import org.jetbrains.jet.plugin.refactoring.chooseContainerElementIfNecessary import org.jetbrains.jet.plugin.refactoring.getExtractionContainers diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt index 58da00bfa4d..6457a46de00 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt @@ -17,30 +17,30 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import com.intellij.util.containers.MultiMap import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetThisExpression +import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.jet.plugin.references.JetSimpleNameReference import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode -import org.jetbrains.jet.lang.psi.psiUtil.replaced -import org.jetbrains.jet.lang.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.psi.JetTypeParameter -import org.jetbrains.jet.lang.psi.JetTypeConstraint +import org.jetbrains.kotlin.psi.psiUtil.replaced +import org.jetbrains.kotlin.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.JetTypeConstraint import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.ErrorMessage import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.openapi.util.text.StringUtil -import org.jetbrains.jet.lang.psi.JetClassBody -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.types.CommonSupertypes import org.jetbrains.jet.lang.types.TypeSubstitutor @@ -52,18 +52,18 @@ import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.types.TypeProjection import org.jetbrains.jet.lang.types.TypeConstructor -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ExpressionValue -import org.jetbrains.jet.lang.psi.JetReturnExpression +import org.jetbrains.kotlin.psi.JetReturnExpression import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Jump import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils import org.jetbrains.jet.lang.types.TypeUtils import kotlin.properties.Delegates import com.intellij.util.containers.ContainerUtil -import org.jetbrains.jet.lang.psi.JetCallElement -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector +import org.jetbrains.kotlin.psi.JetCallElement +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.util.isUnit @@ -399,4 +399,4 @@ fun ExtractableCodeDescriptor.canGenerateProperty(): Boolean { val parent = extractionData.targetSibling.getParent() return parent is JetFile || parent is JetClassBody -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt index f3548900a3d..af444f5ee9b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt @@ -19,41 +19,41 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import com.intellij.openapi.util.TextRange import kotlin.properties.Delegates import java.util.HashMap import org.jetbrains.jet.plugin.codeInsight.JetFileReferencesResolver -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import java.util.Collections -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.psi.psiUtil.isInsideOf +import org.jetbrains.kotlin.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.psiUtil.isInsideOf import java.util.ArrayList import com.intellij.psi.PsiNamedElement -import org.jetbrains.jet.lang.psi.JetSuperExpression +import org.jetbrains.kotlin.psi.JetSuperExpression import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver import org.jetbrains.jet.lang.descriptors.ClassKind -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody -import org.jetbrains.jet.lang.psi.JetUserType +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetUserType import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetFunctionLiteral -import org.jetbrains.jet.lang.psi.JetClassInitializer +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetFunctionLiteral +import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.jet.plugin.refactoring.compareDescriptors data class ExtractionOptions( diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt index d954a0fcb6f..66d44fc7544 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -18,13 +18,13 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.types.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle -import org.jetbrains.jet.lang.psi.psiUtil.isInsideOf +import org.jetbrains.kotlin.psi.psiUtil.isInsideOf import java.util.* import org.jetbrains.jet.plugin.refactoring.createTempCopy -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.jet.plugin.refactoring.JetNameSuggester import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import com.intellij.psi.util.PsiTreeUtil @@ -67,7 +67,7 @@ import org.jetbrains.jet.plugin.refactoring.getContextForContainingDeclarationBo import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor import org.jetbrains.jet.plugin.caches.resolve.analyze -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.jet.plugin.refactoring.comparePossiblyOverridingDescriptors private val DEFAULT_FUNCTION_NAME = "myFun" diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt index e2e9662f559..b7201041d9f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt @@ -17,34 +17,34 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import java.util.HashMap -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetExpression import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetPsiFactory.CallableBuilder -import org.jetbrains.jet.lang.psi.JetPsiFactory.CallableBuilder.Target -import org.jetbrains.jet.lang.psi.JetNamedDeclaration -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder +import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target +import org.jetbrains.kotlin.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetPsiFactory import java.util.LinkedHashMap import java.util.Collections -import org.jetbrains.jet.lang.psi.psiUtil.isFunctionLiteralOutsideParentheses +import org.jetbrains.kotlin.psi.psiUtil.isFunctionLiteralOutsideParentheses import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument +import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument import org.jetbrains.jet.plugin.util.psiModificationUtil.moveInsideParenthesesAndReplaceWith -import org.jetbrains.jet.lang.psi.psiUtil.appendElement -import org.jetbrains.jet.lang.psi.psiUtil.replaced -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.psiUtil.appendElement +import org.jetbrains.kotlin.psi.psiUtil.replaced +import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ParameterUpdate import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Jump import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Initializer import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ExpressionValue -import org.jetbrains.jet.lang.psi.JetReturnExpression +import org.jetbrains.kotlin.psi.JetReturnExpression import org.jetbrains.jet.plugin.refactoring.JetNameValidatorImpl import org.jetbrains.jet.plugin.refactoring.JetNameSuggester import org.jetbrains.jet.plugin.refactoring.isMultiLine @@ -57,10 +57,10 @@ import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.WeaklyMatched import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.StronglyMatched import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers -import org.jetbrains.jet.lang.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.psiUtil.parents import java.util.ArrayList -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType fun ExtractableCodeDescriptor.getDeclarationText( options: ExtractionGeneratorOptions = ExtractionGeneratorOptions.DEFAULT, diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java index 561b45e224a..e68bd1e9e36 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -51,7 +51,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; @@ -69,7 +69,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinInlineValHandler extends InlineActionHandler { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinChangePropertyActions.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinChangePropertyActions.java index b1f2723ca49..5c5fdbd8184 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinChangePropertyActions.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinChangePropertyActions.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable; import com.intellij.lang.ASTNode; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetPsiFactory; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinChangePropertyActions { private KotlinChangePropertyActions() { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java index a7c8e3f0ce5..3a189bff845 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java @@ -34,10 +34,10 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer; import com.intellij.ui.NonFocusableCheckBox; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.JetPsiFactory; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index e5664f21ed7..ca694961076 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -36,8 +36,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.analyzer.AnalyzerPackage; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ObservableBindingTrace; @@ -70,7 +70,7 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index 9eb15afb042..04eeae82f72 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiDirectory import com.intellij.openapi.roots.JavaProjectRootsUtil import com.intellij.psi.util.PsiTreeUtil import com.intellij.refactoring.util.ConflictsUtil -import org.jetbrains.jet.lang.psi.psiUtil.getPackage +import org.jetbrains.kotlin.psi.psiUtil.getPackage import com.intellij.psi.PsiFileFactory import org.jetbrains.jet.plugin.JetFileType import com.intellij.openapi.project.Project @@ -31,13 +31,13 @@ import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.psi.PsiManager import com.intellij.psi.PsiFile import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import java.util.ArrayList import com.intellij.openapi.application.ApplicationManager import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.ui.ConflictsDialog import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck +import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck import com.intellij.ide.util.PsiElementListCellRenderer import com.intellij.openapi.ui.popup.JBPopup import com.intellij.openapi.ui.popup.PopupChooserBuilder @@ -56,7 +56,7 @@ import com.intellij.openapi.ui.popup.JBPopupAdapter import com.intellij.openapi.ui.popup.LightweightWindowEvent import com.intellij.psi.PsiDocumentManager import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.psiUtil.isAncestor import com.intellij.psi.PsiNamedElement import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer @@ -69,8 +69,8 @@ import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.OverridingUtil -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.intellij.psi.PsiPackage import org.jetbrains.jet.plugin.util.ProjectRootsUtil diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/MoveJavaInnerClassKotlinUsagesHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/MoveJavaInnerClassKotlinUsagesHandler.kt index a5de61670b7..757bf7aa1d9 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/MoveJavaInnerClassKotlinUsagesHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/MoveJavaInnerClassKotlinUsagesHandler.kt @@ -19,12 +19,12 @@ package org.jetbrains.jet.plugin.refactoring.move import com.intellij.refactoring.move.moveInner.MoveInnerClassUsagesHandler import com.intellij.usageView.UsageInfo import com.intellij.psi.PsiClass -import org.jetbrains.jet.lang.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetQualifiedExpression +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetPsiFactory import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.PsiWhiteSpace @@ -60,4 +60,4 @@ public class MoveJavaInnerClassKotlinUsagesHandler: MoveInnerClassUsagesHandler } } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.java index 573ccd509b7..efd6b1842df 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.java @@ -22,9 +22,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesHandler; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import java.util.ArrayList; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt index d4997cca5e8..95a3b6479c2 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt @@ -23,11 +23,11 @@ import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo import com.intellij.openapi.roots.JavaProjectRootsUtil import com.intellij.psi.PsiCompiledElement -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.plugin.references.JetSimpleNameReference -import org.jetbrains.jet.lang.psi.psiUtil.getPackage +import org.jetbrains.kotlin.psi.psiUtil.getPackage import org.jetbrains.jet.plugin.refactoring.move.PackageNameInfo import org.jetbrains.jet.plugin.refactoring.move.getInternalReferencesToUpdateOnPackageNameChange import org.jetbrains.jet.plugin.refactoring.move.postProcessMoveUsages @@ -125,4 +125,4 @@ public class MoveKotlinFileHandler : MoveFileHandler() { clearState() } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt index 6e503029745..6b6c8cc8584 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations import com.intellij.refactoring.PackageWrapper import com.intellij.refactoring.MoveDestination -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager @@ -74,4 +74,4 @@ public class DeferredJetFileKotlinMoveTarget( // No additional verification is needed override fun verify(file: PsiFile): String? = null -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt index efa79aa6d61..50f5c0d0e3c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt @@ -23,13 +23,13 @@ import com.intellij.psi.PsiElement import com.intellij.refactoring.move.MoveCallback import com.intellij.psi.PsiReference import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.refactoring.isInJavaSourceRoot -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.JetClass import com.intellij.psi.PsiPackage import com.intellij.psi.PsiDirectory -import org.jetbrains.jet.lang.psi.psiUtil.getPackage +import org.jetbrains.kotlin.psi.psiUtil.getPackage import org.jetbrains.jet.plugin.refactoring.move.getFileNameAfterMove import java.util.HashSet import com.intellij.refactoring.RefactoringBundle @@ -38,9 +38,9 @@ import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackages import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog import com.intellij.refactoring.JavaRefactoringSettings import com.intellij.openapi.actionSystem.LangDataKeys -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetNamedDeclaration public class MoveKotlinTopLevelDeclarationsHandler : MoveHandlerDelegate() { private fun doMoveWithCheck( @@ -115,4 +115,4 @@ public class MoveKotlinTopLevelDeclarationsHandler : MoveHandlerDelegate() { return canMove(elementsToMove, targetContainer) && doMoveWithCheck(project, elementsToMove, targetContainer, null) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 5718f92f86e..66b1278243a 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -34,13 +34,13 @@ import com.intellij.refactoring.rename.RenameUtil import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiDirectory -import org.jetbrains.jet.lang.psi.psiUtil.getPackage -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.psiUtil.getPackage +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.refactoring.move.PackageNameInfo import org.jetbrains.jet.plugin.refactoring.createKotlinFile import org.jetbrains.jet.plugin.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.jet.plugin.refactoring.move.getFileNameAfterMove -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.asJava.toLightElements import java.util.HashMap import org.jetbrains.kotlin.utils.flatten @@ -53,13 +53,13 @@ import com.intellij.refactoring.util.TextOccurrencesUtil import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.asJava.namedUnwrappedElement -import org.jetbrains.jet.lang.psi.psiUtil.isPrivate +import org.jetbrains.kotlin.psi.psiUtil.isPrivate import org.jetbrains.jet.plugin.refactoring.getUsageContext -import org.jetbrains.jet.lang.psi.psiUtil.isInsideOf +import org.jetbrains.kotlin.psi.psiUtil.isInsideOf import org.jetbrains.jet.plugin.codeInsight.JetFileReferencesResolver import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil -import org.jetbrains.jet.lang.psi.JetModifierListOwner +import org.jetbrains.kotlin.psi.JetModifierListOwner import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.PsiModifier import com.intellij.util.VisibilityUtil @@ -69,7 +69,7 @@ import org.jetbrains.jet.plugin.refactoring.move.getInternalReferencesToUpdateOn import org.jetbrains.jet.plugin.refactoring.move.createMoveUsageInfo import org.jetbrains.jet.plugin.refactoring.move.postProcessMoveUsages import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.jet.plugin.refactoring.move.MoveRenameUsageInfoForExtension import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index 236525f568c..343f0b4be9e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -80,8 +80,8 @@ import com.intellij.util.ui.UIUtil; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; import org.jetbrains.jet.plugin.refactoring.RefactoringPackage; @@ -420,4 +420,4 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { public JComponent getPreferredFocusedComponent() { return classPackageChooser.getChildComponent(); } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt index 9704e52669d..b59b3c2fbbd 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt @@ -17,37 +17,37 @@ package org.jetbrains.jet.plugin.refactoring.move import org.jetbrains.jet.plugin.codeInsight.JetFileReferencesResolver -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor import org.jetbrains.jet.plugin.references.JetSimpleNameReference import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.JetFileType -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.psiUtil.isAncestor import java.util.Collections import org.jetbrains.jet.lang.resolve.name.isImported import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration +import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.refactoring.util.MoveRenameUsageInfo import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.kotlin.asJava.namedUnwrappedElement -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetImportDirective +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetImportDirective import java.util.ArrayList import com.intellij.refactoring.util.NonCodeUsageInfo import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName -import org.jetbrains.jet.lang.psi.JetThisExpression +import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.util.Comparing @@ -55,11 +55,11 @@ import java.util.Comparator import com.intellij.util.IncorrectOperationException import com.intellij.psi.PsiFile import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor -import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression +import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind -import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector +import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector public class PackageNameInfo(val oldPackageName: FqName, val newPackageName: FqName) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt index 0d7fd26e5c5..80ca83a68d1 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiFile import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.openapi.project.Project import com.intellij.openapi.actionSystem.DataContext import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java index e571a72367e..efb5f20a76f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java @@ -23,8 +23,8 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.asJava.KotlinLightClass; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt index 1ff1aa1210e..06ef3fb1553 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.search.SearchScope import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction import com.intellij.refactoring.rename.RenameJavaMethodProcessor import org.jetbrains.kotlin.asJava.KotlinLightMethod import kotlin.properties.Delegates diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt index a40ad97d52e..c0a21ee524f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.refactoring.rename import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor @@ -52,4 +52,4 @@ public class RenameKotlinImplicitLambdaParameter: VariableInplaceRenameHandler() override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { // Do nothing: this method is called not from editor } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt index cea21a6d0f4..f0e8022c037 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.refactoring.rename import com.intellij.refactoring.rename.RenamePsiElementProcessor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import com.intellij.psi.search.SearchScope import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.asJava.LightClassUtil @@ -34,7 +34,7 @@ import com.intellij.refactoring.listeners.RefactoringElementListener import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.openapi.ui.Messages import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.kotlin.asJava.namedUnwrappedElement diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt index 2253c7f49fa..472a48f1011 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.refactoring.rename import com.intellij.refactoring.rename.RenamePsiElementProcessor import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement): Boolean = element is JetNamedDeclaration diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/renameUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/renameUtil.kt index 3fa1cf7e1ce..37eeb9559f1 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/renameUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/renameUtil.kt @@ -21,7 +21,7 @@ import com.intellij.usageView.UsageInfo import java.util.ArrayList import com.intellij.refactoring.util.MoveRenameUsageInfo import org.jetbrains.jet.plugin.references.JetMultiDeclarationReference -import org.jetbrains.jet.lang.psi.JetWhenConditionInRange +import org.jetbrains.kotlin.psi.JetWhenConditionInRange import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle import org.jetbrains.jet.plugin.references.JetForLoopInReference @@ -53,4 +53,4 @@ class UnresolvableConventionViolationUsageInfo( referencedElement: PsiElement ) : UnresolvableCollisionUsageInfo(element, referencedElement) { override fun getDescription(): String = JetRefactoringBundle.message("naming.convention.will.be.violated.after.rename") -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt index c25700c366a..10a459daf50 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt @@ -23,12 +23,12 @@ import com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.unwrapped -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.references.JetReference -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor -import org.jetbrains.jet.lang.psi.psiUtil.parameterIndex +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.psiUtil.parameterIndex import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java index 8a05c1ece49..d642896ee76 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java @@ -36,10 +36,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetNamedFunction; -import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.lang.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt index 5ea1f18bea5..f0cc8311546 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.refactoring.safeDelete import com.intellij.psi.PsiElement import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteCustomUsageInfo import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteUsageInfo -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiUtil public class KotlinSafeDeleteOverridingUsageInfo( overridingElement: PsiElement, superElement: PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index 23aed2965c3..f4164e9b26d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -35,15 +35,15 @@ import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.* import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.descriptors.Modality -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil import org.jetbrains.jet.plugin.references.JetReference import java.util.* -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.deleteElementAndCleanParent +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.deleteElementAndCleanParent import org.jetbrains.jet.plugin.caches.resolve.analyze public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt index d7ce5d295ac..c2d37866b32 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.refactoring.safeDelete import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.analyze @@ -44,4 +44,4 @@ fun JetImportDirective.isSafeToDelete(declaration: JetDeclaration): Boolean { return referenceDescriptor == declarationDescriptor } return false -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteTypeArgumentListUsageInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteTypeArgumentListUsageInfo.kt index 4dd8633b4c5..a606c09cd72 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteTypeArgumentListUsageInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteTypeArgumentListUsageInfo.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.refactoring.safeDelete import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo -import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.lang.psi.psiUtil.deleteElementAndCleanParent +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.deleteElementAndCleanParent public class SafeDeleteTypeArgumentListUsageInfo( typeProjection: JetTypeProjection, parameter: JetTypeParameter diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt index c4b23edbedf..42ec7b28d88 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt @@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.refactoring.safeDelete import com.intellij.psi.PsiElement import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import com.intellij.util.IncorrectOperationException -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.psi.JetValueArgument +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetValueArgument public class SafeDeleteValueArgumentListUsageInfo( valueArgument: JetValueArgument, parameter: PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt index c15766dec6b..86da3165bda 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt @@ -16,20 +16,20 @@ package org.jetbrains.jet.plugin.refactoring.safeDelete -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction import com.intellij.psi.PsiMethod -import org.jetbrains.jet.lang.psi.JetModifierListOwner -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetModifierListOwner +import org.jetbrains.kotlin.psi.JetProperty import com.intellij.psi.PsiElement import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.psi.search.searches.OverridingMethodsSearch import org.jetbrains.kotlin.asJava.unwrapped -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.lang.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.lang.psi.JetTypeParameter -import org.jetbrains.jet.lang.psi.psiUtil.* +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetPropertyAccessor +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.psiUtil.* public fun PsiElement.canDeleteElement(): Boolean { if (isObjectLiteral()) return false diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java index 57a52c64dfd..66d92f2d0d6 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java @@ -33,7 +33,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.LightClassUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index ec3a90e81f4..79eaf910454 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -41,8 +41,8 @@ import kotlin.KotlinPackage; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index ff41ee45006..0b150084c9c 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -32,7 +32,7 @@ import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java index 48b7fd0c3cc..f732046f560 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java @@ -32,7 +32,7 @@ import com.theoryinpractice.testng.configuration.TestNGConfiguration; import com.theoryinpractice.testng.configuration.TestNGConfigurationProducer; import com.theoryinpractice.testng.util.TestNGUtil; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.LightClassUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/classInheritorsSearch.kt b/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/classInheritorsSearch.kt index 450f68dcf1a..a6e94e4a5b2 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/classInheritorsSearch.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/classInheritorsSearch.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass import com.intellij.util.Query import com.intellij.psi.PsiModifier import com.intellij.psi.PsiAnonymousClass -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.asJava.LightClassUtil import com.intellij.psi.PsiElement import com.intellij.psi.search.searches.ClassInheritorsSearch diff --git a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/declarationSearchUtil.kt b/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/declarationSearchUtil.kt index b2e0cc9461e..99aaa5c8028 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/declarationSearchUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/declarationSearchUtil.kt @@ -29,7 +29,7 @@ import java.util.Stack import java.util.HashSet import com.intellij.openapi.progress.ProgressIndicatorProvider import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.psi.psiUtil.contains +import org.jetbrains.kotlin.psi.psiUtil.contains trait DeclarationSearchRequest { val project: Project @@ -120,4 +120,4 @@ abstract class HierarchySearch( doSearchDirect(request, consumer) } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/overridersSearch.kt b/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/overridersSearch.kt index 0496f5eb94a..217f32ac6b6 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/overridersSearch.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/overridersSearch.kt @@ -18,12 +18,12 @@ package org.jetbrains.jet.plugin.search.declarationsSearch import com.intellij.psi.PsiMethod import com.intellij.psi.util.PsiUtil -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.psi.PsiElement import com.intellij.util.Processor import com.intellij.util.Query import java.util.HashMap -import org.jetbrains.jet.lang.psi.psiUtil.* +import org.jetbrains.kotlin.psi.psiUtil.* import java.util.Collections import com.intellij.psi.PsiClass import com.intellij.psi.util.TypeConversionUtil diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt index e454e5e7d4e..f56db18150c 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt @@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.search.ideaExtensions import com.intellij.codeInsight.TargetElementEvaluator import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.psiUtil.isAbstract +import org.jetbrains.kotlin.psi.psiUtil.isAbstract import com.intellij.psi.PsiReference -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetClass public class JetTargetElementEvaluator : TargetElementEvaluator { override fun includeSelfInGotoImplementation(element: PsiElement): Boolean = !(element is JetClass && element.isAbstract()) diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java index 30fb1f96150..24e7974240c 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java @@ -35,10 +35,10 @@ import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.psi.JetAnnotationEntry; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetAnnotationEntry; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java index 3ac7888bc0e..9907180ed06 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java @@ -29,7 +29,7 @@ import com.intellij.util.Processor; import com.intellij.util.QueryExecutor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.asJava.LightClassUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt index fe7b70db371..45cf60d053d 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt @@ -25,7 +25,7 @@ import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.util.Processor import org.jetbrains.jet.plugin.JetFileType import org.jetbrains.kotlin.asJava.namedUnwrappedElement -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty public class KotlinLightPropertyAccessorsReferenceSearcher() : QueryExecutorBase(true) { override fun processQuery(queryParameters: MethodReferencesSearch.SearchParameters, consumer: Processor) { diff --git a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java index e4283be72ae..66e86ce05c7 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java @@ -26,8 +26,8 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java b/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java index dbbfe0eda3d..087d05471e7 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.util; import com.intellij.psi.PsiMember; import com.intellij.psi.PsiModifier; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.NamePackage; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt index c08b888d12a..b0efb4438cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt +++ b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt @@ -17,13 +17,13 @@ package org.jetbrains.jet.plugin.util.psi.patternMatching import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid +import org.jetbrains.kotlin.psi.JetElement import java.util.ArrayList import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiComment import java.util.Collections -import org.jetbrains.jet.lang.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.psiUtil.siblings import com.intellij.openapi.util.TextRange import java.util.HashSet import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match @@ -100,4 +100,4 @@ public fun List.toRange(significantOnly: Boolean = true): JetPsiRang return if (empty) JetPsiRange.Empty else JetPsiRange.ListRange(if (significantOnly) filter(SIGNIFICANT_FILTER) else this) } -public fun PsiElement?.toRange(): JetPsiRange = this?.let { JetPsiRange.ListRange(Collections.singletonList(it)) } ?: JetPsiRange.Empty \ No newline at end of file +public fun PsiElement?.toRange(): JetPsiRange = this?.let { JetPsiRange.ListRange(Collections.singletonList(it)) } ?: JetPsiRange.Empty diff --git a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt index 2031310e3da..24a6d787ac5 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt +++ b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt @@ -20,8 +20,8 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.* import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.Status.* import java.util.HashMap -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall @@ -29,67 +29,67 @@ import org.jetbrains.jet.lang.types.JetType import com.intellij.util.containers.ContainerUtil import org.jetbrains.jet.lang.types.checker.JetTypeChecker import java.util.Collections -import org.jetbrains.jet.lang.psi.JetReferenceExpression -import org.jetbrains.jet.lang.psi.Call +import org.jetbrains.kotlin.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.Call import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.psi.ValueArgument +import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind -import org.jetbrains.jet.lang.psi.JetIfExpression -import org.jetbrains.jet.lang.psi.JetUnaryExpression +import org.jetbrains.kotlin.psi.JetIfExpression +import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetBinaryExpression -import org.jetbrains.jet.lang.psi.JetConstantExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetConstantExpression import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.jet.lang.types.expressions.OperatorConventions -import org.jetbrains.jet.lang.psi.JetLabelReferenceExpression +import org.jetbrains.kotlin.psi.JetLabelReferenceExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.types.ErrorUtils import com.intellij.lang.ASTNode import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression +import org.jetbrains.kotlin.psi.JetCallableReferenceExpression import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver -import org.jetbrains.jet.lang.psi.JetThisExpression -import org.jetbrains.jet.lang.psi.JetStringTemplateEntryWithExpression +import org.jetbrains.kotlin.psi.JetThisExpression +import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Empty -import org.jetbrains.jet.lang.psi.JetMultiDeclaration -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetMultiDeclaration +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.psi.JetWithExpressionInitializer -import org.jetbrains.jet.lang.psi.JetParameter +import org.jetbrains.kotlin.psi.JetWithExpressionInitializer +import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.lang.psi.JetCallableDeclaration -import org.jetbrains.jet.lang.psi.JetClassObject -import org.jetbrains.jet.lang.psi.JetTypeParameter +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetClassObject +import org.jetbrains.kotlin.psi.JetTypeParameter import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetClassInitializer -import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner -import org.jetbrains.jet.lang.psi.doNotAnalyze -import org.jetbrains.jet.lang.psi.JetReturnExpression -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass -import org.jetbrains.jet.lang.psi.JetDelegationSpecifier +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetClassInitializer +import org.jetbrains.kotlin.psi.JetTypeParameterListOwner +import org.jetbrains.kotlin.psi.doNotAnalyze +import org.jetbrains.kotlin.psi.JetReturnExpression +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass +import org.jetbrains.kotlin.psi.JetDelegationSpecifier import org.jetbrains.jet.plugin.refactoring.getContextForContainingDeclarationBody import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers -import org.jetbrains.jet.lang.psi.JetOperationReferenceExpression +import org.jetbrains.kotlin.psi.JetOperationReferenceExpression public trait UnificationResult { public enum class Status { diff --git a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt b/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt index 6a96da38511..efeb386c2e4 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.plugin.util.psiModificationUtil -import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument -import org.jetbrains.jet.lang.psi.JetCallExpression -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.callUtil.getValueArgumentsInParentheses import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace fun JetFunctionLiteralArgument.moveInsideParentheses(bindingContext: BindingContext): JetCallExpression { diff --git a/idea/testData/findUsages/kotlin/conventions/compareTo.0.kt b/idea/testData/findUsages/kotlin/conventions/compareTo.0.kt index 335a45476b3..42d6322e81d 100644 --- a/idea/testData/findUsages/kotlin/conventions/compareTo.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/compareTo.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A(val n: Int) { @@ -17,4 +17,4 @@ fun test() { A(0) <= 1 A(0) > 1 A(0) >= 1 -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt b/idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt index b39b11f4ca2..22a717c0991 100644 --- a/idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages data class A(val n: Int, val s: String, val o: Any) @@ -8,4 +8,4 @@ fun test() { a.n a.component1() val (x, y, z) = a -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt b/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt index 3a2f66864ee..124efce90d8 100644 --- a/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages // FIND_BY_REF @@ -9,4 +9,4 @@ fun test() { a.n a.component1() val (x, y, z) = a -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/contains.0.kt b/idea/testData/findUsages/kotlin/conventions/contains.0.kt index 73daf42c0dd..2e096a4fc57 100644 --- a/idea/testData/findUsages/kotlin/conventions/contains.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/contains.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A(val n: Int) { @@ -13,4 +13,4 @@ fun test() { in A(2) -> {} !in A(2) -> {} } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/equals.0.kt b/idea/testData/findUsages/kotlin/conventions/equals.0.kt index 057e6dee345..2d7b28dbe2b 100644 --- a/idea/testData/findUsages/kotlin/conventions/equals.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/equals.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A(val n: Int) { @@ -11,4 +11,4 @@ fun test() { A(0) equals A(1) A(0) === A(1) A(0) !== A(1) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/forIteration.0.kt b/idea/testData/findUsages/kotlin/conventions/forIteration.0.kt index 3ecd4b1377f..f0cc5d8c97c 100644 --- a/idea/testData/findUsages/kotlin/conventions/forIteration.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/forIteration.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A { @@ -14,4 +14,4 @@ fun test() { for (b in B()) {} for (a in A()) {} for (b in B()) {} -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/get.0.kt b/idea/testData/findUsages/kotlin/conventions/get.0.kt index 080bdbcd3af..a6951044aac 100644 --- a/idea/testData/findUsages/kotlin/conventions/get.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/get.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class B(val n: Int) { @@ -8,4 +8,4 @@ class B(val n: Int) { fun test() { B(1).get(2) B(1)[2] -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt b/idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt index 04e72fcacaa..aaba71deaab 100644 --- a/idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages // FIND_BY_REF @@ -13,4 +13,4 @@ fun test() { A(0) identityEquals A(1) A(0) === A(1) A(0) !== A(1) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/inc.0.kt b/idea/testData/findUsages/kotlin/conventions/inc.0.kt index e7764ce02f9..fef2a21074e 100644 --- a/idea/testData/findUsages/kotlin/conventions/inc.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/inc.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A(val n: Int) { @@ -10,4 +10,4 @@ fun test() { a.inc() ++a a++ -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/invoke.0.kt b/idea/testData/findUsages/kotlin/conventions/invoke.0.kt index a30cddd2cae..9b9e9833e31 100644 --- a/idea/testData/findUsages/kotlin/conventions/invoke.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/invoke.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class B(val n: Int) { @@ -8,4 +8,4 @@ class B(val n: Int) { fun test() { B(1).invoke(2) B(1)(2) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/plus.0.kt b/idea/testData/findUsages/kotlin/conventions/plus.0.kt index 11a06095ee7..cbce075136a 100644 --- a/idea/testData/findUsages/kotlin/conventions/plus.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/plus.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A(val n: Int) { @@ -16,4 +16,4 @@ fun test() { a += A(1) +A(0) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt b/idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt index 9a14e9fcc80..f2177c629e5 100644 --- a/idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A(var n: Int) { @@ -16,4 +16,4 @@ fun test() { a.plusAssign(1) a += 1 a += A(1) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/set.0.kt b/idea/testData/findUsages/kotlin/conventions/set.0.kt index 44146e5d235..18067582d84 100644 --- a/idea/testData/findUsages/kotlin/conventions/set.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/set.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class B(val n: Int) { @@ -10,4 +10,4 @@ fun test() { a.set(2, B(2)) a[2] = B(2) a[2] -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt b/idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt index fd57b14f8c4..bc75948d46c 100644 --- a/idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages class A(val n: Int) { @@ -8,4 +8,4 @@ class A(val n: Int) { fun test() { A(1).minus() -A(1) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt index 38a5a5b190e..b8d4c1ed34d 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt @@ -1,7 +1,7 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: textOccurrences package test class Foo { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt index a94b7cd2728..5431d7dea41 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages package server @@ -10,4 +10,4 @@ open class Server { open fun work() { println("Server") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt index 9c48ddc6e2a..a3bf5539051 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package testing diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt index df5e70a9b05..88d3235a00b 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: constructorUsages package testing diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt index b039187bc18..958adb73294 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: functionUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A: X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt index 7ccaa819012..4029acdbc7c 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: functionUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A: X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt index ca050edca44..52dd7fa4da1 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages package testing diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt index b56bca7643e..a679467e9fe 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: propertyUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A: X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt index 2f67a46fa1e..470c607af57 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: propertyUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A: X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt index 53a34ab9efa..d63c8301fd4 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -14,4 +14,4 @@ open class C: Y { trait Z: A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt index f4ae7005701..47aac1897e5 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -14,4 +14,4 @@ open class C: Y { trait Z: A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt index 01e8c7ca562..8cef471c8b5 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces trait X { @@ -14,4 +14,4 @@ open class C: Y { trait Z: A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt index 8b1a8e9045e..9b664cf0959 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces trait X { @@ -14,4 +14,4 @@ open class C: Y { trait Z: A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt index b7e19ba83fe..2dbfa33b9ec 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package server @@ -10,4 +10,4 @@ open class Server { open fun work() { println("Server") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt index dd1d217bc89..8ef951d2566 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package server -annotation class X(val x: String) \ No newline at end of file +annotation class X(val x: String) diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt index 033f44a9ecb..54bfefd2dca 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package server -data class Data \ No newline at end of file +data class Data diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt index bc417ae4a45..5577ef4b058 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages, skipImports package server @@ -6,4 +6,4 @@ open class Server { open fun work() { println("Server") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt index 00816ad2af6..ab35d0f3c4e 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: constructorUsages package server @@ -10,4 +10,4 @@ open class Server { open fun work() { println("Server") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt index c24dd193978..ef31908cb6f 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses open class A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.1.kt index 7897b4bd64b..4317e71dedb 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { @@ -17,4 +17,4 @@ fun foo() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt index bb98ff4b379..f5dcac0ee45 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.1.kt index e40a5879f40..7f4355cfe09 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses open class B: A() { @@ -14,4 +14,4 @@ trait Z: A { trait U: Z { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt index bb98ff4b379..f5dcac0ee45 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.1.kt index 6ae6c8dd62d..80ac657377b 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses class Outer { open class B: A() { @@ -18,4 +18,4 @@ class Outer { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt index c24dd193978..ef31908cb6f 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses open class A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.1.kt index f3f7435e99b..a920a90b3d2 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses class Outer { trait Z: A { @@ -10,4 +10,4 @@ class Outer { class Inner { object O2: Z } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt index bb98ff4b379..f5dcac0ee45 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.1.kt index d17e6564930..6229bad761c 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { @@ -19,4 +19,4 @@ fun foo() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt index c24dd193978..ef31908cb6f 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses open class A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.1.kt index ee1d8020ff2..eb3a243887f 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { @@ -11,4 +11,4 @@ fun foo() { fun bar() { object O2: Z } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt index 4670984e11a..74cbb2c1bec 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.1.kt index 0f566a961cf..f816abdac1f 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces fun foo() { @@ -19,4 +19,4 @@ fun foo() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt index c24dd193978..ef31908cb6f 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses open class A { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.1.kt index bb4721782e2..f511d58d23f 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait Z: A { @@ -6,4 +6,4 @@ trait Z: A { object O1: A() -object O2: Z \ No newline at end of file +object O2: Z diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt index 4670984e11a..74cbb2c1bec 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.1.kt index bb1ff8afaf3..24778a14683 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces open class B: A() { @@ -14,4 +14,4 @@ trait Z: A { trait U: Z { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt index b039187bc18..958adb73294 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: functionUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A: X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt index 7ccaa819012..4029acdbc7c 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: functionUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A: X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt index a94b7cd2728..5431d7dea41 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages package server @@ -10,4 +10,4 @@ open class Server { open fun work() { println("Server") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt index b56bca7643e..a679467e9fe 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: propertyUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A: X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt index 02b0cdcc736..be1a36f0c92 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: propertyUsages trait X { val a: String @@ -34,4 +34,4 @@ open class A(val t: String, var u: String): X { override fun foo(s: String) { println("!$s!") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt index 36e63c1f2e5..8d079caebc1 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package a @@ -20,4 +20,4 @@ public open class Outer { } } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt index fbb263a8052..049c7988ff5 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package a @@ -10,4 +10,4 @@ public open class Outer { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt index 70a87d4e102..75874762760 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { open class A diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt index 8ace5c49409..7495c905ad7 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { open class A diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt index 88b77cff263..a67f7cb548c 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { open class A diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt index b9af12cac23..76ca752c64c 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces fun foo() { open class A diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt index bd87c5294c4..edbae25973a 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages fun foo(): Any { class Bar diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt index b9b32d35d79..5266f7f450b 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages fun foo(): Any { if (false) { diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt index 07037e2c42d..426c4d0872d 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package a @@ -18,4 +18,4 @@ public open class Outer { } } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt index c3c97215567..4f1ee35448e 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages package server diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt index 915346cfc57..4adcff251f7 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -6,4 +6,4 @@ trait X { open class A: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.1.kt index 9af18a585f6..e64c76fc7d6 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { @@ -13,4 +13,4 @@ fun foo() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt index 1813a7169ac..65608ebf054 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.1.kt index e40a5879f40..7f4355cfe09 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses open class B: A() { @@ -14,4 +14,4 @@ trait Z: A { trait U: Z { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt index 1813a7169ac..65608ebf054 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.1.kt index 3321582d8ab..e796c98dbc5 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses class Outer { open class B: A() { @@ -18,4 +18,4 @@ class Outer { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt index 1813a7169ac..65608ebf054 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.1.kt index 21d871ed3b3..a83d521f267 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses class Outer { object O1: A() { @@ -10,4 +10,4 @@ class Outer { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt index 1813a7169ac..65608ebf054 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.1.kt index d17e6564930..6229bad761c 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { @@ -19,4 +19,4 @@ fun foo() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt index 915346cfc57..4adcff251f7 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -6,4 +6,4 @@ trait X { open class A: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.1.kt index 50026831478..9e10ac453b1 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses fun foo() { @@ -11,4 +11,4 @@ fun foo() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt index 596cf527518..e93929b5426 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces trait X { @@ -6,4 +6,4 @@ trait X { open class A: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.1.kt index 71b636644a2..ad61f018c53 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces fun foo() { @@ -15,4 +15,4 @@ fun foo() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt index 1813a7169ac..65608ebf054 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.1.kt index 6c0be2e0bb8..b7b553c1857 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedClasses object O1: A() { @@ -6,4 +6,4 @@ object O1: A() { object O2: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt index 05e37e35dbe..421730e1cf5 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces trait X { @@ -10,4 +10,4 @@ open class A: X { trait Y: X { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.1.kt index bb1ff8afaf3..24778a14683 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: derivedInterfaces open class B: A() { @@ -14,4 +14,4 @@ trait Z: A { trait U: Z { -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt index c0ddde74dfe..ae330dfab65 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages enum class E { { @@ -22,4 +22,4 @@ enum class E { override fun foo(n: Int): Int = n + 2 } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt index 150833d1d0f..ef36fc25079 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: textOccurrences package test @@ -6,4 +6,4 @@ class Foo { fun foo() { } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt index dc752b1a588..715ff1f9fa6 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: overrides open class A { open fun foo(t: T) { @@ -37,4 +37,4 @@ open class B: A() { open fun baz(a: A) { a.foo(0, "") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt index 11730be3a06..e8944947831 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages package testing diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt index 1f2b31b0337..6800f75f480 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages fun foo() { fun bar() { diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt index 1de3be7e672..650bc2c5a85 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages fun foo() { if (true) { diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt index c8f5866ccfe..3cb5558648f 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt index 228ffec2262..739b05bcc55 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages package server @@ -14,4 +14,4 @@ fun foo(n: Int) { } -val foo: Int \ No newline at end of file +val foo: Int diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.1.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.1.kt index eae414341de..d07782176d5 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.1.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages package client @@ -8,4 +8,4 @@ fun test() { foo() foo(1) val t = foo -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt index 96b6192a0c6..bfa26eb0928 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages package a @@ -8,4 +8,4 @@ public open class Outer() { } } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt index ba672aa62a9..27aaa133e8d 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: overloadUsages trait X { } @@ -42,4 +42,4 @@ fun B.foo(s: String, n: Number) { fun bar(b: B) { b.foo("", 0) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt index 36ceefc800b..84785359e5d 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: overloadUsages trait X { diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt index 0c08e9c911e..cecfabc3ec8 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt index 2077d614516..880b017510c 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt index 372c66dbd57..18c490e51b2 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages, skipImports package server diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt index 7ecfb31e70a..052faf3abbe 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages, skipImports open data class A(val a: Int) @@ -10,4 +10,4 @@ class B(b: Int): A(b) { fun main(a: A) { a.copy(1) B(0).copy(1) -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt index 93b6061914e..329863c1c32 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // OPTIONS: usages, skipImports trait A { diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt index 61f18b34d1b..cb27103460c 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration package server object O { diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt index af5a1f583de..0c9c9e6d354 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration // OPTIONS: usages fun foo(): Any { object Bar diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt index a029a7049f0..b945e44b13b 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration // OPTIONS: usages fun foo(): Any { if (true) { diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt index c5392e2d91b..05c05303726 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration package a class A { diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt index 61f18b34d1b..cb27103460c 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration package server object O { diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt index 982cf6fad73..3c07ced5e35 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt index 4510a89825b..8933e258c01 100644 --- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages open class A(foo: T) { { @@ -6,4 +6,4 @@ open class A(foo: T) { } val t: T = foo -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt index 7f51d6dacca..d1e552c233f 100644 --- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt @@ -1,6 +1,6 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages fun foo(t: T): T { println(t) return t -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt index 4ecf1b42c87..06a1140ff5d 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: overrides open class A(t: T) { open var foo: T = t @@ -23,4 +23,4 @@ open class B: A("") { open class D: A("") { override var foo: String = "" -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt index eba4fbc5bdf..dec97ad4ea6 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: overrides open class A(open var foo: T) @@ -23,4 +23,4 @@ open class D: A("") { override var foo: String = "" } -open class E(override var foo: T): A(foo) \ No newline at end of file +open class E(override var foo: T): A(foo) diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt index e515cd9fc59..ba9a8b9e78e 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt index b37cdfc686a..04f9241eccf 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages, skipWrite package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt index d653589e27d..73f04312213 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages, skipWrite package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt index 943b6af8f49..c2ed613fcce 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt index 919495da686..4e69d05e08d 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt index 121c3fa9382..b1d37e8d8c9 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages, skipRead package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt index 13f6ccb72bf..71df698ff11 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages, skipRead package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt index 82f5bbde365..67dafb44b8a 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages fun foo(): String { val bar = "" diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt index 31b06aa1551..ec7840dbcef 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages fun foo(): String { if (true) { diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt index d581936eaeb..873995dd978 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package server @@ -8,4 +8,4 @@ fun foo() { val foo: Int = 1 -val Int.foo: Int = 2 \ No newline at end of file +val Int.foo: Int = 2 diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.1.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.1.kt index 7c3eeb05e69..a7ff070cb68 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.1.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.1.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package client @@ -7,4 +7,4 @@ import server.foo fun test() { foo() val t = 1.foo + foo -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt index d46459c6f89..5c4e976a2cd 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package a @@ -6,4 +6,4 @@ public open class Outer() { open class Inner { var foo: Int = 1 } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt index f55f00acfec..f63e089f382 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages class Outer { val x = Outer.t diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt index 7fed9844980..ababc1dbb3c 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt index e2f870320e7..0043dadf521 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt index 9723e36f963..384ef238ce9 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages, skipWrite package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt index 1a621a5bf1f..651ac62a989 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages, skipWrite package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt index f2f23dd130f..b3660165749 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt index 938d8fe8e70..f2279f7e312 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt index fbc39b548a5..650e2abf5cc 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages, skipRead package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt index c13c6ffa4f2..4c476a2692d 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // OPTIONS: usages, skipRead package server diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt index 41c9db0c135..df5f9d28091 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt index 8fb3eb5a4ce..06bfb4c0661 100644 --- a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetTypeParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetTypeParameter // OPTIONS: usages open class A<T>(foo: T, list: List) { { @@ -9,4 +9,4 @@ open class A<T>(foo: T, list: List) { val t: T = foo fun bar(t: T): T = t -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt index 73bf172eaa5..2ed44f62270 100644 --- a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetTypeParameter +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetTypeParameter // OPTIONS: usages fun <T> T.foo(t: T, list: List): T { return t -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt index cc54430de25..d2563ba9ea1 100644 --- a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt +++ b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // FILTERING_RULES: org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule // OPTIONS: usages, constructorUsages diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt index 062cb4d6101..27df6c04cd4 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages, constructorUsages package server @@ -11,4 +11,4 @@ open class Server { open fun work() { println("Server") } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt index 2bf30983a66..b1da5e9aa88 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt index 483e27bde4d..60ab121858f 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt @@ -1,4 +1,4 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty // GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt index b88ad322d8e..ce90140c027 100644 --- a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt +++ b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt @@ -1,5 +1,5 @@ -// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass +// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass // OPTIONS: usages, constructorUsages open class Foo { vv open val foo = 1 -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt index 33d2ede4b91..911e3b7646b 100644 --- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.completion import org.jetbrains.jet.plugin.PluginTestCaseBase -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.completion.renderDataFlowValue import org.jetbrains.jet.JetTestUtils import com.intellij.openapi.util.io.FileUtil @@ -28,7 +28,7 @@ import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.plugin.caches.resolve.analyze -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFixtureTestCase() { override fun getTestDataPath() : String { @@ -53,4 +53,4 @@ public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFix JetTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual) } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java index da6b1e48ed1..0e6eedda08d 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java @@ -50,7 +50,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java b/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java index c967a729d02..76eacc116be 100644 --- a/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java @@ -20,8 +20,8 @@ import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; public abstract class AbstractExpressionSelectionTest extends LightCodeInsightTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java b/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java index 90b50d28811..2d90301eea7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java @@ -20,8 +20,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import java.util.ArrayList; diff --git a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java index 61100a44d7c..966710b06ca 100644 --- a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Severity; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.highlighter.IdeErrorMessages; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java index 6a151939caf..b8d16c0b56e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java @@ -33,7 +33,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/actions/QualifiedNamesTest.kt b/idea/tests/org/jetbrains/jet/plugin/actions/QualifiedNamesTest.kt index ba6159974b9..ed41b261677 100644 --- a/idea/tests/org/jetbrains/jet/plugin/actions/QualifiedNamesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/actions/QualifiedNamesTest.kt @@ -18,12 +18,12 @@ package org.jetbrains.jet.plugin.actions import com.intellij.testFramework.LightCodeInsightTestCase import com.intellij.testFramework.LightPlatformCodeInsightTestCase -import org.jetbrains.jet.lang.psi.JetVisitorVoid +import org.jetbrains.kotlin.psi.JetVisitorVoid import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.JetObjectDeclaration import com.intellij.ide.actions.CopyReferenceAction -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import java.util.ArrayList import kotlin.test.assertEquals @@ -88,4 +88,4 @@ public class QualifiedNamesTest: LightCodeInsightTestCase() { }) return result } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index 60ce9c1e48e..e523a3e5e34 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -27,8 +27,8 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java index 202ca24a807..a49a55b7cab 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java @@ -30,7 +30,7 @@ import com.intellij.testFramework.ExpectedHighlightingData; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java index aa222b4ddd8..000d21a9c2d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java @@ -34,8 +34,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; diff --git a/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt b/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt index 09f0fc81dae..10064cb8638 100644 --- a/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.coverage import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.PluginTestCaseBase -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import kotlin.test.assertNotNull import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.fileEditor.impl.LoadTextUtil diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java index fc1fafcf793..d8f3ebae11f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java @@ -38,7 +38,7 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.project.PluginJetFilesProvider; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java index 775b2f503f5..e6df4e9ba83 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.MockLibraryUtil; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index 35478458571..152620a3f11 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -22,19 +22,19 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import com.intellij.psi.PsiElement import com.intellij.openapi.util.io.FileUtil import java.io.File -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.application.ApplicationManager import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.InTextDirectivesUtils -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.jet.plugin.caches.resolve.analyzeFully -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetTypeReference import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.completion.ExpectedCompletionUtils -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.completion.handlers.AbstractCompletionHandlerTest import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.jet.JetTestUtils @@ -107,4 +107,4 @@ private fun createCodeFragment(filePath: String, contextElement: PsiElement): Je codeFragmentText, KotlinCodeFragmentFactory.getContextElement(contextElement) ) -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index 8c3e9039d6a..662fbd71b00 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt @@ -32,7 +32,7 @@ import org.jetbrains.eval4j.jdi.asValue import org.jetbrains.eval4j.Value import org.jetbrains.eval4j.ObjectValue import com.sun.jdi.ObjectReference -import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.kotlin.psi.JetCodeFragment import java.util.Collections import com.intellij.debugger.engine.evaluation.EvaluateException import com.intellij.execution.process.ProcessOutputTypes @@ -341,4 +341,4 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB } return this.toString() } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index 996825ee630..99ad61e7fe8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.debugger.evaluate import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.psi.PsiManager -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.completion.util.testCompletion import org.jetbrains.jet.plugin.project.TargetPlatform import com.intellij.codeInsight.completion.CompletionType @@ -88,4 +88,4 @@ public class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTes private fun findLibrarySourceDir(): VirtualFile { return LocalFileSystem.getInstance().findFileByIoFile(File(LIBRARY_SRC_PATH))!! } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index 2dfc7429b26..2163d8dfe9e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -25,12 +25,12 @@ import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VirtualFileManager import com.intellij.psi.PsiElement import com.intellij.psi.PsiClass -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetClass import kotlin.test.assertEquals import kotlin.test.fail import org.jetbrains.kotlin.utils.sure import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.asJava.LightClassUtil import kotlin.test.assertTrue import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java index 3695d2b4d38..a83762fd420 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java @@ -34,8 +34,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; import org.jetbrains.jet.plugin.decompiler.JetClsFile; @@ -181,4 +181,4 @@ public class NavigateToDecompiledLibraryTest extends AbstractNavigateToLibraryTe private static VirtualFile findTestLibraryRoot(@NotNull LibraryOrderEntry library) { return library.getFiles(OrderRootType.CLASSES)[0]; } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt index b4cde5efef4..57eb8f91c61 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.jet.lang.psi.stubs.elements.JetFileStubBuilder +import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder import org.jetbrains.jet.JetTestUtils import java.io.File import org.jetbrains.jet.MockLibraryUtil diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt index ef05570dfac..722c183216a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -24,8 +24,8 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.plugin.decompiler.textBuilder.buildDecompiledText import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.util.indexing.FileContentImpl -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.stubs.elements.JetFileStubBuilder +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder import org.junit.Assert public class ClsStubConsistencyTest : JetLightCodeInsightFixtureTestCase() { @@ -49,4 +49,4 @@ public class ClsStubConsistencyTest : JetLightCodeInsightFixtureTestCase() { } override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt index 68511830b6d..244f5bb9a53 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.JetLightProjectDescriptor import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.psi.PsiErrorElement -import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.psi.PsiFile import org.jetbrains.jet.plugin.decompiler.JetClsFile diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java index d967eb16c8d..4e4b28f018a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt index 0c12f8ca532..31de702fe39 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.highlighter import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor import com.intellij.openapi.vfs.VfsUtil -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream import com.intellij.openapi.projectRoots.Sdk diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java index bf1ee0294cf..d0c92794aa6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.imports; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; @@ -42,4 +42,4 @@ public class OptimizeImportsOnFlyTest extends LightDaemonAnalyzerTestCase { } checkResultByText("import java.util.HashSet"); } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java index 826022deabb..b8d52c3080e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java @@ -27,7 +27,7 @@ import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.util.PathUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.testing.ConfigLibraryUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java index f871a41b58c..17729a5d5cd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java index e8b97661666..7b1a39f3d01 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java @@ -20,8 +20,8 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetValueArgumentList; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetValueArgumentList; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java index 6c20b25e980..f07c8b62bbc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java @@ -36,7 +36,7 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; import org.jetbrains.jet.plugin.KotlinDaemonAnalyzerTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java index 02770170cb8..6681797e84b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java @@ -30,7 +30,7 @@ import com.intellij.psi.PsiElement; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; import org.jetbrains.jet.plugin.KotlinLightQuickFixTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java index 8bfc51d9f62..44c726522ea 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java index 921ad813002..570a1380949 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.Visibilities; -import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; @@ -47,7 +47,7 @@ import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; import java.io.File; import java.util.*; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.plugin.refactoring.changeSignature.ChangeSignaturePackage.getChangeSignatureDialog; public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt index 20472b4193d..a737dad5362 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable import com.intellij.ide.DataManager import com.intellij.psi.PsiElement import org.jetbrains.jet.JetTestCaseBuilder -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractKotlinFunctionHandler import java.io.File import org.jetbrains.jet.plugin.refactoring.extractFunction.selectElements -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import com.intellij.psi.PsiComment import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import org.jetbrains.jet.JetTestUtils @@ -40,10 +40,10 @@ import org.jetbrains.jet.testing.ConfigLibraryUtil import org.jetbrains.jet.plugin.PluginTestCaseBase import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionData import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionOptions -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.jet.lang.psi.JetPackageDirective +import org.jetbrains.kotlin.psi.JetPackageDirective import org.jetbrains.kotlin.utils.emptyOrSingletonList public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt index 72974c90453..31e532bff84 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase import java.io.File import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import com.intellij.psi.PsiMember import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.google.gson.JsonObject @@ -52,11 +52,11 @@ import com.intellij.refactoring.move.MoveHandler import org.jetbrains.jet.getString import org.jetbrains.jet.getNullableString import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsProcessor -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveDestinationKotlinMoveTarget import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.search.allScope import org.jetbrains.jet.InTextDirectivesUtils import org.jetbrains.jet.testing.ConfigLibraryUtil diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java index 53134d46261..58e65fad330 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java @@ -20,8 +20,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.refactoring.EmptyValidator; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt index 11a26b42a89..9a3bd7d59f9 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt @@ -28,7 +28,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.psi.PsiDocumentManager import com.intellij.refactoring.rename.RenameProcessor import com.intellij.refactoring.rename.RenamePsiElementProcessor -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.jet.plugin.PluginTestCaseBase import com.intellij.psi.search.GlobalSearchScope diff --git a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt index e37933a4893..21a2ec7ff03 100644 --- a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt @@ -40,20 +40,20 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil import org.jetbrains.jet.plugin.search.allScope import org.jetbrains.jet.plugin.util.application.runWriteAction import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetTreeVisitorVoid +import org.jetbrains.kotlin.psi.JetNamedDeclaration import java.util.ArrayList import com.intellij.psi.PsiComment -import org.jetbrains.jet.lang.psi.psiUtil.siblings -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.psiUtil.siblings +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.psi.PsiManager import org.jetbrains.jet.testing.ConfigLibraryUtil import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType private val RUN_PREFIX = "// RUN: " diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java index f277c4785ed..391f6b8f541 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java @@ -27,7 +27,7 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java index 79d36556350..d9c841829a7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java @@ -21,8 +21,8 @@ import com.intellij.psi.stubs.StubElement; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.stubs.elements.JetFileStubBuilder; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder; import org.jetbrains.jet.lang.resolve.name.SpecialNames; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/DebugTextByStubTest.kt b/idea/tests/org/jetbrains/jet/plugin/stubs/DebugTextByStubTest.kt index 9fe691e58c2..250a6527e47 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/DebugTextByStubTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/DebugTextByStubTest.kt @@ -17,28 +17,28 @@ package org.jetbrains.jet.plugin.stubs import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.stubs.elements.JetFileStubBuilder +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder import com.intellij.psi.stubs.StubElement -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import org.junit.Assert -import org.jetbrains.jet.lang.psi.JetPackageDirective -import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub -import org.jetbrains.jet.lang.psi.JetImportList -import org.jetbrains.jet.lang.psi.JetNamedFunction -import org.jetbrains.jet.lang.psi.stubs.KotlinFunctionStub -import org.jetbrains.jet.lang.psi.JetTypeReference -import org.jetbrains.jet.lang.psi.stubs.KotlinClassStub -import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.lang.psi.stubs.KotlinObjectStub -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyStub +import org.jetbrains.kotlin.psi.JetPackageDirective +import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub +import org.jetbrains.kotlin.psi.JetImportList +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub +import org.jetbrains.kotlin.psi.JetTypeReference +import org.jetbrains.kotlin.psi.stubs.KotlinClassStub +import org.jetbrains.kotlin.psi.JetClass +import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub +import org.jetbrains.kotlin.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub import kotlin.test.assertEquals -import org.jetbrains.jet.lang.psi.JetClassBody -import org.jetbrains.jet.lang.psi.JetClassInitializer -import org.jetbrains.jet.lang.psi.JetClassObject -import org.jetbrains.jet.lang.psi.debugText.getDebugText +import org.jetbrains.kotlin.psi.JetClassBody +import org.jetbrains.kotlin.psi.JetClassInitializer +import org.jetbrains.kotlin.psi.JetClassObject +import org.jetbrains.kotlin.psi.debugText.getDebugText public class DebugTextByStubTest : LightCodeInsightFixtureTestCase() { private fun createFileAndStubTree(text: String): Pair> { @@ -223,4 +223,4 @@ public class DebugTextByStubTest : LightCodeInsightFixtureTestCase() { assertEquals("STUB: enum entry E2 : Enum", entries[1].getDebugText()) assertEquals("STUB: enum entry E3 : Enum", entries[2].getDebugText()) } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java index cf15892b029..7cded46a840 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java @@ -20,11 +20,11 @@ import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.stubs.KotlinClassStub; -import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import java.util.List; diff --git a/idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt b/idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt index 9f86abc1598..a3a96d55222 100644 --- a/idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt +++ b/idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.psi import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.JetLightProjectDescriptor -import org.jetbrains.jet.lang.psi.JetStringTemplateExpression -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetStringTemplateExpression +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.ElementManipulators import org.junit.Assert.* import com.intellij.openapi.util.TextRange @@ -70,4 +70,4 @@ public class StringTemplateExpressionManipulatorTest: JetLightCodeInsightFixture } override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt b/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt index 785acba3b76..34438c5a5b6 100644 --- a/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt +++ b/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.psi.injection -import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.psi.JetStringTemplateExpression +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetStringTemplateExpression import org.junit.Assert.* import com.intellij.openapi.util.TextRange import java.util.HashMap diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt index 54ccb492e0e..0baba41d16d 100644 --- a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt +++ b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt @@ -19,18 +19,18 @@ package org.jetbrains.jet.psi.patternMatching import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetLightProjectDescriptor -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.psiUtil.parents import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.lang.psi.JetElement +import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange import java.io.File import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetTypeReference -import org.jetbrains.jet.lang.psi.JetWhenCondition +import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetWhenCondition import org.jetbrains.jet.plugin.DirectiveBasedActionUtils import org.jetbrains.jet.InTextDirectivesUtils import org.jetbrains.jet.testing.ConfigLibraryUtil @@ -64,4 +64,4 @@ public abstract class AbstractJetPsiUnifierTest: JetLightCodeInsightFixtureTestC } override fun getProjectDescriptor(): LightProjectDescriptor = getProjectDescriptorFromTestName() -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java index 35edda82411..e66d0bd127f 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java @@ -18,9 +18,9 @@ package org.jetbrains.jet.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetClassInitializer; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetPsiUtil; +import org.jetbrains.kotlin.psi.JetClassInitializer; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.plugin.project.ResolveElementCache; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt index 47990b6f56d..a75168b4bb7 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt @@ -17,30 +17,30 @@ package org.jetbrains.jet.resolve import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.JetTestCaseBuilder import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import java.util.HashSet import org.jetbrains.jet.JetTestUtils import java.io.File -import org.jetbrains.jet.lang.psi.JetBlockExpression +import org.jetbrains.kotlin.psi.JetBlockExpression import org.junit.Assert import org.jetbrains.jet.lang.types.JetType import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade -import org.jetbrains.jet.lang.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.psiUtil.parents import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.command.CommandProcessor -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.psi.JetReferenceExpression -import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression +import org.jetbrains.kotlin.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode import org.jetbrains.jet.plugin.JetFileType import com.intellij.openapi.util.io.FileUtil diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java index 45e75566b20..4c6fc07a834 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java @@ -29,7 +29,7 @@ import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCa import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.jet.test.util.UtilPackage; diff --git a/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java b/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java index dc80fab9a3d..912ca9a5f7e 100644 --- a/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java +++ b/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java @@ -26,7 +26,7 @@ import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt b/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt index e28d2c17dcb..8b31d5f4b19 100644 --- a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt +++ b/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.shortenRefs import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.openapi.application.ApplicationManager import java.io.File @@ -69,4 +69,4 @@ public abstract class AbstractShortenRefsTest : JetLightCodeInsightFixtureTestCa codeInsightSettings.OPTIMIZE_IMPORTS_ON_THE_FLY = optimizeImportsBefore } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java b/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java index 784ba908bb7..a51deea7d32 100644 --- a/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java +++ b/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java @@ -26,8 +26,8 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java index edb962c245f..c06d4ddd96a 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java +++ b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt index 71ea0bbdf84..a190f755474 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.j2k -import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.project.Project import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.psi.JetUnaryExpression -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetUnaryExpression +import org.jetbrains.kotlin.psi.JetProperty class AfterConversionPass(val project: Project, val postProcessor: PostProcessor) { public fun run(kotlinCode: String): String { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt index 7ae6e41cafa..47ab2bcdd7b 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.j2k import com.intellij.psi.* import java.util.HashSet -import org.jetbrains.jet.lang.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.psi.psiUtil.isAncestor import java.util.ArrayList import org.jetbrains.kotlin.j2k.ast.Element import kotlin.platform.platformName diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index 874435880f5..dbd6a36419f 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -25,18 +25,18 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.lang.types.lang.PrimitiveType import org.jetbrains.kotlin.j2k.* import org.jetbrains.kotlin.asJava.KotlinLightMethod -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetFunction -import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration -import org.jetbrains.jet.lang.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.psi.JetParameter -import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetClassOrObject +import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration +import org.jetbrains.kotlin.psi.JetPropertyAccessor +import org.jetbrains.kotlin.psi.JetParameter +import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.kotlin.asJava.KotlinLightField -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType trait ExpressionConverter { fun convertExpression(expression: PsiExpression, codeConverter: CodeConverter): Expression diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt index a517b38fdb5..1a88597496c 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.progress.ProcessCanceledException import org.jetbrains.kotlin.j2k.ast.Element import com.intellij.openapi.project.Project import com.intellij.psi.PsiJavaFile -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.openapi.diagnostic.Logger import java.util.ArrayList diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt index 23d35bf707b..ee696e9b4bb 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.j2k -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor public trait ResolverForConverter { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt index 58b6fb852e1..7e0a0f20976 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt @@ -32,7 +32,7 @@ import java.util.HashMap import org.jetbrains.kotlin.j2k.ast.Mutability import java.util.HashSet import org.jetbrains.kotlin.asJava.KotlinLightElement -import org.jetbrains.jet.lang.psi.JetCallableDeclaration +import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.jet.lang.types.TypeUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.CallableDescriptor diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt index 405d87bcceb..5a53d98dee7 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.j2k.IdeaResolverForConverter public abstract class AbstractJavaToKotlinConverterMultiFileTest : AbstractJavaToKotlinConverterTest() { diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index e53cf44a698..8dfee91fc14 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.test.util.trimIndent import org.jetbrains.jet.plugin.j2k.J2kPostProcessor import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.psi.PsiJavaFile -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.j2k.IdeaResolverForConverter public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterTest() { diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt index 698602bf093..213f5bd6b97 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.util.Computable import org.jetbrains.jet.lang.diagnostics.Severity import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.jet.JetTestCaseBuilder import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess diff --git a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java index 936c605f17f..d57a072b271 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -50,7 +50,7 @@ import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.calls.CallCompleter; import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.psi.JetImportsFactory; +import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java index 163a27f2462..c07d82c6e11 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt index bc025ec6262..d349455425d 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt @@ -20,9 +20,9 @@ import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.kotlin.js.PredefinedAnnotation.* import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.diagnostics.Severity -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.js.config.LibrarySourcesConfig -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression +import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.descriptors.VariableDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1 import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java index 8d8ef0d9ce2..28ee1319d14 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java @@ -23,7 +23,7 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java index e44662bba79..94c4c74e8fd 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java @@ -28,7 +28,7 @@ import kotlin.Function2; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.kotlin.utils.LibraryUtils; import org.jetbrains.kotlin.js.JavaScript; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java index 802b6e032a6..c1e10c3afb7 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java @@ -28,8 +28,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt index 99e710d11aa..44333d41a13 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.js.resolve import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider import org.jetbrains.jet.lang.resolve.AnnotationChecker -import org.jetbrains.jet.lang.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticSink import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.psi.JetNamedFunction +import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.types.TypeUtils diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java index b3c9ceb850b..be615020a77 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java @@ -21,9 +21,9 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory2; import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.types.JetType; import java.util.List; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt index 02e961fb274..c6e726fc58b 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.resolve.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.diagnostics.PositioningStrategy -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2 import org.jetbrains.jet.lang.diagnostics.ParametrizedDiagnostic diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index ea215f3ed07..a89d2d56b07 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java @@ -31,8 +31,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java index 9a250abd509..4b2ba339c7d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.utils.fileUtils.FileUtilsPackage; @@ -55,7 +55,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.hasError; -import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.js.facade.FacadeUtils.parseString; /** diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt index b91f2615a48..b53c52bb81e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.callTranslator import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver -import org.jetbrains.jet.lang.psi.JetSuperExpression +import org.jetbrains.kotlin.psi.JetSuperExpression import com.google.dart.compiler.backend.js.ast.JsExpression import org.jetbrains.jet.lang.descriptors.VariableDescriptor import com.google.dart.compiler.backend.js.ast.JsName diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt index 60937cc35c0..10e8327d0f5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.js.translate.general.Translation import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil -import org.jetbrains.jet.lang.psi.Call.CallType +import org.jetbrains.kotlin.psi.Call.CallType import kotlin.test.assertNotNull object CallTranslator { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt index f59f7c08e4c..2f4628701c4 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt @@ -36,16 +36,16 @@ import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.kotlin.js.PredefinedAnnotation import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic -import org.jetbrains.jet.lang.psi.Call +import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.js.translate.operation.OperatorTable import com.google.dart.compiler.backend.js.ast.JsBinaryOperation -import org.jetbrains.jet.lang.psi.JetPrefixExpression +import org.jetbrains.kotlin.psi.JetPrefixExpression import com.google.dart.compiler.backend.js.ast.JsPrefixOperation -import org.jetbrains.jet.lang.psi.JetPostfixExpression +import org.jetbrains.kotlin.psi.JetPostfixExpression import com.google.dart.compiler.backend.js.ast.JsPostfixOperation -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetOperationExpression +import org.jetbrains.kotlin.psi.JetOperationExpression import org.jetbrains.kotlin.js.translate.utils.PsiUtils public fun addReceiverToArgs(receiver: JsExpression, arguments: List): List { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java index 49c498d2130..f7ffc2e7e61 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java @@ -21,7 +21,7 @@ import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import java.util.Collections; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index 5f287be430e..85c0fa9bdb8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.MemberDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java index 6dc26a349f5..a4d14a59946 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java @@ -20,9 +20,9 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java index e815df05280..f510af568a8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorPackage; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt index f3246715905..cf93b94ee08 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.declaration import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.AbstractTranslator diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt index bfe5cc56fd6..6eca2f471f5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt @@ -19,12 +19,12 @@ import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer import org.jetbrains.kotlin.js.translate.initializer.InitializerVisitor import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.context.TranslationContext -import org.jetbrains.jet.lang.psi.JetClassInitializer +import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.kotlin.js.translate.general.Translation -import org.jetbrains.jet.lang.psi.JetProperty +import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.js.translate.initializer.InitializerUtils -import org.jetbrains.jet.lang.psi.JetObjectDeclaration -import org.jetbrains.jet.lang.psi.JetClass +import org.jetbrains.kotlin.psi.JetObjectDeclaration +import org.jetbrains.kotlin.psi.JetClass import com.google.dart.compiler.backend.js.ast.JsFunction import org.jetbrains.kotlin.js.translate.utils.BindingUtils.* import org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.* diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java index 7028eb18d5d..103624d70c1 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator; import org.jetbrains.kotlin.js.translate.context.Namer; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java index 3f80d24f2a6..40735fbea8f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.*; import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java index a5f7d892301..56a79d9289f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java @@ -21,8 +21,8 @@ import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.context.DefinitionPlace; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt index 6bc054e3490..db419cfa8ae 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.js.translate.declaration.propertyTranslator import com.google.dart.compiler.backend.js.ast.* import com.intellij.util.SmartList import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.jet.lang.psi.JetPropertyAccessor +import org.jetbrains.kotlin.psi.JetProperty +import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt index ff7e0aa4f45..548e9340c52 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.psi.JetCatchClause -import org.jetbrains.jet.lang.psi.JetTypeReference +import org.jetbrains.kotlin.psi.JetCatchClause +import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull import org.jetbrains.jet.lang.resolve.DescriptorUtils diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java index 6e5e44ad7f5..0362236a614 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java index badcb2622c0..6a7d8dcf0a9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java @@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody; -import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression; +import org.jetbrains.kotlin.psi.JetDeclarationWithBody; +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.js.translate.context.AliasingContext; import org.jetbrains.kotlin.js.translate.context.Namer; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt index 9d9ca4318dc..b74afe9e9eb 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt @@ -21,7 +21,7 @@ import com.google.dart.compiler.backend.js.ast.metadata.staticRef import com.google.dart.compiler.backend.js.ast.metadata.isLocal import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody +import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.js.translate.context.* import org.jetbrains.kotlin.js.translate.general.AbstractTranslator import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt index 5e95558a19c..88586c0efd7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.expression.loopTranslator import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType import org.jetbrains.kotlin.lexer.JetTokens diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java index 8ed69caab8f..556e470b02e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java @@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.JetMultiDeclaration; -import org.jetbrains.jet.lang.psi.JetMultiDeclarationEntry; +import org.jetbrains.kotlin.psi.JetMultiDeclaration; +import org.jetbrains.kotlin.psi.JetMultiDeclarationEntry; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java index fc1dc3c1402..e0bb964c178 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java @@ -22,9 +22,9 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetIsExpression; -import org.jetbrains.jet.lang.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetIsExpression; +import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java index 408ffe293ad..c3c3c3810a5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java @@ -22,7 +22,7 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef; import com.google.dart.compiler.backend.js.ast.JsNumberLiteral; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt index 0e2d00ce142..925953b1a1a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.psi.JetTryExpression -import org.jetbrains.jet.lang.psi.JetExpression +import org.jetbrains.kotlin.psi.JetTryExpression +import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.AbstractTranslator import org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java index bc290b0dd7b..11ed778b56c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.general.Translation; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.psi.*; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.negated; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java index c4499d71998..60f656ec77c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java @@ -26,9 +26,9 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetClass; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index ea1a14a9778..0148dc5135e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java @@ -21,10 +21,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetDeclarationWithBody; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.jet.plugin.MainFunctionDetector; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java index 7f33f351590..66253a96716 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.js.translate.general; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetDeclarationContainer; -import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetVisitor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetDeclarationContainer; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.JetVisitor; /** * This class is a base class for all visitors. diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java index 78d2baa1f98..bffba7d2336 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java @@ -23,10 +23,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetDelegationSpecifier; -import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall; -import org.jetbrains.jet.lang.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetDelegationSpecifier; +import org.jetbrains.kotlin.psi.JetDelegatorToSuperCall; +import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.types.JetType; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java index f2c87ca5e8a..ac277dbb1a7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java @@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; -import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java index 8a5a6f81efd..7ac2439807b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.js.translate.initializer; import com.google.dart.compiler.backend.js.ast.JsStatement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.Translation; import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor; +import org.jetbrains.kotlin.psi.*; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index 6369b1b4497..f39686f63cd 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetQualifiedExpression; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetQualifiedExpression; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt index adb9948b956..32413a5585b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.common.collect.ImmutableSet import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt index ca634022278..a0444aafdab 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt index f9e5b79e4b8..c7aa85d288c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.common.collect.ImmutableSet import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.js.translate.context.Namer diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt index 0b6b425874e..9d82ff3b9de 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.psi.JetBinaryExpression +import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java index 77fa3ae8980..051ed4f2d6c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java @@ -21,9 +21,9 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java index bde583db990..12723e95fa5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java index 22ce9ccd0b0..62fbcd876b2 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java @@ -22,7 +22,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java index 72d56a827a2..db0b6c85dd0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java @@ -24,8 +24,8 @@ import com.google.dart.compiler.util.AstUtil; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetUnaryExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetUnaryExpression; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java index 843a5d38b7a..7983d23bfa3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java @@ -20,8 +20,8 @@ import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java index 2598d35da13..bda898a66ea 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.psi.JetUnaryExpression; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetUnaryExpression; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.isPrefix; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java index 2c5f6f3bc6e..0b90e43f73e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java index 412f53cf609..45c340e0d47 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetUnaryExpression; +import org.jetbrains.kotlin.psi.JetUnaryExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java index 7b357cc1717..b59b59e5d1b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java @@ -21,9 +21,9 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetConstantExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetUnaryExpression; +import org.jetbrains.kotlin.psi.JetConstantExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetUnaryExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java index d42603d7530..55a21a3346c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetCallExpression; +import org.jetbrains.kotlin.psi.JetCallExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java index c2ef466969e..9dc4bdfd71e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.Translation; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java index 563c0a27a04..46705df6783 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java @@ -20,9 +20,9 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetArrayAccessExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java index e6e2db360ea..ff318bb6a5f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java index 1f56c649fa7..076ae898b91 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java @@ -21,8 +21,8 @@ import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.*; import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.context.TemporaryConstVariable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index 1efb51eb14e..093d53dc05b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -30,10 +30,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory2; import org.jetbrains.jet.lang.diagnostics.ParametrizedDiagnostic; -import org.jetbrains.jet.lang.psi.JetCallExpression; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetStringTemplateExpression; -import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.kotlin.psi.JetCallExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetStringTemplateExpression; +import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt index f6e4665b1bd..ec120766096 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor import com.google.dart.compiler.backend.js.ast.JsInvocation import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils -import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression +import org.jetbrains.kotlin.psi.JetCallableReferenceExpression import org.jetbrains.kotlin.js.translate.utils.BindingUtils import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor import org.jetbrains.jet.lang.descriptors.PropertyDescriptor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java index ad103942371..dcea3a4b3b2 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java @@ -20,8 +20,8 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java index b0b9126b2e9..128c8faec54 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java index e4d5fab2709..949612d2b0d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java index 68bfb5039e8..114540a6b1c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java @@ -20,14 +20,14 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetQualifiedExpression; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetQualifiedExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.BindingUtils; -import static org.jetbrains.jet.lang.psi.JetPsiUtil.isBackingFieldReference; +import static org.jetbrains.kotlin.psi.JetPsiUtil.isBackingFieldReference; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setQualifier; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSelectorAsSimpleName; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java index 450026d1949..7b556b18971 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java index bb1193ef9ea..3f6c5816080 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java @@ -22,7 +22,7 @@ import com.google.dart.compiler.backend.js.ast.JsStringLiteral; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java index a817ae74a1e..decbdc0afd5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java index dcbae744139..516d905b96c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; public final class ErrorReportingUtils { private ErrorReportingUtils() { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java index d87f1656a0a..40c8f0c9a28 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java @@ -20,8 +20,8 @@ import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.psi.JetDeclarationWithBody; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetDeclarationWithBody; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java index 1589ff0f71f..b255368e15c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java @@ -21,7 +21,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java index c2ae17dde80..786522d2802 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.js.translate.utils; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.psi.*; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.*; import java.util.Collections; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java index a352b5e823f..93eeacf3295 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeProjection; diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index 4955a445030..45b586748d2 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import java.util.ArrayList -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.renderer.DescriptorRenderer import kotlin.test.fail import org.jetbrains.kotlin.utils.PathUtil diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt index 50b2a789f54..50c55d65ee4 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt @@ -4,7 +4,7 @@ import com.intellij.psi.PsiComment import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.jet.lang.psi.* +import org.jetbrains.kotlin.psi.* class HtmlKotlinVisitor: JetTreeVisitor() { @@ -59,4 +59,4 @@ class HtmlKotlinVisitor: JetTreeVisitor() { accept(child, data) } } -} \ No newline at end of file +} diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 8f709849d01..20e53255f14 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -18,7 +18,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.LineAndColumn -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt index 259d20fc744..e2bf6fd290c 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.vfs.CharsetToolkit import com.intellij.psi.PsiFileFactory import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.testFramework.LightVirtualFile -import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.JetLanguage import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.doc.highlighter2.splitPsi