From 0499ec94ca17c1ace8489a9a23121defedc92301 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 10 Jan 2015 20:25:15 +0300 Subject: [PATCH] Rename jet -> kotlin in frontend: call resolution org.jetbrains.jet.lang.resolve.calls -> org.jetbrains.kotlin.resolve.calls --- .../kotlin/backend/common/CodegenUtil.java | 6 +-- .../kotlin/backend/common/bridges/impl.kt | 2 +- .../kotlin/codegen/ArgumentGenerator.java | 8 ++-- .../org/jetbrains/kotlin/codegen/AsmUtil.java | 2 +- .../codegen/CallBasedArgumentGenerator.java | 8 ++-- .../kotlin/codegen/CallGenerator.java | 4 +- .../kotlin/codegen/CallableMethod.java | 2 +- .../kotlin/codegen/ExpressionCodegen.java | 10 ++--- .../kotlin/codegen/FunctionCodegen.java | 2 +- .../codegen/ImplementationBodyCodegen.java | 12 +++--- .../kotlin/codegen/MemberCodegen.java | 2 +- .../kotlin/codegen/PropertyCodegen.java | 2 +- .../jetbrains/kotlin/codegen/StackValue.java | 4 +- .../kotlin/codegen/TailRecursionCodegen.java | 4 +- .../codegen/binding/CalculatedClosure.java | 2 +- .../binding/CodegenAnnotatingVisitor.java | 8 ++-- .../codegen/binding/CodegenBinding.java | 4 +- .../codegen/binding/MutableClosure.java | 2 +- .../kotlin/codegen/inline/InlineCodegen.java | 2 +- .../kotlin/codegen/intrinsics/Clone.java | 4 +- .../codegen/intrinsics/JavaClassArray.java | 8 ++-- .../codegen/intrinsics/JavaClassFunction.java | 4 +- .../intrinsics/MonitorInstruction.java | 8 ++-- .../kotlin/codegen/state/JetTypeMapper.java | 6 +-- .../di/InjectorForLazyResolveWithJava.java | 14 +++---- .../kotlin/di/InjectorForReplWithJava.java | 14 +++---- .../di/InjectorForTopDownAnalyzerForJvm.java | 14 +++---- .../jetbrains/jet/analyzer/AnalyzerUtil.kt | 2 +- .../jetbrains/jet/checkers/DebugInfoUtil.java | 6 +-- .../jet/lang/resolve/AnnotationResolver.java | 16 +++---- .../jet/lang/resolve/BindingContext.java | 6 +-- .../jet/lang/resolve/BindingContextUtils.java | 8 ++-- .../jet/lang/resolve/BindingContextUtils.kt | 4 +- .../lang/resolve/BodiesResolveContext.java | 2 +- .../jet/lang/resolve/BodyResolver.java | 6 +-- .../resolve/CompileTimeConstantUtils.java | 2 +- .../resolve/DelegatedPropertyResolver.java | 18 ++++---- .../jet/lang/resolve/DescriptorResolver.java | 2 +- .../lang/resolve/InlineDescriptorUtils.java | 8 ++-- .../jet/lang/resolve/OverrideResolver.java | 2 +- .../jet/lang/resolve/ScriptBodyResolver.java | 2 +- .../lang/resolve/TopDownAnalysisContext.java | 2 +- .../descriptors/AbstractLazyMemberScope.kt | 2 +- .../kotlin/cfg/JetControlFlowBuilder.java | 2 +- .../cfg/JetControlFlowBuilderAdapter.java | 2 +- .../kotlin/cfg/JetControlFlowProcessor.java | 4 +- .../cfg/JetFlowInformationProvider.java | 6 +-- .../JetControlFlowInstructionsGenerator.java | 2 +- .../instructions/eval/accessInstructions.kt | 2 +- .../eval/operationInstructions.kt | 2 +- .../kotlin/cfg/pseudocode/pseudocodeUtil.kt | 2 +- .../kotlin/di/InjectorForBodyResolve.java | 14 +++---- .../kotlin/di/InjectorForLazyBodyResolve.java | 14 +++---- .../kotlin/di/InjectorForLazyResolve.java | 14 +++---- .../InjectorForLazyTopDownAnalyzerBasic.java | 14 +++---- .../kotlin/di/InjectorForMacros.java | 14 +++---- .../di/InjectorForTopDownAnalyzerBasic.java | 14 +++---- .../jetbrains/kotlin/diagnostics/Errors.java | 4 +- .../diagnostics/rendering/Renderers.java | 14 +++---- .../rendering/TabledDescriptorRenderer.java | 4 +- .../kotlin/psi/psiUtil/jetPsiUtil.kt | 2 +- .../resolve/calls/ArgumentTypeResolver.java | 22 +++++----- .../resolve/calls/CallCompleter.kt | 42 +++++++++---------- .../resolve/calls/CallExpressionResolver.java | 26 ++++++------ .../resolve/calls/CallResolver.java | 36 ++++++++-------- .../resolve/calls/CallResolverUtil.java | 8 ++-- .../resolve/calls/CallTransformer.java | 30 ++++++------- .../resolve/calls/CandidateResolver.java | 42 +++++++++---------- .../ValueArgumentsToParametersMapper.java | 12 +++--- .../context/BasicCallResolutionContext.java | 10 ++--- .../CallCandidateResolutionContext.java | 14 +++---- .../calls/context/CallResolutionContext.java | 12 +++--- .../context/CheckValueArgumentsMode.java | 4 +- .../calls/context/ContextDependency.java | 4 +- .../calls/context/ResolutionContext.java | 8 ++-- .../calls/context/ResolutionResultsCache.kt | 11 +++-- .../context/SimpleResolutionContext.java | 8 ++-- .../calls/context/TemporaryTraceAndCache.java | 4 +- .../extensions/CallResolverExtension.java | 9 ++-- .../CallResolverExtensionProvider.java | 4 +- .../extensions/CapturingInClosureExtension.kt | 12 +++--- .../calls/extensions/CompositeExtension.java | 8 ++-- .../InlineCallResolverExtension.java | 17 ++++---- .../NeedSyntheticCallResolverExtension.java | 8 ++-- ...ReifiedTypeParameterSubstitutionCheck.java | 9 ++-- .../inference/ConstraintSystemCompleter.java | 6 +-- .../calls/inference/ConstraintType.java | 4 +- .../calls/inference/ConstraintsUtil.java | 4 +- .../calls/inference/InferenceErrorData.java | 4 +- .../calls/inference/SubtypingConstraint.java | 4 +- .../resolve/calls/model/ArgumentMapping.kt | 4 +- .../calls/model/DataFlowInfoForArguments.java | 6 +-- .../model/DataFlowInfoForArgumentsImpl.java | 6 +-- .../calls/model/DefaultValueArgument.java | 4 +- .../calls/model/DelegatingResolvedCall.java | 8 ++-- .../calls/model/ExpressionValueArgument.java | 4 +- .../MutableDataFlowInfoForArguments.java | 6 +-- .../calls/model/MutableResolvedCall.java | 8 ++-- .../resolve/calls/model/ResolvedCall.java | 8 ++-- .../resolve/calls/model/ResolvedCallImpl.java | 20 ++++----- .../calls/model/ResolvedValueArgument.java | 4 +- .../calls/model/VarargValueArgument.java | 4 +- .../model/VariableAsFunctionResolvedCall.kt | 8 ++-- .../results/OverloadResolutionResults.java | 6 +-- .../OverloadResolutionResultsImpl.java | 8 ++-- .../OverloadResolutionResultsUtil.java | 10 ++--- .../results/OverloadingConflictResolver.java | 10 ++--- .../results/ResolutionResultsHandler.java | 18 ++++---- .../calls/results/ResolutionStatus.java | 4 +- .../calls/smartcasts/DataFlowInfo.java | 4 +- .../calls/smartcasts/DataFlowValue.java | 4 +- .../smartcasts/DataFlowValueFactory.java | 8 ++-- .../smartcasts/DelegatingDataFlowInfo.java | 6 +-- .../resolve/calls/smartcasts/Nullability.java | 4 +- .../calls/smartcasts/SmartCastUtils.java | 8 ++-- .../calls/tasks/AbstractTracingStrategy.java | 12 +++--- .../tasks/CallableDescriptorCollectors.kt | 6 +-- .../calls/tasks/ExplicitReceiverKind.java | 4 +- .../calls/tasks/ResolutionCandidate.java | 4 +- .../resolve/calls/tasks/ResolutionTask.java | 14 +++---- .../calls/tasks/ResolutionTaskHolder.kt | 6 +-- .../resolve/calls/tasks/TaskPrioritizer.kt | 18 ++++---- .../resolve/calls/tasks/TracingStrategy.java | 8 ++-- .../calls/tasks/TracingStrategyForInvoke.java | 6 +-- .../calls/tasks/TracingStrategyImpl.java | 10 ++--- .../resolve/calls/tasks/dynamicCalls.kt | 8 ++-- .../resolve/calls/util/CallMaker.java | 4 +- .../resolve/calls/util/DelegatingCall.java | 4 +- .../util/FakeCallableDescriptorForObject.kt | 4 +- .../resolve/calls/util/callUtil.kt | 14 +++---- .../evaluate/ConstantExpressionEvaluator.kt | 8 ++-- .../jetbrains/kotlin/types/JetTypeInfo.java | 3 +- .../BasicExpressionTypingVisitor.java | 42 +++++++++---------- .../ClosureExpressionsTypingVisitor.java | 2 +- .../ControlStructureTypingUtils.java | 23 +++++----- .../ControlStructureTypingVisitor.java | 8 ++-- .../types/expressions/DataFlowUtils.java | 12 +++--- .../ExpressionTypingComponents.java | 2 +- .../expressions/ExpressionTypingContext.java | 12 +++--- .../expressions/ExpressionTypingServices.java | 14 +++---- .../expressions/ExpressionTypingUtils.java | 6 +-- .../ExpressionTypingVisitorForStatements.java | 12 +++--- .../ForLoopConventionsChecker.java | 6 +-- .../types/expressions/LabelResolver.java | 2 +- .../PatternMatchingTypingVisitor.java | 10 ++--- .../checkers/AbstractJetDiagnosticsTest.java | 4 +- .../jet/checkers/LazyOperationsLog.kt | 6 +-- .../resolve/JetExpectedResolveDataUtil.java | 6 +-- .../calls/AbstractResolvedCallsTest.kt | 10 ++--- .../AbstractConstraintSystemTest.kt | 4 +- .../CapturedTypeApproximationTest.kt | 2 +- .../JetDefaultModalityModifiersTest.java | 2 +- .../jetbrains/jet/types/JetOverloadTest.java | 2 +- .../jet/types/JetOverridingTest.java | 2 +- .../jet/types/JetTypeCheckerTest.java | 2 +- .../jetbrains/kotlin/di/InjectorForTests.java | 14 +++---- .../inference/CapturedTypeConstructor.kt | 4 +- .../calls/inference/ConstraintPosition.kt | 9 ++-- .../calls/inference/ConstraintSystem.kt | 6 +-- .../calls/inference/ConstraintSystemImpl.kt | 18 ++++---- .../calls/inference/ConstraintSystemStatus.kt | 8 ++-- .../resolve/calls/inference/TypeBounds.kt | 6 +-- .../resolve/calls/inference/TypeBoundsImpl.kt | 13 +++--- .../kotlin/types/CapturedTypeApproximation.kt | 4 +- .../kotlin/types/TypeSubstitutor.java | 2 +- .../org/jetbrains/kotlin/types/TypeUtils.java | 4 +- .../generators/injectors/GenerateInjectors.kt | 2 +- .../lang/resolve/lazy/ElementResolver.java | 2 +- .../codeInsight/ReferenceVariantsHelper.kt | 4 +- .../jetbrains/jet/plugin/util/FuzzyType.kt | 8 ++-- .../jet/plugin/util/extensionsUtils.kt | 4 +- .../caches/resolve/KotlinResolveCache.kt | 2 +- .../plugin/codeInsight/ShortenReferences.kt | 2 +- .../DeprecatedAnnotationVisitor.java | 6 +-- .../FunctionsHighlightingVisitor.java | 8 ++-- .../HtmlTabledDescriptorRenderer.java | 6 +-- .../jet/plugin/highlighter/IdeRenderers.java | 4 +- .../PropertiesHighlightingVisitor.java | 2 +- .../VariablesHighlightingVisitor.java | 2 +- .../jet/plugin/highlighter/renderersUtil.kt | 4 +- .../intentions/OperatorToFunctionIntention.kt | 2 +- .../intentions/RemoveExplicitTypeArguments.kt | 4 +- .../references/JetArrayAccessReference.java | 2 +- .../JetInvokeFunctionReference.java | 6 +-- .../internal/FindImplicitNothingAction.kt | 2 +- .../jet/plugin/caches/KotlinIndicesHelper.kt | 2 +- .../codeInsight/OverrideMethodsHandler.java | 2 +- .../plugin/completion/CompletionSession.kt | 2 +- .../DataFlowInfoUtilForCompletion.kt | 2 +- .../jet/plugin/completion/ExpectedInfos.kt | 20 ++++----- .../completion/smart/TypesWithSmartCasts.kt | 8 ++-- .../jet/plugin/debugger/JetPositionManager.kt | 6 +-- .../debugger/KotlinSmartStepIntoHandler.kt | 2 +- .../ConvertAssertToIfWithThrowIntention.kt | 2 +- .../ConvertIfWithThrowToAssertIntention.kt | 2 +- .../ConvertToForEachLoopIntention.kt | 2 +- .../intentions/InsertExplicitTypeArguments.kt | 2 +- .../MoveLambdaOutsideParenthesesIntention.kt | 2 +- .../ReplaceWithInfixFunctionCallIntention.kt | 2 +- .../AttributeCallReplacementIntention.kt | 8 ++-- .../branchedTransformations/IfThenUtils.kt | 2 +- .../macro/BaseJetVariableMacro.java | 2 +- .../plugin/quickfix/AddNameToArgumentFix.java | 4 +- .../ChangeFunctionLiteralReturnTypeFix.java | 4 +- .../quickfix/ChangeFunctionReturnTypeFix.java | 4 +- .../quickfix/ChangeVariableTypeFix.java | 2 +- .../QuickFixFactoryForTypeMismatchError.java | 4 +- .../jet/plugin/quickfix/QuickFixUtil.java | 4 +- ...teClassFromConstructorCallActionFactory.kt | 2 +- ...assFromReferenceExpressionActionFactory.kt | 2 +- ...FunctionOrPropertyFromCallActionFactory.kt | 2 +- .../CreateSetFunctionActionFactory.kt | 2 +- ...teParameterByNamedArgumentActionFactory.kt | 2 +- .../JetChangeSignatureHandler.java | 2 +- .../extractFunction/ExtractionData.kt | 6 +-- .../inline/KotlinInlineValHandler.java | 4 +- .../KotlinIntroduceVariableHandler.java | 2 +- .../rename/RenameDynamicMemberHandler.kt | 2 +- .../util/psi/patternMatching/JetPsiUnifier.kt | 10 ++--- .../jet/plugin/util/psiModificationUtil.kt | 6 +-- .../di/InjectorForTopDownAnalyzerForJs.java | 14 +++---- .../js/translate/callTranslator/CallInfo.kt | 5 +-- .../callTranslator/CallTranslator.kt | 8 ++-- .../callTranslator/FunctionCallCases.kt | 2 +- .../js/translate/context/StaticContext.java | 2 +- .../declaration/PropertyTranslator.kt | 2 +- .../js/translate/expression/LoopTranslator.kt | 2 +- .../MultiDeclarationTranslator.java | 2 +- .../ClassInitializerTranslator.java | 4 +- .../functions/factories/TopLevelFIF.java | 2 +- .../intrinsic/operation/CompareToBOIF.kt | 3 +- .../intrinsic/operation/EqualsBOIF.kt | 2 +- .../operation/BinaryOperationTranslator.java | 4 +- .../operation/IncrementTranslator.java | 8 ++-- .../OverloadedAssignmentTranslator.java | 6 +-- .../OverloadedIncrementTranslator.java | 6 +-- .../operation/UnaryOperationTranslator.java | 4 +- .../AbstractCallExpressionTranslator.java | 6 +-- .../reference/ArrayAccessTranslator.java | 12 +++--- .../reference/CallArgumentTranslator.java | 8 ++-- .../reference/CallExpressionTranslator.java | 20 ++++----- .../reference/VariableAccessTranslator.java | 8 ++-- .../js/translate/utils/BindingUtils.java | 2 +- 243 files changed, 838 insertions(+), 848 deletions(-) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/ArgumentTypeResolver.java (93%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/CallCompleter.kt (90%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/CallExpressionResolver.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/CallResolver.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/CallResolverUtil.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/CallTransformer.java (92%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/CandidateResolver.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/ValueArgumentsToParametersMapper.java (97%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/BasicCallResolutionContext.java (93%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/CallCandidateResolutionContext.java (92%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/CallResolutionContext.java (86%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/CheckValueArgumentsMode.java (86%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/ContextDependency.java (86%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/ResolutionContext.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/ResolutionResultsCache.kt (88%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/SimpleResolutionContext.java (91%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/context/TemporaryTraceAndCache.java (93%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/extensions/CallResolverExtension.java (72%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/extensions/CallResolverExtensionProvider.java (97%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/extensions/CapturingInClosureExtension.kt (90%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/extensions/CompositeExtension.java (84%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/extensions/InlineCallResolverExtension.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java (89%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java (89%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/ConstraintSystemCompleter.java (83%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/ConstraintType.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/ConstraintsUtil.java (98%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/InferenceErrorData.java (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/SubtypingConstraint.java (93%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/ArgumentMapping.kt (95%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/DataFlowInfoForArguments.java (83%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/DataFlowInfoForArgumentsImpl.java (94%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/DefaultValueArgument.java (92%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/DelegatingResolvedCall.java (93%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/ExpressionValueArgument.java (94%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/MutableDataFlowInfoForArguments.java (91%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/MutableResolvedCall.java (88%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/ResolvedCall.java (92%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/ResolvedCallImpl.java (94%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/ResolvedValueArgument.java (89%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/VarargValueArgument.java (94%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/model/VariableAsFunctionResolvedCall.kt (89%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/results/OverloadResolutionResults.java (91%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/results/OverloadResolutionResultsImpl.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/results/OverloadResolutionResultsUtil.java (88%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/results/OverloadingConflictResolver.java (97%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/results/ResolutionResultsHandler.java (93%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/results/ResolutionStatus.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/smartcasts/DataFlowInfo.java (94%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/smartcasts/DataFlowValue.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/smartcasts/DataFlowValueFactory.java (98%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/smartcasts/DelegatingDataFlowInfo.java (98%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/smartcasts/Nullability.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/smartcasts/SmartCastUtils.java (97%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/AbstractTracingStrategy.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/CallableDescriptorCollectors.kt (97%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/ExplicitReceiverKind.java (92%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/ResolutionCandidate.java (97%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/ResolutionTask.java (92%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/ResolutionTaskHolder.kt (94%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/TaskPrioritizer.kt (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/TracingStrategy.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/TracingStrategyForInvoke.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/TracingStrategyImpl.java (91%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/tasks/dynamicCalls.kt (97%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/util/CallMaker.java (99%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/util/DelegatingCall.java (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/util/FakeCallableDescriptorForObject.kt (96%) rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/util/callUtil.kt (94%) rename core/descriptors/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/CapturedTypeConstructor.kt (96%) rename core/descriptors/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/ConstraintPosition.kt (89%) rename core/descriptors/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/ConstraintSystem.kt (94%) rename core/descriptors/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/ConstraintSystemImpl.kt (96%) rename core/descriptors/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/ConstraintSystemStatus.kt (95%) rename core/descriptors/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/TypeBounds.kt (86%) rename core/descriptors/src/org/jetbrains/{jet/lang => kotlin}/resolve/calls/inference/TypeBoundsImpl.kt (93%) 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 3a66c6901af..bbd46c48c67 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 @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.descriptors.*; 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; -import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt index 9b6998663ac..a56791cbbe0 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.backend.common.bridges import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.OverrideResolver -import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil import org.jetbrains.kotlin.types.TypeUtils public fun generateBridgesForFunctionDescriptor( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java index b21f732600c..c8387c5a726 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -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; -import org.jetbrains.jet.lang.resolve.calls.model.VarargValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 178d3c1c94e..805d835bbc2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -35,7 +35,7 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java index a683f101ae2..7ab9e1e06f1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java @@ -20,10 +20,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; 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; -import org.jetbrains.jet.lang.resolve.calls.model.VarargValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument; import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java index 5a63c5f59e5..595910a28f2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.org.objectweb.asm.Type; public abstract class CallGenerator { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java index ca27268661e..4994d5527ac 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index e9e2cdd52fc..cc7d15a4fc0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -50,9 +50,9 @@ import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; -import org.jetbrains.jet.lang.resolve.calls.model.*; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject; +import org.jetbrains.kotlin.resolve.calls.model.*; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; import org.jetbrains.jet.lang.resolve.java.JvmAbi; @@ -87,8 +87,8 @@ 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; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 70e74188ef2..7174d4af4f5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -39,7 +39,7 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.jet.lang.resolve.constants.ArrayValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.JavaClassValue; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 81283c86e42..0fbefca2c45 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -39,12 +39,12 @@ import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; -import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; -import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; -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.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.VarargValueArgument; +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 35b9951b423..73ea6341738 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index fa929f5eec0..c3216a45c7a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.descriptors.*; 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; 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 ff895954c84..30005191a9b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.descriptors.*; 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java index 3daeb7b1c92..e87fde3c0bd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java @@ -27,14 +27,14 @@ 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.kotlin.resolve.calls.model.*; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; public class TailRecursionCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java index ed0f882c8c6..fe41a3613c2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; 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 2e267dcddfc..e1ac217dfb9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -38,10 +38,10 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; -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; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.EnumValue; import org.jetbrains.jet.lang.resolve.constants.NullValue; 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 2ca294eaab1..0acf8d2c32c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -42,7 +42,7 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; public class CodegenBinding { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java index 7ba6fd8ba92..4f7d43d8776 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; 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 a8e866550ea..dd4d457eacb 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.descriptors.*; 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; 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 78d1f18da30..3619c28565b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.codegen.StackValue; 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.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.org.objectweb.asm.Type; @@ -32,7 +32,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; public class Clone extends IntrinsicMethod { 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 487e2c9515f..3a4281c9267 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java @@ -24,16 +24,16 @@ import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; public class JavaClassArray extends IntrinsicMethod { @NotNull 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 20690897a42..f2043959359 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.inline.ReifiedTypeInliner; 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.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.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/MonitorInstruction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java index ace0c26341d..4b583418d34 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java @@ -24,16 +24,16 @@ import org.jetbrains.kotlin.codegen.StackValue; 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; +import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; public class MonitorInstruction extends IntrinsicMethod { 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 05216826efc..e2aa4f9d9a3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -36,9 +36,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; -import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; import org.jetbrains.jet.lang.resolve.java.AsmTypes; 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 2856bbf402e..f0c727d04b1 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -43,8 +43,8 @@ import org.jetbrains.jet.context.LazyResolveToken; import org.jetbrains.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct; import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; @@ -52,16 +52,16 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; 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 4f13bedd642..1866f71da7a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -46,8 +46,8 @@ import org.jetbrains.jet.lang.resolve.java.JavaFlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; @@ -55,17 +55,17 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; 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 37543ab8d44..e322985beff 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -45,8 +45,8 @@ import org.jetbrains.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct; import org.jetbrains.jet.lang.resolve.java.JavaFlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; @@ -54,17 +54,17 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt index 6aed722d36d..9a845849ddb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.analyzer 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 +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.descriptors.ModuleDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index 8b79104b2b8..b0e00504fc9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -33,9 +33,9 @@ import org.jetbrains.kotlin.diagnostics.Errors; 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; 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 624352b8e6f..f8e163b2dc7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -29,14 +29,14 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; 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; -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.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.constants.ArrayValue; 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/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java index b26d748dac1..4d1591d35d7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java @@ -27,9 +27,9 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemCompleter; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.name.FqName; 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 fc97c869d4e..b21ad0d367f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java @@ -25,10 +25,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; 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; -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetTypeInfo; import org.jetbrains.kotlin.types.TypeUtils; 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 ecab0cba34c..7f17dc81679 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext public fun JetReturnExpression.getTargetFunctionDescriptor(context: BindingContext): FunctionDescriptor? { val targetLabel = getTargetLabel() 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 5d12fc14c95..c216b7f0efd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; 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 58204322735..381385a7a90 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -24,9 +24,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; 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; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; 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 9e5d1002aed..407af89f39c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluat 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.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.BooleanValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.name.FqName; 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 0276899e663..2511aff168a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java @@ -22,13 +22,13 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.rendering.Renderers; 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemCompleter; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; @@ -47,8 +47,8 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; 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; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getCalleeExpressionIfAny; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.FROM_COMPLETER; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.createFakeExpressionOfType; 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 72ca3090c18..5430ed779fa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; 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 84f2d6a2687..d75b48da396 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java @@ -22,10 +22,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping; +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.builtins.InlineUtil; public class InlineDescriptorUtils { 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 4d29a9473db..5ae3b0e6cb0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; 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 5fbb220e29d..6700adcdf0c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java @@ -26,7 +26,7 @@ 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.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.data.DataPackage; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; 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 c3513178708..26aad298479 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.kotlin.storage.ExceptionTracker; 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 7fb49762426..037a63bad56 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 @@ -22,7 +22,7 @@ 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 -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProvider diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java index b63ad78897f..a319da5cd8f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.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 30bc65c9600..ff638afe17b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.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 25771c50d60..f6466e980a7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils; -import org.jetbrains.jet.lang.resolve.calls.model.*; +import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; @@ -56,7 +56,7 @@ import java.util.*; import static org.jetbrains.kotlin.cfg.JetControlFlowBuilder.PredefinedOperation.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.kotlin.lexer.JetTokens.*; public class JetControlFlowProcessor { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 32f5000a586..1b12355bda4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -52,8 +52,8 @@ import org.jetbrains.kotlin.diagnostics.Errors; 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver; @@ -71,7 +71,7 @@ import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE; import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL; import static org.jetbrains.kotlin.cfg.TailRecursionKind.*; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; 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 a19c831efd2..453e2ee5ca3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; 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 47d28b8140e..6346ce1e90e 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 @@ -20,7 +20,7 @@ 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 -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory 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 51f286cadc9..26b45572583 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 @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope 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 7f55c334040..e9a5525d2e1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.bindingContextUtil.* -import org.jetbrains.jet.lang.resolve.calls.model.* +import org.jetbrains.kotlin.resolve.calls.model.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.BindingContext import java.util.* diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index f625bb169ec..b097f9e70a1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -27,8 +27,8 @@ import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.BodyResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; @@ -36,17 +36,17 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; -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.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; import org.jetbrains.jet.lang.resolve.DeclarationsChecker; import org.jetbrains.jet.lang.resolve.ModifiersChecker; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index 4bc74837ddc..24199089eb4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -29,26 +29,26 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; import org.jetbrains.jet.lang.resolve.BodyResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; import org.jetbrains.jet.lang.resolve.DeclarationsChecker; import org.jetbrains.jet.lang.resolve.ModifiersChecker; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index 5bbf8f3da26..6d17169bf13 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -29,25 +29,25 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.context.LazyResolveToken; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 96f729a3a64..e09a3c6edb0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -28,8 +28,8 @@ import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider.Empty; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; @@ -37,18 +37,18 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index 9c7c891cea9..e60daaa565d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider.Empty; @@ -32,19 +32,19 @@ import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -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.kotlin.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index 1d8c4c2dacf..7367420eb30 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -29,26 +29,26 @@ import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.jet.lang.resolve.BodyResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; import org.jetbrains.jet.lang.resolve.DeclarationsChecker; import org.jetbrains.jet.lang.resolve.ModifiersChecker; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index 7dd6b57ac2d..1daf0b34327 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -24,8 +24,8 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; 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.kotlin.resolve.calls.inference.InferenceErrorData; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java index f53217892a5..e504cf986f8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java @@ -30,9 +30,9 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.inference.*; +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -46,10 +46,10 @@ import java.util.List; import java.util.Set; import static org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.*; -import static org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.LOWER_BOUND; -import static org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.UPPER_BOUND; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.LOWER_BOUND; +import static org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.UPPER_BOUND; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; public class Renderers { private static final Logger LOG = Logger.getInstance(Renderers.class); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java index 2263033e1b6..d3fd0ed6605 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java @@ -26,10 +26,10 @@ import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.Table import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TextRenderer.TextElement; -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; -import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.Renderer; +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition; +import org.jetbrains.kotlin.types.JetType; import java.util.Iterator; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt index d8a1e6093e5..47a69b15fea 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import com.intellij.lang.ASTNode import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiComment -import org.jetbrains.jet.lang.resolve.calls.CallTransformer.CallForImplicitInvoke +import org.jetbrains.kotlin.resolve.calls.CallTransformer.CallForImplicitInvoke import com.intellij.openapi.util.TextRange public fun JetCallElement.getCallNameExpression(): JetSimpleNameExpression? { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java index 63688faee45..1a7e20146d0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.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.resolve.calls; +package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; 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; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; @@ -43,11 +43,11 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getRecordedTypeInfo; -import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode; -import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; -import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.DEPENDENT; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode; +import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; +import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.DEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.*; public class ArgumentTypeResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt index 26967d7a16f..df97ea52325 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.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,44 +14,44 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls +package org.jetbrains.kotlin.resolve.calls import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl -import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy -import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsImpl +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy +import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.BindingContext.CONSTRAINT_SYSTEM_COMPLETER -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.kotlin.resolve.calls.inference.ConstraintSystemImpl +import org.jetbrains.kotlin.resolve.calls.context.CallCandidateResolutionContext +import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus +import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData 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 -import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo +import org.jetbrains.kotlin.resolve.calls.model.ArgumentUnmapped +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext -import org.jetbrains.jet.lang.resolve.calls.callUtil.* +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext +import org.jetbrains.kotlin.resolve.calls.callUtil.* import org.jetbrains.jet.lang.resolve.BindingContextUtils -import org.jetbrains.jet.lang.resolve.calls.context.CallResolutionContext +import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext import org.jetbrains.kotlin.types.expressions.DataFlowUtils import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils 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.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace import org.jetbrains.kotlin.psi.JetQualifiedExpression import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* public class CallCompleter( val argumentTypeResolver: ArgumentTypeResolver, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java index 9f0bea5d2cf..30c5ffbe0dc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.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.resolve.calls; +package org.jetbrains.kotlin.resolve.calls; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; @@ -27,16 +27,16 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.context.TemporaryTraceAndCache; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsUtil; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.TemporaryTraceAndCache; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant; import org.jetbrains.jet.lang.resolve.scopes.receivers.*; @@ -55,7 +55,7 @@ import javax.inject.Inject; import java.util.Collections; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiversPackage.createQualifier; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiversPackage.resolveAsStandaloneExpression; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java index 49d731b9cb0..4d8fcdb102f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.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.resolve.calls; +package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -24,19 +24,19 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; 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.*; -import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl; -import org.jetbrains.jet.lang.resolve.calls.results.ResolutionResultsHandler; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.tasks.*; -import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollectors; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.context.*; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsImpl; +import org.jetbrains.kotlin.resolve.calls.results.ResolutionResultsHandler; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.tasks.*; +import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollectors; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; @@ -53,9 +53,9 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.NOT_A_CLASS; import static org.jetbrains.kotlin.diagnostics.Errors.NO_CONSTRUCTOR; import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage.recordScopeAndDataFlowInfo; -import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; -import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; -import static org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults.Code.*; +import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; +import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; +import static org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults.Code.*; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; @SuppressWarnings("RedundantTypeArguments") diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java index 203d0739fbb..809b38e09e3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.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.resolve.calls; +package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.*; @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; import static org.jetbrains.kotlin.types.TypeUtils.DONT_CARE; public class CallResolverUtil { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java index 9d22ea538e4..7c9938a8aa0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.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.resolve.calls; +package org.jetbrains.kotlin.resolve.calls; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -29,19 +29,19 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.context.CallCandidateResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.context.ContextDependency; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallImpl; -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCallImpl; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl; -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate; -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTask; -import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategyForInvoke; -import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.CallCandidateResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.ContextDependency; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCallImpl; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCallImpl; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsImpl; +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTask; +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategyForInvoke; +import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java index a4a105c65e5..30652edc583 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.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.resolve.calls; +package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -27,17 +27,17 @@ import org.jetbrains.kotlin.descriptors.*; 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; -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl; -import org.jetbrains.jet.lang.resolve.calls.model.*; -import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils; -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTask; -import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject; +import org.jetbrains.kotlin.resolve.calls.context.*; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl; +import org.jetbrains.kotlin.resolve.calls.model.*; +import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory; +import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils; +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTask; +import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; @@ -51,14 +51,14 @@ import java.util.*; import static org.jetbrains.kotlin.diagnostics.Errors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT; import static org.jetbrains.kotlin.diagnostics.Errors.SUPER_CANT_BE_EXTENSION_RECEIVER; -import static org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver.deparenthesizeArgument; -import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; -import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; -import static org.jetbrains.jet.lang.resolve.calls.CallTransformer.CallForImplicitInvoke; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; -import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.*; +import static org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver.deparenthesizeArgument; +import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; +import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; +import static org.jetbrains.kotlin.resolve.calls.CallTransformer.CallForImplicitInvoke; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; +import static org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus.*; import static org.jetbrains.kotlin.types.TypeUtils.*; public class CandidateResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java index f8a13a8b6ad..26eb2e013ee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.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.resolve.calls; +package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; 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; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.*; +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; @@ -38,7 +38,7 @@ import java.util.Set; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; -import static org.jetbrains.jet.lang.resolve.calls.ValueArgumentsToParametersMapper.Status.*; +import static org.jetbrains.kotlin.resolve.calls.ValueArgumentsToParametersMapper.Status.*; /*package*/ class ValueArgumentsToParametersMapper { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/BasicCallResolutionContext.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/BasicCallResolutionContext.java index 3b3aa98667f..07f83c65350 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/BasicCallResolutionContext.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.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallCandidateResolutionContext.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallCandidateResolutionContext.java index 84f95d25487..6575d71c253 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallCandidateResolutionContext.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,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; 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; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java index 96cc0815495..034750634ea 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.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.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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; -import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.model.DataFlowInfoForArgumentsImpl; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CheckValueArgumentsMode.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CheckValueArgumentsMode.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CheckValueArgumentsMode.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CheckValueArgumentsMode.java index 3caf84f524a..f4cb5f63bd1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CheckValueArgumentsMode.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CheckValueArgumentsMode.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.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; public enum CheckValueArgumentsMode { ENABLED, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ContextDependency.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ContextDependency.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ContextDependency.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ContextDependency.java index 3eb2691f3fb..743a2cb6237 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ContextDependency.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ContextDependency.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.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; public enum ContextDependency { INDEPENDENT, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionContext.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionContext.java index 7a191c3f27c..d6dc6f9eae3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionContext.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.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCache.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionResultsCache.kt similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCache.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionResultsCache.kt index 82e72f21998..396a4729b59 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCache.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionResultsCache.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,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.context +package org.jetbrains.kotlin.resolve.calls.context import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsImpl import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace -import org.jetbrains.kotlin.psi.JetExpression import java.util.HashMap 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 +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy +import org.jetbrains.kotlin.resolve.calls.context.ResolutionResultsCache.CachedData public trait ResolutionResultsCache { public data class CachedData( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/SimpleResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/SimpleResolutionContext.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/SimpleResolutionContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/SimpleResolutionContext.java index c51ee0086d6..3f15f1c4943 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/SimpleResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/SimpleResolutionContext.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.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/TemporaryTraceAndCache.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/TemporaryTraceAndCache.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/TemporaryTraceAndCache.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/TemporaryTraceAndCache.java index adb9fc3ac34..bfd895567a5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/TemporaryTraceAndCache.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/TemporaryTraceAndCache.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.resolve.calls.context; +package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CallResolverExtension.java similarity index 72% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtension.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CallResolverExtension.java index bbaa2675f0b..e1fbd04f290 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CallResolverExtension.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.resolve.calls.extensions; +package org.jetbrains.kotlin.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public interface CallResolverExtension { void run(@NotNull ResolvedCall resolvedCall, @NotNull BasicCallResolutionContext context); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtensionProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CallResolverExtensionProvider.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtensionProvider.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CallResolverExtensionProvider.java index 40b228e1d0f..1e24bb64638 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtensionProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CallResolverExtensionProvider.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.resolve.calls.extensions; +package org.jetbrains.kotlin.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CapturingInClosureExtension.kt similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CapturingInClosureExtension.kt index d28f0756aae..6bf3a97cd1d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CapturingInClosureExtension.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.resolve.calls.extensions +package org.jetbrains.kotlin.resolve.calls.extensions import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.VariableDescriptor @@ -29,9 +29,9 @@ import org.jetbrains.kotlin.types.expressions.CaptureKind import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression -import org.jetbrains.jet.lang.resolve.calls.callUtil.* +import org.jetbrains.kotlin.resolve.calls.callUtil.* import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall class CapturingInClosureExtension : CallResolverExtension { override fun run(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CompositeExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CompositeExtension.java similarity index 84% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CompositeExtension.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CompositeExtension.java index 1e4a6a3d09e..afe8df30ecc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CompositeExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CompositeExtension.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.resolve.calls.extensions; +package org.jetbrains.kotlin.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/InlineCallResolverExtension.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/InlineCallResolverExtension.java index 77912815874..d1e662b1f72 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/InlineCallResolverExtension.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.resolve.calls.extensions; +package org.jetbrains.kotlin.resolve.calls.extensions; -import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; @@ -25,12 +24,12 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; 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; -import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument; -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.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java index 49d26743586..5e362992c40 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/NeedSyntheticCallResolverExtension.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.resolve.calls.extensions; +package org.jetbrains.kotlin.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import static org.jetbrains.jet.lang.resolve.BindingContext.NEED_SYNTHETIC_ACCESSOR; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java index acfa6f47cdb..3addd64a515 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.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.resolve.calls.extensions; +package org.jetbrains.kotlin.resolve.calls.extensions; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -23,9 +23,8 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Errors; 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; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemCompleter.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemCompleter.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemCompleter.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemCompleter.java index 20df3897113..896c3c6f488 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemCompleter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemCompleter.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.resolve.calls.inference; +package org.jetbrains.kotlin.resolve.calls.inference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public interface ConstraintSystemCompleter { void completeConstraintSystem( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintType.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintType.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintType.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintType.java index b189e3fa19b..8dc204449b3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintType.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.resolve.calls.inference; +package org.jetbrains.kotlin.resolve.calls.inference; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintsUtil.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintsUtil.java index 3d58d966dd8..756da0bfb49 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintsUtil.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.resolve.calls.inference; +package org.jetbrains.kotlin.resolve.calls.inference; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/InferenceErrorData.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/InferenceErrorData.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/InferenceErrorData.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/InferenceErrorData.java index 7ca766cf28c..2a8b49aeab6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/InferenceErrorData.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/InferenceErrorData.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.resolve.calls.inference; +package org.jetbrains.kotlin.resolve.calls.inference; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SubtypingConstraint.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/SubtypingConstraint.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SubtypingConstraint.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/SubtypingConstraint.java index 3f4eb4ee225..d78c86cac5a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SubtypingConstraint.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/SubtypingConstraint.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.resolve.calls.inference; +package org.jetbrains.kotlin.resolve.calls.inference; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ArgumentMapping.kt similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ArgumentMapping.kt index b5c56c8a573..5e716784b65 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ArgumentMapping.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.resolve.calls.model +package org.jetbrains.kotlin.resolve.calls.model import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArguments.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArguments.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArguments.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArguments.java index 1fd1605c980..06967adf9d0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArguments.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArguments.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.ValueArgument; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; public interface DataFlowInfoForArguments { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArgumentsImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArgumentsImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.java index 4e1380594f8..f6d41ea814b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DataFlowInfoForArgumentsImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import java.util.Iterator; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DefaultValueArgument.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DefaultValueArgument.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DefaultValueArgument.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DefaultValueArgument.java index 9c1902341c9..e41b9ce5af1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DefaultValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DefaultValueArgument.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.ValueArgument; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DelegatingResolvedCall.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DelegatingResolvedCall.java index f9c5dff9cdc..1c36908b342 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DelegatingResolvedCall.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; 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.kotlin.resolve.calls.results.ResolutionStatus; +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ExpressionValueArgument.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ExpressionValueArgument.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ExpressionValueArgument.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ExpressionValueArgument.java index 660aaf1cddb..157c307eaf6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ExpressionValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ExpressionValueArgument.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableDataFlowInfoForArguments.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableDataFlowInfoForArguments.java index c55e96cf69a..6ec4a09e196 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableDataFlowInfoForArguments.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.ValueArgument; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.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/kotlin/resolve/calls/model/MutableResolvedCall.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableResolvedCall.java index 0ef8a6e7d5e..ce8898599b8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableResolvedCall.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; 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; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; import org.jetbrains.kotlin.types.TypeSubstitutor; public interface MutableResolvedCall extends ResolvedCall { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCall.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCall.java index 54733962258..90afc5b9946 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCall.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; 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.kotlin.resolve.calls.results.ResolutionStatus; +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java index accc6460423..28a62b2b512 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import com.google.common.collect.Maps; import com.intellij.util.Function; @@ -27,12 +27,12 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate; -import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeProjection; @@ -42,8 +42,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.INCOMPLETE_TYPE_INFERENCE; -import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.UNKNOWN_STATUS; +import static org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus.INCOMPLETE_TYPE_INFERENCE; +import static org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus.UNKNOWN_STATUS; public class ResolvedCallImpl implements MutableResolvedCall { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedValueArgument.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedValueArgument.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedValueArgument.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedValueArgument.java index 5cb75d99261..89bd8429a1d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedValueArgument.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.ValueArgument; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VarargValueArgument.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VarargValueArgument.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VarargValueArgument.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VarargValueArgument.java index fdb7a795057..e77a7cf71c0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VarargValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VarargValueArgument.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.resolve.calls.model; +package org.jetbrains.kotlin.resolve.calls.model; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.kt similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.kt index 8961d7de943..4d748612ac4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.model +package org.jetbrains.kotlin.resolve.calls.model import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus +import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace public trait VariableAsFunctionResolvedCall { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResults.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResults.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResults.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResults.java index aaa5ae05507..ebcc5cb32a8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResults.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResults.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.resolve.calls.results; +package org.jetbrains.kotlin.resolve.calls.results; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java index cec5da2deee..5db3f08d20c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.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.resolve.calls.results; +package org.jetbrains.kotlin.resolve.calls.results; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsUtil.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsUtil.java index befaaccb0be..0e2f28a547e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsUtil.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.resolve.calls.results; +package org.jetbrains.kotlin.resolve.calls.results; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.resolve.calls.context.ContextDependency; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.context.ContextDependency; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.java index 0b2768a557c..fce0b573c14 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.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.resolve.calls.results; +package org.jetbrains.kotlin.resolve.calls.results; import gnu.trove.THashSet; import gnu.trove.TObjectHashingStrategy; @@ -22,9 +22,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java index 594a74321aa..052a9179393 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.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,24 +14,24 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.results; +package org.jetbrains.kotlin.resolve.calls.results; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; -import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTask; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTask; import java.util.Collection; import java.util.EnumSet; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallImpl.MAP_TO_CANDIDATE; -import static org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallImpl.MAP_TO_RESULT; -import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.*; +import static org.jetbrains.kotlin.resolve.calls.model.ResolvedCallImpl.MAP_TO_CANDIDATE; +import static org.jetbrains.kotlin.resolve.calls.model.ResolvedCallImpl.MAP_TO_RESULT; +import static org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus.*; public class ResolutionResultsHandler { public static ResolutionResultsHandler INSTANCE = new ResolutionResultsHandler(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.java index 36857ef6540..e3dc280c23b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.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.resolve.calls.results; +package org.jetbrains.kotlin.resolve.calls.results; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowInfo.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.java index ee196ae1e30..3bf785cf50f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.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.resolve.calls.smartcasts; +package org.jetbrains.kotlin.resolve.calls.smartcasts; import com.google.common.collect.ImmutableMap; import com.google.common.collect.SetMultimap; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValue.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValue.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValue.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValue.java index b6a12f78245..d4f19aaac79 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValue.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValue.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.resolve.calls.smartcasts; +package org.jetbrains.kotlin.resolve.calls.smartcasts; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java index 3714e1edb62..374b2cbedf1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.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.resolve.calls.smartcasts; +package org.jetbrains.kotlin.resolve.calls.smartcasts; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; @@ -23,8 +23,8 @@ import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.descriptors.*; 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; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.*; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DelegatingDataFlowInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DelegatingDataFlowInfo.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DelegatingDataFlowInfo.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DelegatingDataFlowInfo.java index 8f986e643b5..f631d7e6001 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DelegatingDataFlowInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DelegatingDataFlowInfo.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.resolve.calls.smartcasts; +package org.jetbrains.kotlin.resolve.calls.smartcasts; import com.google.common.collect.*; import org.jetbrains.annotations.NotNull; @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.types.TypeUtils; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.calls.smartcasts.Nullability.NOT_NULL; +import static org.jetbrains.kotlin.resolve.calls.smartcasts.Nullability.NOT_NULL; /* package */ class DelegatingDataFlowInfo implements DataFlowInfo { private static final ImmutableMap EMPTY_NULLABILITY_INFO = ImmutableMap.of(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/Nullability.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/Nullability.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/Nullability.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/Nullability.java index 7fb4fd7714c..d168b32d80b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/Nullability.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/Nullability.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.resolve.calls.smartcasts; +package org.jetbrains.kotlin.resolve.calls.smartcasts; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java index d599aa524ce..f2f6e033e98 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.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.resolve.calls.smartcasts; +package org.jetbrains.kotlin.resolve.calls.smartcasts; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; 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; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java index 43e136b9698..3c255b47dd0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.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.resolve.calls.tasks; +package org.jetbrains.kotlin.resolve.calls.tasks; import com.google.common.collect.Sets; import com.intellij.lang.ASTNode; @@ -24,9 +24,9 @@ import org.jetbrains.kotlin.descriptors.*; 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; -import org.jetbrains.jet.lang.resolve.calls.inference.*; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.inference.*; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.descriptorUtil.DescriptorUtilPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; @@ -43,7 +43,7 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqNameFromTopLevelClass; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt index c127d567e82..9e00cc61554 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.tasks.collectors +package org.jetbrains.kotlin.resolve.calls.tasks.collectors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject +import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.types.ErrorUtils diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ExplicitReceiverKind.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ExplicitReceiverKind.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ExplicitReceiverKind.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ExplicitReceiverKind.java index c1d018ffa37..fd91add576e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ExplicitReceiverKind.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ExplicitReceiverKind.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.resolve.calls.tasks; +package org.jetbrains.kotlin.resolve.calls.tasks; public enum ExplicitReceiverKind { EXTENSION_RECEIVER, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionCandidate.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionCandidate.java index fa4cae4f516..920f134deb7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionCandidate.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.resolve.calls.tasks; +package org.jetbrains.kotlin.resolve.calls.tasks; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java index 59879312369..5a3cb988ef1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.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.resolve.calls.tasks; +package org.jetbrains.kotlin.resolve.calls.tasks; import com.google.common.collect.Lists; import kotlin.Function0; @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; 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.*; -import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.context.*; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.kt index e147945abe5..1bc70db3f68 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.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.resolve.calls.tasks +package org.jetbrains.kotlin.resolve.calls.tasks import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.JetPsiUtil -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.storage.StorageManager import java.util.ArrayList import org.jetbrains.kotlin.utils.toReadOnlyList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt index 5cc73c18a58..d308f2113a5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.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,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.tasks +package org.jetbrains.kotlin.resolve.calls.tasks import com.google.common.collect.Lists import com.google.common.collect.Sets import com.intellij.openapi.progress.ProgressIndicatorProvider import org.jetbrains.kotlin.descriptors.* 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 -import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollectors +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext +import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils +import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollector +import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollectors import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.JetScopeUtils @@ -34,12 +34,12 @@ import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.isOrOverridesSynthesized -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.* +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil.isOrOverridesSynthesized +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.* import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER public class TaskPrioritizer(private val storageManager: StorageManager) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java index eb90086a941..3547017fa34 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.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.resolve.calls.tasks; +package org.jetbrains.kotlin.resolve.calls.tasks; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; 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; +import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForInvoke.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForInvoke.java index 3a4433be3bf..1fe0418228b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForInvoke.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.resolve.calls.tasks; +package org.jetbrains.kotlin.resolve.calls.tasks; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiElement; @@ -27,7 +27,7 @@ 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java index c84dff4329d..e5d68ac38da 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.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.resolve.calls.tasks; +package org.jetbrains.kotlin.resolve.calls.tasks; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; 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; -import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; import org.jetbrains.kotlin.types.ErrorUtils; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt index 16aeb55f94f..33faf7ee14a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.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.resolve.calls.tasks +package org.jetbrains.kotlin.resolve.calls.tasks import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -37,10 +37,10 @@ import org.jetbrains.kotlin.types.JetType import kotlin.platform.platformStatic import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver import org.jetbrains.kotlin.types.isDynamic -import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollector +import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollector import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollectors +import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollectors import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java index d404c8af560..1a4e3d9358b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.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.resolve.calls.util; +package org.jetbrains.kotlin.resolve.calls.util; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java index 929dd6a2685..98ca2b5fb9e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.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.resolve.calls.util; +package org.jetbrains.kotlin.resolve.calls.util; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/FakeCallableDescriptorForObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/FakeCallableDescriptorForObject.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt index 7a2c9b5e3c9..6c5e68c8bc7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/FakeCallableDescriptorForObject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.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.resolve.calls.util +package org.jetbrains.kotlin.resolve.calls.util import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt index 9a0a7522c74..f5a7c41c94a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.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,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.callUtil +package org.jetbrains.kotlin.resolve.calls.callUtil import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.resolve.calls.model.ArgumentUnmapped +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ArgumentUnmapped import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch -import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatchStatus +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatchStatus import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver +import org.jetbrains.kotlin.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 diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index e0de951ddf1..92e01adc208 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -20,19 +20,19 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.constants.* import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument import org.jetbrains.jet.JetNodeTypes import java.math.BigInteger import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ConstantExpressionEvaluator private (val trace: BindingTrace) : JetVisitor, JetType>() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/JetTypeInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/types/JetTypeInfo.java index aaebeed61e0..141864b1236 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/JetTypeInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/JetTypeInfo.java @@ -18,10 +18,9 @@ package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; public class JetTypeInfo { - @NotNull public static JetTypeInfo create(@Nullable JetType type, @NotNull DataFlowInfo dataFlowInfo) { return new JetTypeInfo(type, dataFlowInfo); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 8f4b80174e9..9f3ea1a03c1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -30,25 +30,25 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; 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; -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode; -import org.jetbrains.jet.lang.resolve.calls.context.TemporaryTraceAndCache; -import org.jetbrains.jet.lang.resolve.calls.model.DataFlowInfoForArgumentsImpl; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallImpl; -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsUtil; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.Nullability; -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate; -import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode; +import org.jetbrains.kotlin.resolve.calls.context.TemporaryTraceAndCache; +import org.jetbrains.kotlin.resolve.calls.model.DataFlowInfoForArgumentsImpl; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCallImpl; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsImpl; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue; +import org.jetbrains.kotlin.resolve.calls.smartcasts.Nullability; +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; @@ -73,8 +73,8 @@ import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RE import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getStaticNestedClassesScope; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory.createDataFlowValue; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory.createDataFlowValue; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java index 4fade54c8c9..d22be11c942 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java @@ -42,7 +42,7 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; import static org.jetbrains.kotlin.types.TypeUtils.*; import static org.jetbrains.kotlin.types.expressions.CoercionStrategy.COERCION_TO_UNIT; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java index 6431eb5e118..17bbf238065 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java @@ -32,17 +32,16 @@ import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.inference.*; -import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate; -import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.inference.*; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; +import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.*; @@ -52,7 +51,7 @@ import java.util.*; import static org.jetbrains.jet.lang.resolve.BindingContext.CALL; import static org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; public class ControlStructureTypingUtils { private static final Logger LOG = Logger.getInstance(ControlStructureTypingUtils.class); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java index af59a1e20f9..9bf82862357 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; @@ -45,7 +45,7 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; 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.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; import static org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java index 3cd598f02bf..ec426405579 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java @@ -27,11 +27,11 @@ import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory; +import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; @@ -44,7 +44,7 @@ import java.util.Collection; import java.util.Set; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.*; public class DataFlowUtils { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java index 2a9a928a45d..8db9a5397be 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java index 14f2c9ec54a..781feb00042 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; -import org.jetbrains.jet.lang.resolve.calls.context.ContextDependency; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionResultsCache; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionResultsCacheImpl; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.context.ContextDependency; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionResultsCache; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionResultsCacheImpl; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java index 578026786be..028bca60479 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java @@ -31,13 +31,13 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; 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; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.calls.context.ContextDependency; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.context.ContextDependency; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java index 95179ce814a..7adabe77c8a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java @@ -31,9 +31,9 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; 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; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java index 751b59311e0..7c95835812b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; 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; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsUtil; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.context.TemporaryTraceAndCache; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; @@ -45,7 +45,7 @@ import java.util.Collection; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE_REASSIGNMENT; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java index df814735bef..464ec8fcc2e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java index 65710f59c6b..418e4ca2fc1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.name.Name; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java index 575871f08fb..69f83b06308 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java @@ -25,10 +25,10 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory; -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory; +import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -38,7 +38,7 @@ import java.util.Collections; import java.util.Set; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; +import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.isIntersectionEmpty; import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.newWritableScopeImpl; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index 2d57c3f6652..aa77bc72201 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -41,8 +41,8 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt index 07a792f8e73..b3cf2ed24d2 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt @@ -34,11 +34,11 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import java.util.HashMap import org.jetbrains.kotlin.types.JetTypeImpl import java.util.regex.Pattern -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTaskHolder +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTaskHolder import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.psi.debugText.getDebugText -import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate +import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate import java.lang.reflect.GenericDeclaration import java.lang.reflect.Method import java.lang.reflect.Constructor diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java index 1bc0ae5d3a6..fffe701c02f 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java @@ -22,9 +22,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.descriptors.*; 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; import org.jetbrains.kotlin.name.ClassId; diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index 16c5d8a1bff..f09f688b7b8 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -20,21 +20,21 @@ import org.jetbrains.jet.ConfigurationKind import org.jetbrains.jet.JetLiteFixture import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import java.io.File import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil -import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMapping -import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.util.io.FileUtil 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.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index ab7290caf2a..02f4bf91e0a 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.di.InjectorForTests import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.diagnostics.rendering.Renderers import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl import org.jetbrains.kotlin.types.Variance import java.io.File import java.util.regex.Pattern @@ -33,7 +33,7 @@ import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest.M import java.util.ArrayList import java.util.LinkedHashMap import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { private val typePattern = """([\w|<|>|\(|\)]+)""" diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 2304f31ec44..434b7ff7af0 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypes import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.jet.lang.resolve.calls.inference.createCapturedType +import org.jetbrains.kotlin.resolve.calls.inference.createCapturedType import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypesIfNecessary import java.util.ArrayList diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index a93cb3dbd9d..1fb749f9648 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -29,7 +29,7 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index 31de74c3a6d..9dc50a4ac57 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor; 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; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index 7d16ac4d3b5..ad11dba71a7 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor; 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; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index 180305ceec9..fbc1d3d0b35 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -32,7 +32,7 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.*; diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index 7f0a448c573..7f1b45fa187 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -28,19 +28,19 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -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.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/CapturedTypeConstructor.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/CapturedTypeConstructor.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt index ad73de36244..e856e763d38 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/CapturedTypeConstructor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.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.resolve.calls.inference +package org.jetbrains.kotlin.resolve.calls.inference import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintPosition.kt similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintPosition.kt index b0c4b2f6d31..b465ef8a802 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintPosition.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,10 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition +package org.jetbrains.kotlin.resolve.calls.inference.constraintPosition -import java.util.HashMap -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* public enum class ConstraintPositionKind { RECEIVER_POSITION @@ -62,4 +61,4 @@ class CompoundConstraintPosition( override fun isStrong() = positions.any { it.isStrong() } override fun toString() = "$kind(${positions.joinToString()}" -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystem.kt similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystem.kt index 9de0e4c985b..8a41660f50d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystem.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.resolve.calls.inference +package org.jetbrains.kotlin.resolve.calls.inference import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.TypeSubstitutor -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition public trait ConstraintSystem { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt index 7964b11d0cf..e1fd463afc2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.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.resolve.calls.inference +package org.jetbrains.kotlin.resolve.calls.inference import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.TypeProjection @@ -26,22 +26,22 @@ import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure import org.jetbrains.kotlin.types.checker.TypeCheckingProcedureCallbacks import org.jetbrains.kotlin.types.TypeConstructor import java.util.LinkedHashMap import java.util.HashSet -import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.* -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind.* +import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.* +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind.* import java.util.HashMap import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.CompoundConstraintPosition +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.CompoundConstraintPosition import org.jetbrains.kotlin.types.getCustomTypeVariable import org.jetbrains.kotlin.types.isFlexible -import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.Bound +import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.Bound public class ConstraintSystemImpl : ConstraintSystem { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt index bc7dcd0b141..a80178c13fb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.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,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.inference +package org.jetbrains.kotlin.resolve.calls.inference -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition public trait ConstraintSystemStatus { /** @@ -93,4 +93,4 @@ public trait ConstraintSystemStatus { * in invocation foo(array) where array has type Array<Array<out Int>>. */ public fun hasCannotCaptureTypesError(): Boolean -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBounds.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBounds.kt similarity index 86% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBounds.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBounds.kt index 2e9a2978362..8417586d875 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBounds.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBounds.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.resolve.calls.inference +package org.jetbrains.kotlin.resolve.calls.inference import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition public trait TypeBounds { public val varianceOfPosition: Variance diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt index d8b85e2138e..1f0f0f1308d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.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,24 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.calls.inference +package org.jetbrains.kotlin.resolve.calls.inference import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.Bound +import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.Bound import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind +import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.CommonSupertypes import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor import java.util.LinkedHashSet -import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.* -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition +import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.* +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.types.singleBestRepresentative -import org.jetbrains.kotlin.types.typeUtil.cannotBeReified public class TypeBoundsImpl( override val typeVariable: TypeParameterDescriptor, diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt b/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt index d78d3b86039..a89eb9c4743 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt @@ -25,13 +25,13 @@ import org.jetbrains.kotlin.types.Variance import java.util.ArrayList import org.jetbrains.kotlin.types.JetTypeImpl import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.jet.lang.resolve.calls.inference.CapturedTypeConstructor +import org.jetbrains.kotlin.resolve.calls.inference.CapturedTypeConstructor import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.TypeSubstitution import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.LazyType -import org.jetbrains.jet.lang.resolve.calls.inference.isCaptured +import org.jetbrains.kotlin.resolve.calls.inference.isCaptured public data class ApproximationBounds( public val lower: T, diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java index aaeb54e770a..c3b55cb738f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.resolve.calls.inference.InferencePackage; +import org.jetbrains.kotlin.resolve.calls.inference.InferencePackage; import org.jetbrains.jet.lang.resolve.scopes.SubstitutingScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java index 5351ce9d5e7..a0488a8b86c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.*; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.*; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.*; public class TypeUtils { public static final JetType DONT_CARE = ErrorUtils.createErrorTypeWithCustomDebugName("DONT_CARE"); diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index 662897e3a75..314a55593d5 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices import org.jetbrains.kotlin.generators.di.* import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils -import org.jetbrains.jet.lang.resolve.calls.CallResolver +import org.jetbrains.kotlin.resolve.calls.CallResolver import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.resolve.java.lazy.ModuleClassResolver 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 b3b8fbd504b..2eb6c5e430a 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 @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotated; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.kotlin.name.FqName; 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 5e1e9854156..15ffc2ba7d3 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 @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.descriptors.* 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 +import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt index a37e33617bd..bb6a64bdfa4 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt @@ -21,14 +21,14 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.utils.addIfNotNull import java.util.HashSet -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl import java.util.LinkedHashMap import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition -import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintsUtil +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintsUtil import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind fun CallableDescriptor.fuzzyReturnType(): FuzzyType? { val returnType = getReturnType() ?: return null diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt index 28e6c027045..52775b10980 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt @@ -19,10 +19,10 @@ package org.jetbrains.jet.plugin.util import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor -import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils +import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.kotlin.descriptors.DeclarationDescriptor public enum class CallType { 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 3bb9765fc89..81e370d25ad 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 @@ -63,7 +63,7 @@ import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.di.InjectorForLazyBodyResolve import org.jetbrains.jet.plugin.project.TargetPlatformDetector import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo +import org.jetbrains.kotlin.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 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 89b5574830a..47ad106f02f 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 @@ -30,7 +30,7 @@ import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.jet.lang.resolve.DescriptorUtils import java.util.Collections import org.jetbrains.jet.analyzer.analyzeInContext -import org.jetbrains.jet.lang.resolve.calls.callUtil.getCalleeExpressionIfAny +import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny import java.util.LinkedHashSet import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement 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 b2030ffd7a4..bef921c9cee 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 @@ -30,9 +30,9 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; import org.jetbrains.kotlin.name.FqName; 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 0bcced89100..2b198d678eb 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 @@ -23,10 +23,10 @@ import org.jetbrains.kotlin.descriptors.*; 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java index af339f79f73..ec8307aa3fc 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; -import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; @@ -34,8 +34,8 @@ import org.jetbrains.kotlin.renderer.Renderer; import java.util.Iterator; import java.util.List; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; -import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.error; import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.strong; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java index 1e4e4e88615..1dde4343981 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.highlighter; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.types.JetType; 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 717b6aad8fc..241b7a53e8b 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 @@ -28,7 +28,7 @@ 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; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.lexer.JetTokens; class PropertiesHighlightingVisitor 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 f71e56a3365..9502d6e0dde 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 @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.CaptureKind; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt index 6163bb603b7..fa413face30 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.plugin.highlighter.renderersUtil -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.calls.callUtil.* +import org.jetbrains.kotlin.resolve.calls.callUtil.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.plugin.highlighter.IdeRenderers 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 86d17501422..13efe0eb8f7 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze public class OperatorToFunctionIntention : JetSelfTargetingIntention("operator.to.function", javaClass()) { 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 04c28bd5a1d..67ffb55c976 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 @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor 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.kotlin.resolve.calls.util.DelegatingCall import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.psi.JetTypeProjection @@ -30,7 +30,7 @@ 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.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.plugin.util.approximateFlexibleTypes 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 2dbb87f2674..2061150af32 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 @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; 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.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.ArrayList; 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 6aa7fd217dd..fee3d8f89e1 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 @@ -25,9 +25,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; 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; -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.ArrayList; 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 7a8c020bd69..a7cf7f489d8 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.calls.callUtil.getCalleeExpressionIfAny +import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import com.intellij.usages.UsageViewManager import com.intellij.usages.UsageInfo2UsageAdapter diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt index e4a4c3cf265..32cfe71ea05 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import com.intellij.psi.stubs.StringStubIndexExtension import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java index 702b36f9ccb..af4f34c8f4b 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; -import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; +import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.kotlin.types.JetType; import java.util.HashSet; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt index 64f0a13c0da..a24663a5c24 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt @@ -33,7 +33,7 @@ import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptorKindExclude import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter -import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils +import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.jet.plugin.refactoring.comparePossiblyOverridingDescriptors diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt index 39698bad7f8..96523918108 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.completion -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.descriptors.VariableDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt index 6e5f535ae94..c398ef78972 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt @@ -25,22 +25,22 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import com.intellij.lang.ASTNode import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver -import org.jetbrains.jet.lang.resolve.calls.util.CallMaker -import org.jetbrains.jet.lang.resolve.calls.context.ContextDependency -import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode -import org.jetbrains.jet.lang.resolve.calls.extensions.CompositeExtension +import org.jetbrains.kotlin.resolve.calls.util.CallMaker +import org.jetbrains.kotlin.resolve.calls.context.ContextDependency +import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode +import org.jetbrains.kotlin.resolve.calls.extensions.CompositeExtension import org.jetbrains.kotlin.di.InjectorForMacros -import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults import org.jetbrains.kotlin.descriptors.FunctionDescriptor import java.util.HashSet -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetContainerNode -import org.jetbrains.jet.lang.resolve.calls.callUtil.noErrorsInValueArguments +import org.jetbrains.kotlin.resolve.calls.callUtil.noErrorsInValueArguments import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.jet.plugin.util.makeNotNullable @@ -49,10 +49,10 @@ import org.jetbrains.kotlin.psi.JetWhenEntry import org.jetbrains.kotlin.psi.JetWhenExpression import org.jetbrains.kotlin.psi.JetCallElement import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext +import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import org.jetbrains.kotlin.psi.JetPrefixExpression -import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall +import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.psi.JetSimpleNameExpression @@ -65,7 +65,7 @@ import org.jetbrains.jet.plugin.completion.smart.toList import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus +import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils 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 dd3071178f6..84b2048a9f5 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt @@ -20,12 +20,12 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.descriptors.VariableDescriptor import java.util.Collections -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory import java.util.HashMap import com.google.common.collect.SetMultimap -import org.jetbrains.jet.lang.resolve.calls.smartcasts.Nullability +import org.jetbrains.kotlin.resolve.calls.smartcasts.Nullability import java.util.HashSet import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt index f543a1eb2d5..b2033121aa8 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt @@ -47,9 +47,9 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor 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 -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument +import org.jetbrains.kotlin.resolve.calls.callUtil.* +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument import org.jetbrains.jet.lang.resolve.extension.InlineAnalyzerExtension import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt index dd874aa12ae..4f39d9eb4c0 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt @@ -36,7 +36,7 @@ import com.sun.jdi.Location import com.intellij.psi.PsiMethod import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import com.intellij.psi.PsiDocumentManager -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.util.application.runReadAction import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt index 051b6d84e1c..d7116708580 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt @@ -27,7 +27,7 @@ import kotlin.properties.Delegates import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.psi.psiUtil.replaced diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt index efe70a37e19..67de169c20e 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt @@ -28,7 +28,7 @@ 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.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze public class ConvertIfWithThrowToAssertIntention : diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt index 058a4c4b544..58def176c83 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetParenthesizedExpression -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze public class ConvertToForEachLoopIntention : JetSelfTargetingIntention("convert.to.for.each.loop.intention", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt index b0fca22521a..86f2da9dad9 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.plugin.codeInsight.ShortenReferences -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetTypeArgumentList import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt index 0378bab9237..1788611d3ae 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt @@ -23,7 +23,7 @@ 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 +import org.jetbrains.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses public class MoveLambdaOutsideParenthesesIntention : JetSelfTargetingIntention( "move.lambda.outside.parentheses", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt index ca38815f83f..06c3d2f7fa5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt @@ -26,7 +26,7 @@ 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.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze public open class ReplaceWithInfixFunctionCallIntention : JetSelfTargetingIntention("replace.with.infix.function.call.intention", javaClass()) { 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 5b891a434f2..3cc60ca3ddc 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt @@ -21,17 +21,17 @@ import com.intellij.openapi.editor.Editor 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.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.CallableDescriptor 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 +import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument +import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument import org.jetbrains.jet.plugin.util.Maybe import org.jetbrains.jet.plugin.util.MaybeError import org.jetbrains.jet.plugin.util.MaybeValue import com.intellij.codeInsight.hint.HintManager -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze // Internal because you shouldn't construct this manually. You can end up with an inconsistant CallDescription. 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 7614d687946..55a78bc3bac 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.inline.KotlinInlineValHandler import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory import org.jetbrains.jet.lang.resolve.BindingContextUtils import org.jetbrains.kotlin.descriptors.VariableDescriptor import com.intellij.psi.search.searches.ReferencesSearch 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 3d3d84cba8a..59acd4418e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor; 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; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java index 43470c89f8c..3ee277a5a9b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java @@ -38,8 +38,8 @@ 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; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java index 4b3d99f9072..35eb187d3f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; 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; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java index e207c316b5d..b4bdeae2406 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; 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; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java index a6c9fdc4ed9..0ba7aa28986 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java index e1c4cda7957..83f988fafcc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; 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; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.UtilPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index 28773c91b7a..c4759a22cac 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -35,8 +35,8 @@ 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; -import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.DeferredType; import org.jetbrains.kotlin.types.JetType; 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 779f05dcb12..dcbedba4846 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 @@ -7,7 +7,7 @@ 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.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns 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 1d2bd3f37c6..a5bcb3f1dc4 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 @@ -14,7 +14,7 @@ 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.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector 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 8bfff3999c8..7156e2f72ff 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 @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall +import org.jetbrains.kotlin.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.* 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 cb786dab27c..dd2f4ef5dc4 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 @@ -14,7 +14,7 @@ import java.util.Collections import org.jetbrains.kotlin.psi.JetOperationExpression import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.kotlin.types.expressions.OperatorConventions -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.plugin.caches.resolve.analyze 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 5a663ffd771..58ada6503dd 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 @@ -28,7 +28,7 @@ import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo 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.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.refactoring.canRefactor import org.jetbrains.kotlin.psi.JetFunction 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 7a64d1ecc6d..8e9cbc84ffb 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; 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 c69bc85aa73..54516b0187b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.project.Project import org.jetbrains.kotlin.psi.JetExpression @@ -44,12 +44,12 @@ 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.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor 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.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange import org.jetbrains.kotlin.psi.psiUtil.getParentOfType 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 8f6ffc4ee2e..4afc2dcb91d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -53,8 +53,8 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; 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; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; 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 1db9f047412..699f180c7c8 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 @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ObservableBindingTrace; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; -import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; 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 80ca83a68d1..ab3d157df6f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt @@ -27,7 +27,7 @@ import com.intellij.openapi.actionSystem.DataContext import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic +import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic public class RenameDynamicMemberHandler: VariableInplaceRenameHandler() { override fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile): Boolean { 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 8829ce0ea48..9e122957f43 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 @@ -24,7 +24,7 @@ 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 +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.types.JetType import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.types.checker.JetTypeChecker @@ -38,20 +38,20 @@ import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.psi.ValueArgument -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetConstantExpression -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.types.expressions.OperatorConventions 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.kotlin.resolve.calls.callUtil.getCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.types.ErrorUtils import com.intellij.lang.ASTNode diff --git a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt b/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt index efeb386c2e4..ae92ba46bb3 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt @@ -20,9 +20,9 @@ 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.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace 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 dc3cfa695d8..2542bcf01bd 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -30,26 +30,26 @@ import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesAllowed; import org.jetbrains.jet.lang.resolve.AnnotationResolver; -import org.jetbrains.jet.lang.resolve.calls.CallResolver; -import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; +import org.jetbrains.kotlin.resolve.calls.CallResolver; +import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; +import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; 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.kotlin.resolve.calls.CallCompleter; +import org.jetbrains.kotlin.resolve.calls.CandidateResolver; +import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt index ceadfc23495..59af4395b79 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.js.translate.callTranslator import com.google.dart.compiler.backend.js.ast.JsExpression -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.* +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.* import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator @@ -32,7 +32,6 @@ import com.google.dart.compiler.backend.js.ast.JsLiteral import com.google.dart.compiler.backend.js.ast.JsConditional import com.google.dart.compiler.backend.js.ast.JsBlock - trait CallInfo { val context: TranslationContext val resolvedCall: ResolvedCall 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 5446fd63505..17dfdf30155 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 @@ -16,20 +16,20 @@ package org.jetbrains.kotlin.js.translate.callTranslator -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor import com.google.dart.compiler.backend.js.ast.JsExpression import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.js.translate.context.TranslationContext -import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.* +import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.* import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator 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.kotlin.resolve.calls.CallResolverUtil import org.jetbrains.kotlin.psi.Call.CallType import kotlin.test.assertNotNull 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 392c2b8c370..d731f09afc8 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 @@ -35,7 +35,7 @@ import com.google.dart.compiler.backend.js.ast.JsArrayAccess 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.kotlin.resolve.calls.tasks.isDynamic import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.js.translate.operation.OperatorTable import com.google.dart.compiler.backend.js.ast.JsBinaryOperation diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index cafe7ff1ede..0975c05d64a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; 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 662754b04ca..c068c27b771 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 @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer.* import org.jetbrains.kotlin.js.translate.utils.ast.* import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.* import org.jetbrains.jet.lang.resolve.DescriptorUtils.isExtension -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension /** 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 b65535071c3..0a401e26f6c 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 @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.expression.loopTranslator import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator 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 2e90a557e3b..2dd52b5fda7 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 @@ -28,7 +28,7 @@ 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; 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/initializer/ClassInitializerTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java index eda11a2b54d..02e1c158254 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 @@ -27,8 +27,8 @@ 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.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.js.translate.context.Namer; 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 cd15e322fed..8e40348a0ed 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 @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor; 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.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; 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 78fffaabd79..e0a92ab53db 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 @@ -28,8 +28,7 @@ import org.jetbrains.kotlin.js.translate.operation.OperatorTable import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken -import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic - +import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic object CompareToBOIF : BinaryOperationIntrinsicFactory { val COMPARE_TO_CHAR = pattern("Int|Short|Byte|Double|Float.compareTo(Char)") 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 3f0b853bc97..cbd01774330 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 @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.lexer.JetTokens import com.google.common.collect.ImmutableSet import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern -import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.types.isDynamic object EqualsBOIF : BinaryOperationIntrinsicFactory { 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 b21c7b2de21..a6b34cb8532 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 @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; 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.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.js.translate.intrinsic.operation.BinaryOperationIntr import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; import static org.jetbrains.kotlin.js.translate.operation.AssignmentTranslator.isAssignmentOperator; import static org.jetbrains.kotlin.js.translate.operation.CompareToTranslator.isCompareToCall; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; 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 245e114a1b3..612995de214 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,14 +24,14 @@ import com.google.dart.compiler.util.AstUtil; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetUnaryExpression; -import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; -import org.jetbrains.kotlin.types.expressions.OperatorConventions; 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.reference.CachedAccessTranslator; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetUnaryExpression; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.List; 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 cd8fcc9ee52..b40f6b10e23 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,11 +19,11 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -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; import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public final class OverloadedAssignmentTranslator extends AssignmentTranslator { 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 53e52270669..5b45c120384 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,11 +19,11 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -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; import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.psi.JetUnaryExpression; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public final class OverloadedIncrementTranslator extends IncrementTranslator { 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 aec5cecd6eb..31a965b7a99 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 @@ -26,7 +26,7 @@ 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; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCompileTimeValue; import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; 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 8f1d81dbe06..3d3cf8ee51b 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,11 +20,11 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -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; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.psi.JetCallExpression; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public abstract class AbstractCallExpressionTranslator extends AbstractTranslator { 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 ea8b674cd83..c3f8fa03a4b 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,18 +20,18 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -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; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; 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.BindingUtils; +import org.jetbrains.kotlin.psi.JetArrayAccessExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import java.util.*; 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 6fd88483c42..8a040a8f347 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,17 +21,17 @@ import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -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; 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.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.ValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.*; import java.util.ArrayList; import java.util.Collections; 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 2d42297f153..6078f3541da 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 @@ -27,23 +27,23 @@ import com.google.gwt.dev.js.rhino.EvaluatorException; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.InlineStrategy; +import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory2; import org.jetbrains.kotlin.diagnostics.ParametrizedDiagnostic; -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; -import org.jetbrains.kotlin.builtins.InlineStrategy; -import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder; +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.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import java.io.IOException; import java.io.StringReader; @@ -52,8 +52,8 @@ import java.util.Collections; import java.util.List; import static com.google.gwt.dev.js.rhino.Utils.isEndOfLine; -import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCompileTimeValue; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; public final class CallExpressionTranslator extends AbstractCallExpressionTranslator { 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 8579062e78e..c45977c1a24 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,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.kotlin.descriptors.VariableDescriptor; -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; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; 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.psi.JetReferenceExpression; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import java.util.Collections; import java.util.List; 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 e6c08aee5c3..b851f182e5c 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 @@ -25,7 +25,7 @@ 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.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; import org.jetbrains.kotlin.types.JetType;