From 49033e0002c32220651d2991405ba9c407bc87a0 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 19 Oct 2015 18:43:17 +0200 Subject: [PATCH] rename Jet* classes to Kt* --- .../tests/CodegenTestsOnAndroidGenerator.java | 12 +- .../kotlin/backend/common/CodegenUtil.java | 22 +- .../kotlin/backend/common/CodegenUtilKt.kt | 4 +- .../common/DataClassMethodGenerator.java | 20 +- .../AccessorForCallableDescriptor.java | 4 +- .../AccessorForConstructorDescriptor.kt | 10 +- .../AccessorForFunctionDescriptor.java | 8 +- ...orForPropertyBackingFieldInOuterClass.java | 4 +- .../AccessorForPropertyDescriptor.java | 20 +- .../kotlin/codegen/AnnotationCodegen.java | 10 +- .../org/jetbrains/kotlin/codegen/AsmUtil.java | 12 +- .../jetbrains/kotlin/codegen/BranchedValue.kt | 20 +- .../codegen/CallBasedArgumentGenerator.java | 4 +- .../jetbrains/kotlin/codegen/CallGenerator.kt | 6 +- .../kotlin/codegen/ClassBodyCodegen.java | 32 +- .../kotlin/codegen/ClassFileFactory.java | 8 +- .../kotlin/codegen/ClosureCodegen.java | 26 +- .../codegen/CodegenFileClassesProvider.kt | 4 +- .../codegen/CodegenStatementVisitor.java | 18 +- .../codegen/CollectionStubMethodGenerator.kt | 12 +- .../codegen/DefaultParameterValueLoader.java | 4 +- .../DefaultParameterValueSubstitutor.kt | 18 +- .../kotlin/codegen/ExpressionCodegen.java | 620 +++++----- .../kotlin/codegen/FunctionCodegen.java | 14 +- .../codegen/FunctionGenerationStrategy.java | 6 +- .../FunctionReferenceGenerationStrategy.java | 10 +- .../codegen/ImplementationBodyCodegen.java | 158 +-- .../codegen/InterfaceImplBodyCodegen.kt | 8 +- .../kotlin/codegen/JvmCodegenUtil.java | 14 +- .../kotlin/codegen/JvmRuntimeTypes.java | 14 +- .../kotlin/codegen/KotlinCodegenFacade.java | 21 +- .../kotlin/codegen/MemberCodegen.java | 58 +- .../kotlin/codegen/MultifileClassCodegen.kt | 26 +- .../codegen/MultifileClassPartCodegen.kt | 16 +- .../codegen/MutableClassDescriptor.java | 16 +- .../kotlin/codegen/PackageCodegen.java | 29 +- .../kotlin/codegen/PackagePartCodegen.java | 16 +- .../kotlin/codegen/PlatformStaticGenerator.kt | 4 +- .../kotlin/codegen/PropertyCodegen.java | 72 +- .../codegen/PropertyReferenceCodegen.kt | 6 +- .../kotlin/codegen/RangeCodegenUtil.java | 40 +- .../org/jetbrains/kotlin/codegen/SamType.java | 12 +- .../kotlin/codegen/SamWrapperClasses.java | 6 +- .../kotlin/codegen/SamWrapperCodegen.java | 12 +- .../kotlin/codegen/ScriptCodegen.java | 16 +- .../jetbrains/kotlin/codegen/SourceInfo.kt | 10 +- .../jetbrains/kotlin/codegen/StackValue.java | 8 +- .../kotlin/codegen/TailRecursionCodegen.java | 8 +- .../codegen/binding/CalculatedClosure.java | 6 +- .../binding/CodegenAnnotatingVisitor.java | 96 +- .../codegen/binding/CodegenBinding.java | 42 +- .../codegen/binding/MutableClosure.java | 4 +- .../codegen/binding/PsiCodegenPredictor.java | 32 +- .../kotlin/codegen/builtinSpecialBridges.kt | 12 +- .../codegen/context/CodegenContext.java | 20 +- .../context/FacadePartWithSourceFile.java | 4 +- .../kotlin/codegen/context/LocalLookup.java | 4 +- .../context/MultifileClassPartContext.java | 8 +- .../codegen/context/PackageContext.java | 8 +- .../extensions/ExpressionCodegenExtension.kt | 4 +- .../kotlin/codegen/inline/InlineCodegen.java | 44 +- .../codegen/inline/InlineCodegenUtil.java | 11 +- .../kotlin/codegen/inline/LambdaInfo.java | 14 +- .../codegen/inline/ReifiedTypeInliner.kt | 10 +- .../codegen/inline/RootInliningContext.java | 6 +- .../kotlin/codegen/intrinsics/Concat.kt | 10 +- .../codegen/intrinsics/IdentityEquals.kt | 12 +- .../kotlin/codegen/intrinsics/Increment.kt | 4 +- .../codegen/intrinsics/KClassJavaProperty.kt | 8 +- .../kotlin/codegen/intrinsics/Not.kt | 4 +- .../codegen/intrinsics/TypeIntrinsics.kt | 18 +- .../serialization/JvmSerializerExtension.java | 8 +- ...FactoryForDuplicateSignatureDiagnostics.kt | 4 +- .../kotlin/codegen/state/GenerationState.kt | 24 +- .../kotlin/codegen/state/JetTypeMapper.java | 63 +- .../codegen/when/EnumSwitchCodegen.java | 4 +- .../when/IntegralConstantsSwitchCodegen.java | 4 +- .../MappingClassesForWhenByEnumCodegen.java | 4 +- .../when/MappingsClassesForWhenByEnum.java | 4 +- .../codegen/when/StringSwitchCodegen.java | 4 +- .../kotlin/codegen/when/SwitchCodegen.java | 20 +- .../codegen/when/SwitchCodegenUtil.java | 32 +- .../builtins/BuiltInsSerializerExtension.kt | 4 +- .../cli/common/CompilerPluginContext.java | 10 +- .../messages/AnalyzerWithCompilerReport.java | 8 +- .../jetbrains/kotlin/cli/js/K2JSCompiler.java | 12 +- .../CliLightClassGenerationSupport.kt | 40 +- .../jvm/compiler/CommandLineScriptUtils.java | 4 +- .../jvm/compiler/CompileEnvironmentUtil.java | 14 +- .../cli/jvm/compiler/KotlinCoreEnvironment.kt | 18 +- .../compiler/KotlinToJVMBytecodeCompiler.java | 11 +- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 24 +- .../Conditional.kt | 6 +- .../Modifications.kt | 8 +- .../Preprocessor.kt | 8 +- .../ValueArguments.kt | 4 +- .../kotlin/fileClasses/JvmFileClassUtil.kt | 26 +- .../fileClasses/JvmFileClassesProvider.kt | 16 +- .../NoResolveFileClassesProvider.kt | 4 +- .../jetbrains/kotlin/jvm/RuntimeAssertions.kt | 20 +- .../kotlin/jvm/bindingContextSlices.kt | 4 +- .../kotlin/load/java/JavaClassFinderImpl.java | 4 +- .../TraceBasedExternalSignatureResolver.java | 12 +- .../SamAdapterOverridabilityCondition.java | 12 +- .../java/sam/SamConversionResolverImpl.kt | 14 +- .../java/sam/SingleAbstractMethodUtils.java | 50 +- .../load/kotlin/JavaAnnotationCallChecker.kt | 10 +- .../load/kotlin/PackagePartClassUtils.kt | 16 +- .../IncrementalPackageFragmentProvider.kt | 22 +- .../IncrementalPackagePartProvider.kt | 6 +- .../jetbrains/kotlin/load/kotlin/native.kt | 11 +- .../kotlin/resolve/jvm/JvmAnalyzerFacade.kt | 4 +- .../jvm/TopDownAnalyzerFacadeForJVM.java | 10 +- .../checkers/JavaClassOnCompanionChecker.kt | 4 +- .../JavaNullabilityWarningsChecker.kt | 40 +- .../checkers/JvmFieldApplicabilityChecker.kt | 4 +- .../checkers/JvmSimpleNameBacktickChecker.kt | 14 +- .../jvm/checkers/NeedSyntheticChecker.java | 1 - .../checkers/TraitDefaultMethodCallChecker.kt | 4 +- .../jvm/checkers/annotationCheckers.kt | 12 +- .../jvm/checkers/declarationCheckers.kt | 34 +- .../resolve/jvm/diagnostics/ErrorsJvm.java | 60 +- .../jvm/diagnostics/JvmDeclarationOrigin.kt | 12 +- .../AnalysisCompletedHandlerExtension.kt | 4 +- .../AlternativeFieldSignatureData.java | 16 +- .../AlternativeMethodSignatureData.java | 54 +- .../ElementAlternativeSignatureData.java | 14 +- .../PropagationHeuristics.java | 25 +- .../SignaturesPropagationData.java | 90 +- .../TypeTransformingVisitor.java | 52 +- ...JavaGenericVarianceViolationTypeChecker.kt | 12 +- .../resolve/jvm/platform/JvmPlatform.kt | 6 +- .../synthetic/JavaSyntheticPropertiesScope.kt | 14 +- .../synthetic/SamAdapterFunctionsScope.kt | 12 +- .../org/jetbrains/kotlin/JetNodeTypes.java | 164 --- .../{JetNodeType.java => KtNodeType.java} | 16 +- .../src/org/jetbrains/kotlin/KtNodeTypes.java | 164 +++ .../kotlin/analyzer/AnalyzerFacade.kt | 4 +- .../kotlin/cfg/BreakableBlockInfo.java | 8 +- .../kotlin/cfg/JetControlFlowBuilder.java | 84 +- .../cfg/JetControlFlowBuilderAdapter.java | 84 +- .../kotlin/cfg/JetControlFlowProcessor.java | 494 ++++---- .../cfg/JetFlowInformationProvider.java | 224 ++-- .../org/jetbrains/kotlin/cfg/LoopInfo.java | 8 +- .../kotlin/cfg/PseudocodeVariablesData.java | 8 +- .../kotlin/cfg/TailRecursionDetector.java | 6 +- .../jetbrains/kotlin/cfg/UnreachableCode.kt | 26 +- .../org/jetbrains/kotlin/cfg/WhenChecker.java | 78 +- .../JetControlFlowInstructionsGenerator.java | 112 +- .../kotlin/cfg/pseudocode/PseudoValue.kt | 6 +- .../kotlin/cfg/pseudocode/PseudoValueImpl.kt | 6 +- .../kotlin/cfg/pseudocode/Pseudocode.java | 8 +- .../kotlin/cfg/pseudocode/PseudocodeImpl.java | 22 +- .../kotlin/cfg/pseudocode/PseudocodeUtil.java | 16 +- .../kotlin/cfg/pseudocode/TypePredicate.kt | 28 +- .../instructions/InstructionWithNext.kt | 4 +- .../instructions/JetElementInstruction.kt | 4 +- .../instructions/JetElementInstructionImpl.kt | 4 +- .../pseudocode/instructions/LexicalScope.kt | 8 +- .../eval/LoadUnitValueInstruction.kt | 6 +- .../instructions/eval/accessInstructions.kt | 16 +- .../eval/operationInstructions.kt | 20 +- .../jumps/AbstractJumpInstruction.kt | 4 +- .../jumps/ConditionalJumpInstruction.kt | 4 +- .../jumps/NondeterministicJumpInstruction.kt | 4 +- .../jumps/ReturnNoValueInstruction.kt | 4 +- .../jumps/ReturnValueInstruction.kt | 10 +- .../jumps/ThrowExceptionInstruction.kt | 6 +- .../jumps/UnconditionalJumpInstruction.kt | 4 +- .../LocalFunctionDeclarationInstruction.kt | 4 +- .../instructions/special/MarkInstruction.kt | 4 +- .../special/SubroutineEnterInstruction.kt | 4 +- .../special/SubroutineExitInstruction.kt | 4 +- .../special/SubroutineSinkInstruction.kt | 4 +- .../special/VariableDeclarationInstruction.kt | 14 +- .../kotlin/cfg/pseudocode/pseudocodeUtils.kt | 32 +- .../kotlin/checkers/CheckerTestUtil.java | 20 +- .../kotlin/checkers/DebugInfoUtil.java | 66 +- .../impl/LocalVariableDescriptor.java | 4 +- .../MutablePackageFragmentDescriptor.java | 4 +- .../impl/SyntheticFieldDescriptor.kt | 6 +- .../kotlin/diagnostics/DiagnosticUtils.java | 4 +- .../jetbrains/kotlin/diagnostics/Errors.java | 622 +++++----- .../diagnostics/PositioningStrategies.kt | 230 ++-- .../rendering/DefaultErrorMessages.java | 24 +- .../kotlin/diagnostics/rendering/Renderers.kt | 34 +- .../rendering/TabledDescriptorRenderer.java | 22 +- .../ExternalDeclarationsProvider.kt | 4 +- .../{JetFileType.java => KotlinFileType.java} | 6 +- .../kotlin/idea/MainFunctionDetector.java | 44 +- .../incremental/KotlinLookupLocation.kt | 4 +- .../org/jetbrains/kotlin/incremental/utils.kt | 4 +- .../kotlin/kdoc/lexer/KDocToken.java | 4 +- .../kotlin/kdoc/lexer/_KDocLexer.java | 2 +- .../kotlin/kdoc/parser/KDocLinkParser.kt | 18 +- .../org/jetbrains/kotlin/kdoc/psi/api/KDoc.kt | 4 +- .../kotlin/kdoc/psi/impl/KDocImpl.kt | 8 +- .../kotlin/kdoc/psi/impl/KDocLink.kt | 4 +- .../kotlin/kdoc/psi/impl/KDocName.kt | 8 +- .../org/jetbrains/kotlin/lexer/JetTokens.java | 245 ---- .../lexer/{JetLexer.java => KotlinLexer.java} | 4 +- ...tKeywordToken.java => KtKeywordToken.java} | 14 +- ...Token.java => KtModifierKeywordToken.java} | 12 +- ...alueToken.java => KtSingleValueToken.java} | 4 +- .../lexer/{JetToken.java => KtToken.java} | 4 +- .../org/jetbrains/kotlin/lexer/KtTokens.java | 246 ++++ .../org/jetbrains/kotlin/lexer/_JetLexer.java | 204 ++-- .../kotlin/parsing/AbstractJetParsing.java | 44 +- .../kotlin/parsing/CommentBinders.kt | 16 +- .../kotlin/parsing/JetExpressionParsing.java | 44 +- .../kotlin/parsing/JetParserDefinition.java | 40 +- .../jetbrains/kotlin/parsing/JetParsing.java | 26 +- .../parsing/JetScriptDefinitionProvider.java | 4 +- ...SemanticWhitespaceAwarePsiBuilderImpl.java | 10 +- .../src/org/jetbrains/kotlin/psi/Call.java | 10 +- .../org/jetbrains/kotlin/psi/DebugTextUtil.kt | 96 +- .../psi/EditCommaSeparatedListHelper.kt | 18 +- .../jetbrains/kotlin/psi/FindDocComment.kt | 4 +- .../jetbrains/kotlin/psi/JetExpressionImpl.kt | 61 - .../org/jetbrains/kotlin/psi/JetVisitor.java | 448 ------- .../jetbrains/kotlin/psi/JetVisitorVoid.java | 1056 ----------------- .../psi/JetVisitorVoidWithParameter.java | 1025 ---------------- .../psi/KotlinDeclarationNavigationPolicy.kt | 4 +- .../psi/KotlinStringLiteralTextEscaper.kt | 6 +- .../{JetAnnotated.java => KtAnnotated.java} | 6 +- ...ession.java => KtAnnotatedExpression.java} | 18 +- .../{JetAnnotation.java => KtAnnotation.java} | 22 +- ...ationEntry.java => KtAnnotationEntry.java} | 58 +- ...Target.kt => KtAnnotationUseSiteTarget.kt} | 28 +- ...ainer.java => KtAnnotationsContainer.java} | 2 +- ...sion.java => KtArrayAccessExpression.java} | 26 +- ...xpression.java => KtBinaryExpression.java} | 24 +- ...ava => KtBinaryExpressionWithTypeRHS.java} | 22 +- ...CodeFragment.kt => KtBlockCodeFragment.kt} | 8 +- ...Type.java => KtBlockCodeFragmentType.java} | 6 +- ...Expression.java => KtBlockExpression.java} | 16 +- ...y.java => KtBlockStringTemplateEntry.java} | 6 +- ...Expression.java => KtBreakExpression.java} | 6 +- ...JetCallElement.java => KtCallElement.java} | 12 +- ...lExpression.java => KtCallExpression.java} | 40 +- ...ration.java => KtCallableDeclaration.java} | 12 +- ...ava => KtCallableReferenceExpression.java} | 12 +- ...JetCatchClause.java => KtCatchClause.java} | 22 +- .../kotlin/psi/{JetClass.kt => KtClass.kt} | 34 +- .../{JetClassBody.java => KtClassBody.java} | 48 +- ...itializer.java => KtClassInitializer.java} | 24 +- ...ression.kt => KtClassLiteralExpression.kt} | 4 +- ...JetClassOrObject.kt => KtClassOrObject.kt} | 66 +- .../{JetCodeFragment.kt => KtCodeFragment.kt} | 28 +- ...ression.java => KtConstantExpression.java} | 6 +- .../{JetConstructor.kt => KtConstructor.kt} | 31 +- ...ava => KtConstructorCalleeExpression.java} | 26 +- ....java => KtConstructorDelegationCall.java} | 28 +- ...tructorDelegationReferenceExpression.java} | 8 +- ...ontainerNode.java => KtContainerNode.java} | 4 +- ...ression.java => KtContinueExpression.java} | 6 +- ...JetDeclaration.java => KtDeclaration.java} | 10 +- ...ainer.java => KtDeclarationContainer.java} | 4 +- ...rationImpl.java => KtDeclarationImpl.java} | 30 +- ...st.java => KtDeclarationModifierList.java} | 10 +- ...rationStub.java => KtDeclarationStub.java} | 6 +- ...thBody.java => KtDeclarationWithBody.java} | 6 +- ...cifier.java => KtDelegationSpecifier.java} | 34 +- ...st.java => KtDelegationSpecifierList.java} | 16 +- ... => KtDelegatorByExpressionSpecifier.java} | 16 +- ...rCall.java => KtDelegatorToSuperCall.java} | 38 +- ...lass.java => KtDelegatorToSuperClass.java} | 12 +- ...pression.java => KtDoWhileExpression.java} | 10 +- ...ion.java => KtDotQualifiedExpression.java} | 48 +- ...pression.kt => KtDoubleColonExpression.kt} | 16 +- ...JetDynamicType.java => KtDynamicType.java} | 14 +- .../psi/{JetElement.kt => KtElement.kt} | 16 +- ...JetElementImpl.java => KtElementImpl.java} | 20 +- ...ntImplStub.java => KtElementImplStub.java} | 32 +- .../{JetEnumEntry.java => KtEnumEntry.java} | 26 +- ...EnumEntrySuperclassReferenceExpression.kt} | 24 +- ....java => KtEscapeStringTemplateEntry.java} | 6 +- .../{JetExpression.java => KtExpression.java} | 12 +- ...ragment.kt => KtExpressionCodeFragment.kt} | 8 +- ...java => KtExpressionCodeFragmentType.java} | 6 +- .../jetbrains/kotlin/psi/KtExpressionImpl.kt | 60 + ...mplStub.java => KtExpressionImplStub.java} | 10 +- ...nWithLabel.kt => KtExpressionWithLabel.kt} | 14 +- .../kotlin/psi/{JetFile.java => KtFile.java} | 90 +- ...ionList.java => KtFileAnnotationList.java} | 19 +- ...allySection.java => KtFinallySection.java} | 12 +- ...orExpression.java => KtForExpression.java} | 24 +- .../psi/{JetFunction.java => KtFunction.java} | 2 +- ...ionLiteral.java => KtFunctionLiteral.java} | 18 +- ...gument.kt => KtFunctionLiteralArgument.kt} | 15 +- ....java => KtFunctionLiteralExpression.java} | 24 +- ...Stubbed.java => KtFunctionNotStubbed.java} | 28 +- ...tFunctionType.java => KtFunctionType.java} | 46 +- ...eiver.java => KtFunctionTypeReceiver.java} | 14 +- ...tIfExpression.java => KtIfExpression.java} | 30 +- ...tDirective.java => KtImportDirective.java} | 42 +- .../{JetImportList.java => KtImportList.java} | 16 +- ...ortsFactory.java => KtImportsFactory.java} | 18 +- ...alizerList.java => KtInitializerList.java} | 16 +- ...ava => KtInstanceExpressionWithLabel.java} | 10 +- ...tIsExpression.java => KtIsExpression.java} | 24 +- ...ssion.kt => KtLabelReferenceExpression.kt} | 4 +- ...pression.java => KtLabeledExpression.java} | 10 +- ...java => KtLiteralStringTemplateEntry.java} | 6 +- ...pExpression.java => KtLoopExpression.java} | 16 +- ...tModifierList.java => KtModifierList.java} | 22 +- ...istOwner.java => KtModifierListOwner.java} | 14 +- ...Stub.java => KtModifierListOwnerStub.java} | 32 +- ...claration.java => KtMultiDeclaration.java} | 24 +- ...ntry.java => KtMultiDeclarationEntry.java} | 42 +- ...ession.kt => KtNameReferenceExpression.kt} | 20 +- .../psi/{JetNamed.java => KtNamed.java} | 2 +- ...claration.java => KtNamedDeclaration.java} | 2 +- ...java => KtNamedDeclarationNotStubbed.java} | 16 +- ...nStub.java => KtNamedDeclarationStub.java} | 36 +- ...nUtil.java => KtNamedDeclarationUtil.java} | 29 +- ...amedFunction.java => KtNamedFunction.java} | 64 +- ...tNullableType.java => KtNullableType.java} | 26 +- ...tDeclaration.kt => KtObjectDeclaration.kt} | 18 +- ...Name.java => KtObjectDeclarationName.java} | 18 +- ...on.java => KtObjectLiteralExpression.java} | 12 +- ...ession.java => KtOperationExpression.java} | 4 +- ...n.kt => KtOperationReferenceExpression.kt} | 10 +- ...Directive.java => KtPackageDirective.java} | 58 +- .../{JetParameter.java => KtParameter.java} | 60 +- ...arameterList.java => KtParameterList.java} | 26 +- ...on.java => KtParenthesizedExpression.java} | 10 +- ...pression.java => KtPostfixExpression.java} | 10 +- ...xpression.java => KtPrefixExpression.java} | 10 +- ...Constructor.kt => KtPrimaryConstructor.kt} | 32 +- ...jectionKind.java => KtProjectionKind.java} | 14 +- .../psi/{JetProperty.java => KtProperty.java} | 96 +- ...yAccessor.java => KtPropertyAccessor.java} | 54 +- ...yDelegate.java => KtPropertyDelegate.java} | 14 +- .../psi/{JetPsiFactory.kt => KtPsiFactory.kt} | 196 +-- .../psi/{JetPsiUtil.java => KtPsiUtil.java} | 440 +++---- ...ession.java => KtQualifiedExpression.java} | 10 +- ...onImpl.kt => KtQualifiedExpressionImpl.kt} | 22 +- ...ession.java => KtReferenceExpression.java} | 2 +- ...xpression.java => KtReturnExpression.java} | 10 +- ...sion.java => KtRootPackageExpression.java} | 6 +- ...on.java => KtSafeQualifiedExpression.java} | 22 +- .../psi/{JetScript.java => KtScript.java} | 14 +- ...nstructor.kt => KtSecondaryConstructor.kt} | 20 +- .../psi/{JetSelfType.java => KtSelfType.java} | 8 +- ...xpression.kt => KtSimpleNameExpression.kt} | 18 +- ...a => KtSimpleNameStringTemplateEntry.java} | 6 +- ...ession.java => KtStatementExpression.java} | 6 +- ...eEntry.java => KtStringTemplateEntry.java} | 8 +- ... KtStringTemplateEntryWithExpression.java} | 6 +- ...n.java => KtStringTemplateExpression.java} | 18 +- ...bbedPsiUtil.java => KtStubbedPsiUtil.java} | 20 +- ...Expression.java => KtSuperExpression.java} | 12 +- ...sExpression.java => KtThisExpression.java} | 6 +- ...Expression.java => KtThrowExpression.java} | 10 +- ...JetTreeVisitor.java => KtTreeVisitor.java} | 6 +- ...isitorVoid.java => KtTreeVisitorVoid.java} | 2 +- ...ryExpression.java => KtTryExpression.java} | 20 +- ...umentList.java => KtTypeArgumentList.java} | 16 +- ...eFragment.java => KtTypeCodeFragment.java} | 14 +- ...tType.java => KtTypeCodeFragmentType.java} | 6 +- ...eConstraint.java => KtTypeConstraint.java} | 20 +- ...intList.java => KtTypeConstraintList.java} | 16 +- ...JetTypeElement.java => KtTypeElement.java} | 12 +- ...ypeParameter.java => KtTypeParameter.java} | 37 +- ...eterList.java => KtTypeParameterList.java} | 16 +- ...ner.java => KtTypeParameterListOwner.java} | 10 +- ...> KtTypeParameterListOwnerNotStubbed.java} | 22 +- ...java => KtTypeParameterListOwnerStub.java} | 26 +- ...eProjection.java => KtTypeProjection.java} | 30 +- ...JetTypeReference.kt => KtTypeReference.kt} | 24 +- .../psi/{JetTypedef.java => KtTypedef.java} | 12 +- ...Expression.java => KtUnaryExpression.java} | 12 +- .../psi/{JetUserType.java => KtUserType.java} | 50 +- ...alueArgument.java => KtValueArgument.java} | 24 +- ...mentList.java => KtValueArgumentList.java} | 26 +- ...mentName.java => KtValueArgumentName.java} | 10 +- ...ration.java => KtVariableDeclaration.java} | 2 +- .../org/jetbrains/kotlin/psi/KtVisitor.java | 448 +++++++ .../jetbrains/kotlin/psi/KtVisitorVoid.java | 1056 +++++++++++++++++ .../psi/KtVisitorVoidWithParameter.java | 1025 ++++++++++++++++ ...henCondition.java => KtWhenCondition.java} | 4 +- ...Range.java => KtWhenConditionInRange.java} | 22 +- ...ern.java => KtWhenConditionIsPattern.java} | 16 +- ...ava => KtWhenConditionWithExpression.java} | 10 +- .../{JetWhenEntry.java => KtWhenEntry.java} | 18 +- ...nExpression.java => KtWhenExpression.java} | 32 +- ...Expression.java => KtWhileExpression.java} | 6 +- ...onBase.java => KtWhileExpressionBase.java} | 10 +- ....java => KtWithExpressionInitializer.java} | 4 +- .../jetbrains/kotlin/psi/TypeRefHelpers.kt | 38 +- .../org/jetbrains/kotlin/psi/ValueArgument.kt | 10 +- .../jetbrains/kotlin/psi/addRemoveModifier.kt | 24 +- .../jetbrains/kotlin/psi/codeFragmentUtil.kt | 20 +- .../jetbrains/kotlin/psi/createByPattern.kt | 26 +- ... KtStringTemplateExpressionManipulator.kt} | 14 +- .../StringTemplateExpressionManipulator.kt | 12 +- .../kotlin/psi/psiUtil/jetPsiUtil.kt | 226 ++-- .../kotlin/psi/stubs/StubInterfaces.kt | 44 +- .../stubs/elements/JetStubElementTypes.java | 127 -- ...java => KtAnnotationEntryElementType.java} | 14 +- ...> KtAnnotationUseSiteTargetElementType.kt} | 8 +- ...ementType.java => KtClassElementType.java} | 26 +- ... KtDotQualifiedExpressionElementType.java} | 14 +- ...perClassReferenceExpressionElementType.kt} | 10 +- ...lementType.java => KtFileElementType.java} | 8 +- ...tubBuilder.java => KtFileStubBuilder.java} | 9 +- ...ntType.java => KtFunctionElementType.java} | 14 +- ...java => KtImportDirectiveElementType.java} | 10 +- ...pe.java => KtModifierListElementType.java} | 6 +- ...KtNameReferenceExpressionElementType.java} | 10 +- ...mentType.java => KtObjectElementType.java} | 10 +- ...tType.java => KtParameterElementType.java} | 10 +- ...java => KtPlaceHolderStubElementType.java} | 7 +- ...ava => KtPropertyAccessorElementType.java} | 10 +- ...ntType.java => KtPropertyElementType.java} | 10 +- ...lementType.java => KtStubElementType.java} | 22 +- .../stubs/elements/KtStubElementTypes.java | 127 ++ ...e.java => KtTypeParameterElementType.java} | 10 +- ....java => KtTypeProjectionElementType.java} | 10 +- ...ntType.java => KtUserTypeElementType.java} | 10 +- .../psi/stubs/elements/StubIndexService.kt | 4 +- .../impl/KotlinAnnotationEntryStubImpl.kt | 6 +- .../impl/KotlinAnnotationUseSiteStubImpl.kt | 6 +- .../psi/stubs/impl/KotlinClassStubImpl.kt | 8 +- ...rySuperclassReferenceExpressionStubImpl.kt | 6 +- .../psi/stubs/impl/KotlinFileStubImpl.kt | 14 +- .../psi/stubs/impl/KotlinFunctionStubImpl.kt | 6 +- .../impl/KotlinImportDirectiveStubImpl.kt | 6 +- .../impl/KotlinModifierListStubImpl.java | 12 +- ...KotlinNameReferenceExpressionStubImpl.java | 8 +- .../psi/stubs/impl/KotlinObjectStubImpl.kt | 6 +- .../psi/stubs/impl/KotlinParameterStubImpl.kt | 6 +- .../stubs/impl/KotlinPlaceHolderStubImpl.java | 4 +- .../impl/KotlinPropertyAccessorStubImpl.java | 8 +- .../psi/stubs/impl/KotlinPropertyStubImpl.kt | 6 +- .../psi/stubs/impl/KotlinStubBaseImpl.kt | 6 +- .../stubs/impl/KotlinTypeParameterStubImpl.kt | 6 +- .../impl/KotlinTypeProjectionStubImpl.java | 14 +- .../psi/stubs/impl/KotlinUserTypeStubImpl.kt | 6 +- .../psi/stubs/impl/ModifierMaskUtils.kt | 12 +- .../kotlin/resolve/AllUnderImportsScope.kt | 14 +- .../resolve/AnalyzerScriptParameter.java | 8 +- .../kotlin/resolve/AnalyzingUtils.java | 10 +- .../kotlin/resolve/AnnotationChecker.kt | 74 +- .../kotlin/resolve/AnnotationResolver.java | 34 +- .../resolve/AnnotationUseSiteTargetChecker.kt | 26 +- .../kotlin/resolve/AnnotationUtil.kt | 1 + .../kotlin/resolve/BindingContext.java | 94 +- .../kotlin/resolve/BindingContextUtils.java | 48 +- .../kotlin/resolve/BindingContextUtils.kt | 26 +- .../kotlin/resolve/BindingTrace.java | 8 +- .../kotlin/resolve/BindingTraceContext.java | 10 +- .../kotlin/resolve/BodiesResolveContext.java | 16 +- .../kotlin/resolve/BodyResolveCache.kt | 6 +- .../kotlin/resolve/BodyResolver.java | 166 +-- .../resolve/CompileTimeConstantUtils.java | 26 +- .../kotlin/resolve/CompositeBindingContext.kt | 6 +- .../kotlin/resolve/ConstModifierChecker.kt | 18 +- .../resolve/ConstructorHeaderCallChecker.kt | 6 +- .../kotlin/resolve/ControlFlowAnalyzer.java | 32 +- .../resolve/DataClassAnnotationChecker.kt | 8 +- .../kotlin/resolve/DeclarationChecker.kt | 4 +- .../kotlin/resolve/DeclarationResolver.kt | 8 +- .../kotlin/resolve/DeclarationsChecker.java | 258 ++-- .../resolve/DelegatedPropertyResolver.java | 94 +- .../resolve/DelegatingBindingTrace.java | 10 +- .../kotlin/resolve/DelegationResolver.java | 42 +- .../kotlin/resolve/DescriptorResolver.java | 312 ++--- .../kotlin/resolve/DescriptorToSourceUtils.kt | 16 +- .../resolve/FunctionAnalyzerExtension.java | 8 +- .../resolve/FunctionDescriptorResolver.kt | 60 +- .../resolve/FunctionDescriptorUtil.java | 8 +- .../kotlin/resolve/IdentifierChecker.kt | 6 +- .../kotlin/resolve/InfixModifierChecker.kt | 8 +- .../kotlin/resolve/InlineParameterChecker.kt | 22 +- .../kotlin/resolve/LazyTopDownAnalyzer.kt | 54 +- .../LazyTopDownAnalyzerForTopLevel.java | 12 +- .../kotlin/resolve/ModifiersChecker.java | 76 +- .../kotlin/resolve/ModifiersChecker.kt | 64 +- .../resolve/NoSubpackagesInPackageScope.kt | 4 +- .../resolve/ObservableBindingTrace.java | 8 +- .../kotlin/resolve/OperatorModifierChecker.kt | 8 +- .../kotlin/resolve/OverloadResolver.java | 40 +- .../kotlin/resolve/OverloadUtil.java | 14 +- .../kotlin/resolve/OverrideResolver.java | 52 +- .../PlatformTypesMappedToKotlinChecker.java | 12 +- .../kotlin/resolve/PossiblyBareType.java | 14 +- .../resolve/QualifiedExpressionResolver.kt | 42 +- .../kotlin/resolve/ScriptBodyResolver.java | 12 +- .../kotlin/resolve/ScriptNameUtil.java | 12 +- .../kotlin/resolve/ScriptPriorities.java | 6 +- .../kotlin/resolve/SingleImportScope.kt | 4 +- .../kotlin/resolve/StatementFilter.kt | 16 +- .../resolve/TopDownAnalysisContext.java | 40 +- .../jetbrains/kotlin/resolve/TypeBinding.kt | 24 +- .../jetbrains/kotlin/resolve/TypeResolver.kt | 56 +- .../kotlin/resolve/UnderscoreChecker.kt | 18 +- .../kotlin/resolve/VarianceChecker.kt | 24 +- .../CallableReferencesResolutionUtils.kt | 58 +- .../resolve/calls/ArgumentTypeResolver.java | 118 +- .../kotlin/resolve/calls/CallCompleter.kt | 34 +- .../resolve/calls/CallExpressionResolver.java | 82 +- .../kotlin/resolve/calls/CallResolver.java | 82 +- .../kotlin/resolve/calls/CallResolverUtil.kt | 34 +- .../kotlin/resolve/calls/CallTransformer.java | 22 +- .../kotlin/resolve/calls/CandidateResolver.kt | 36 +- .../resolve/calls/GenericCandidateResolver.kt | 38 +- .../ValueArgumentsToParametersMapper.java | 6 +- .../calls/checkers/AdditionalTypeChecker.kt | 6 +- .../checkers/CapturingInClosureChecker.kt | 4 +- .../resolve/calls/checkers/InlineChecker.java | 34 +- ...ifiedTypeParameterSubstitutionChecker.java | 12 +- .../resolve/calls/checkers/SafeCallChecker.kt | 4 +- .../context/BasicCallResolutionContext.java | 8 +- .../CallCandidateResolutionContext.java | 6 +- .../calls/context/CallResolutionContext.java | 4 +- .../calls/context/ResolutionContext.java | 10 +- .../calls/context/TemporaryTraceAndCache.java | 6 +- .../calls/inference/ConstraintType.java | 4 +- .../calls/inference/ConstraintsUtil.java | 20 +- .../calls/inference/InferenceErrorData.java | 12 +- .../calls/inference/SubtypingConstraint.java | 12 +- .../calls/model/DelegatingResolvedCall.java | 4 +- .../calls/model/ExpressionValueArgument.java | 4 +- .../resolve/calls/model/ResolvedCall.java | 4 +- .../resolve/calls/model/ResolvedCallImpl.java | 6 +- .../calls/model/VarargValueArgument.java | 4 +- .../kotlin/resolve/calls/resolvedCallUtil.kt | 10 +- .../OverloadResolutionResultsUtil.java | 4 +- .../results/OverloadingConflictResolver.java | 38 +- .../calls/smartcasts/DataFlowInfo.java | 8 +- .../resolve/calls/smartcasts/DataFlowValue.kt | 4 +- .../smartcasts/DataFlowValueFactory.java | 80 +- .../smartcasts/DelegatingDataFlowInfo.java | 56 +- .../calls/smartcasts/SmartCastManager.java | 60 +- .../calls/smartcasts/SmartCastResult.kt | 4 +- .../calls/tasks/AbstractTracingStrategy.java | 40 +- .../tasks/CallableDescriptorCollectors.kt | 48 +- .../resolve/calls/tasks/ResolutionTask.java | 6 +- .../calls/tasks/ResolutionTaskHolder.kt | 2 +- .../resolve/calls/tasks/TaskPrioritizer.kt | 12 +- .../resolve/calls/tasks/TracingStrategy.java | 10 +- ...egyForImplicitConstructorDelegationCall.kt | 14 +- .../calls/tasks/TracingStrategyForInvoke.java | 22 +- .../calls/tasks/TracingStrategyImpl.java | 8 +- .../resolve/calls/tasks/dynamicCalls.kt | 30 +- .../kotlin/resolve/calls/util/CallMaker.java | 89 +- .../resolve/calls/util/DelegatingCall.java | 10 +- .../util/FakeCallableDescriptorForObject.kt | 6 +- .../kotlin/resolve/calls/util/callUtil.kt | 64 +- .../constants/CompileTimeConstantChecker.java | 62 +- .../evaluate/ConstantExpressionEvaluator.kt | 176 +-- .../DiagnosticsWithSuppression.java | 32 +- .../SuppressDiagnosticsByAnnotations.kt | 8 +- .../inline/InlineAnalyzerExtension.java | 32 +- .../kotlin/resolve/inline/InlineUtil.java | 12 +- .../lazy/DeclarationScopeProviderImpl.java | 28 +- .../kotlin/resolve/lazy/FileScopeProvider.kt | 10 +- .../resolve/lazy/FileScopeProviderImpl.kt | 27 +- .../kotlin/resolve/lazy/ForceResolveUtil.java | 10 +- .../resolve/lazy/KotlinCodeAnalyzer.java | 8 +- .../resolve/lazy/LazyDeclarationResolver.java | 64 +- .../kotlin/resolve/lazy/LazyFileScope.kt | 8 +- .../kotlin/resolve/lazy/LazyImportScope.kt | 46 +- .../resolve/lazy/LocalDescriptorResolver.kt | 8 +- .../NoDescriptorForDeclarationException.kt | 4 +- .../kotlin/resolve/lazy/ResolveSession.java | 48 +- .../resolve/lazy/ResolveSessionUtils.java | 16 +- .../lazy/TopLevelDescriptorProvider.kt | 6 +- .../resolve/lazy/data/JetClassInfo.java | 14 +- .../resolve/lazy/data/JetClassInfoUtil.java | 16 +- .../resolve/lazy/data/JetClassLikeInfo.java | 14 +- .../lazy/data/JetClassOrObjectInfo.java | 24 +- .../resolve/lazy/data/JetObjectInfo.java | 10 +- .../kotlin/resolve/lazy/data/JetScriptInfo.kt | 14 +- .../AbstractPsiBasedDeclarationProvider.kt | 26 +- .../CliDeclarationProviderFactoryService.kt | 8 +- .../lazy/declarations/DeclarationProvider.kt | 12 +- .../DeclarationProviderFactoryService.kt | 10 +- .../FileBasedDeclarationProviderFactory.java | 10 +- ...leBasedPackageMemberDeclarationProvider.kt | 4 +- .../PackageMemberDeclarationProvider.kt | 4 +- .../descriptors/AbstractLazyMemberScope.kt | 18 +- .../ClassResolutionScopesSupport.kt | 8 +- .../lazy/descriptors/LazyAnnotations.kt | 12 +- .../lazy/descriptors/LazyClassDescriptor.java | 98 +- .../lazy/descriptors/LazyClassMemberScope.kt | 22 +- .../descriptors/LazyPackageDescriptor.java | 10 +- .../descriptors/LazyPackageMemberScope.kt | 4 +- .../lazy/descriptors/LazyScriptDescriptor.kt | 4 +- .../LazyTypeParameterDescriptor.java | 38 +- .../kotlin/resolve/scopes/JetScopeUtils.java | 4 +- .../resolve/scopes/LexicalChainedScope.kt | 2 +- .../kotlin/resolve/scopes/WritableScope.kt | 4 +- .../resolve/scopes/WritableScopeImpl.kt | 8 +- .../scopes/receivers/ExpressionReceiver.java | 10 +- .../resolve/scopes/receivers/Qualifier.kt | 28 +- .../scopes/receivers/ScriptReceiver.java | 4 +- .../kotlin/resolve/scopes/utils/ScopeUtils.kt | 36 +- .../resolve/source/KotlinSourceElement.kt | 6 +- .../validation/DeprecatedSymbolValidator.kt | 18 +- .../resolve/validation/InfixValidator.kt | 10 +- .../resolve/validation/OperatorValidator.kt | 10 +- .../LockBasedLazyResolveStorageManager.kt | 10 +- .../kotlin/types/BoundsSubstitutor.java | 16 +- .../kotlin/types/CastDiagnosticsUtil.java | 48 +- .../jetbrains/kotlin/types/DeferredType.java | 14 +- .../kotlin/types/SubstitutionUtils.java | 8 +- .../types/TypeReconstructionResult.java | 6 +- .../jetbrains/kotlin/types/TypeUnifier.java | 4 +- .../expressions/AssignedVariablesSearcher.kt | 26 +- .../BasicExpressionTypingVisitor.java | 411 +++---- .../ControlStructureTypingUtils.java | 68 +- .../ControlStructureTypingVisitor.java | 176 +-- .../types/expressions/DataFlowAnalyzer.java | 110 +- .../expressions/ExpressionTypingContext.java | 13 +- .../expressions/ExpressionTypingFacade.java | 8 +- .../ExpressionTypingInternals.java | 8 +- .../expressions/ExpressionTypingServices.java | 70 +- .../expressions/ExpressionTypingUtils.java | 72 +- .../expressions/ExpressionTypingVisitor.java | 4 +- .../ExpressionTypingVisitorDispatcher.java | 93 +- .../ExpressionTypingVisitorForStatements.java | 117 +- .../types/expressions/FakeCallResolver.kt | 32 +- .../ForLoopConventionsChecker.java | 38 +- .../expressions/FunctionsTypingVisitor.kt | 46 +- .../kotlin/types/expressions/JetTypeInfo.kt | 9 +- .../types/expressions/LabelResolver.java | 90 +- .../expressions/LocalClassifierAnalyzer.kt | 14 +- .../expressions/MultiDeclarationResolver.kt | 20 +- .../expressions/OperatorConventions.java | 108 +- .../PatternMatchingTypingVisitor.java | 86 +- .../PreliminaryDeclarationVisitor.kt | 18 +- .../expressions/PreliminaryLoopVisitor.kt | 4 +- .../expressions/SenselessComparisonChecker.kt | 18 +- .../types/expressions/TypeInfoFactory.kt | 12 +- .../expressions/TypeReconstructionUtil.java | 12 +- .../expressions/ValueParameterResolver.kt | 8 +- .../unqualifiedSuper/unqualifiedSuper.kt | 64 +- .../kotlin/util/slicedMap/Slices.java | 4 +- .../asJava/ClsWrapperStubPsiFactory.java | 8 +- .../FakeLightClassForFileOfPackage.java | 10 +- .../kotlin/asJava/JavaElementFinder.java | 33 +- .../KotlinCodeBlockModificationListener.kt | 18 +- .../asJava/KotlinJavaFileStubProvider.java | 90 +- .../kotlin/asJava/KotlinLightClass.kt | 4 +- ...tlinLightClassForAnonymousDeclaration.java | 10 +- .../asJava/KotlinLightClassForEnumEntry.kt | 4 +- .../KotlinLightClassForExplicitDeclaration.kt | 70 +- .../asJava/KotlinLightClassForFacade.kt | 12 +- ...otlinLightClassForInterfaceDefaultImpls.kt | 6 +- .../kotlin/asJava/KotlinLightElement.kt | 4 +- .../kotlin/asJava/KotlinLightEnumConstant.kt | 6 +- .../kotlin/asJava/KotlinLightField.java | 4 +- .../asJava/KotlinLightFieldForDeclaration.kt | 6 +- .../kotlin/asJava/KotlinLightMethod.kt | 4 +- .../asJava/KotlinLightMethodForDeclaration.kt | 12 +- .../KotlinLightMethodForTraitFakeOverride.kt | 8 +- ...htPackage.java => KotlinLightPackage.java} | 6 +- .../kotlin/asJava/KotlinLightParameter.java | 28 +- .../asJava/KotlinLightTypeParameter.java | 10 +- .../asJava/KotlinWrappingLightClass.java | 30 +- .../asJava/LightClassGenerationSupport.java | 22 +- .../kotlin/asJava/LightClassStubWithData.kt | 12 +- .../jetbrains/kotlin/asJava/LightClassUtil.kt | 70 +- .../kotlin/asJava/StubClassBuilder.java | 3 - .../asJava/duplicateJvmSignatureUtil.kt | 22 +- .../kotlin/asJava/lightClassUtils.kt | 56 +- .../serialization/DescriptorSerializer.java | 12 +- .../serialization/SerializerExtension.java | 4 +- ...closingMethod attributes for local classes | 5 + .../multifileClassWithCrossCall/Baz.java~HEAD | 5 + ...closingMethod attributes for local classes | 5 + .../multifileClassWithCrossCall/foo.kt~HEAD | 5 + ...closingMethod attributes for local classes | 1 + .../multifileClassWithInternal.kt~HEAD | 1 + .../kotlin/cfg/AbstractPseudoValueTest.kt | 18 +- .../kotlin/cfg/AbstractPseudocodeTest.java | 34 +- .../kotlin/cfg/CFGraphToDotFilePrinter.java | 10 +- .../checkers/AbstractJetDiagnosticsTest.java | 18 +- ...bstractJetDiagnosticsTestWithJsStdLib.java | 4 +- ...csTestWithJsStdLibAndBackendCompilation.kt | 4 +- .../kotlin/checkers/BaseDiagnosticsTest.java | 16 +- .../kotlin/checkers/CheckerTestUtilTest.java | 4 +- .../kotlin/checkers/LazyOperationsLog.kt | 14 +- .../AbstractCheckLocalVariablesTableTest.java | 4 +- .../codegen/AbstractLineNumberTest.java | 19 +- .../kotlin/codegen/CodegenTestFiles.java | 20 +- .../GenerateNotNullAssertionsTest.java | 4 +- .../kotlin/codegen/GenerationUtils.java | 12 +- .../kotlin/codegen/InlineTestUtil.kt | 4 +- .../jetbrains/kotlin/codegen/TestlibTest.java | 16 +- .../codegen/flags/AbstractWriteFlagsTest.java | 4 +- .../AbstractBlackBoxCodegenTest.java | 6 +- .../AbstractCompileJavaAgainstKotlinTest.java | 4 +- ...bstractCompileKotlinAgainstKotlinTest.java | 4 +- .../jvm/compiler/AbstractLoadJavaTest.java | 4 +- .../jvm/compiler/AbstractSMAPBaseTest.kt | 6 +- .../AbstractSdkAnnotationsValidityTest.java | 8 +- .../DeserializedScopeValidationVisitor.kt | 8 +- .../jvm/compiler/ExpectedLoadErrorsUtil.java | 4 +- .../jvm/compiler/LoadDescriptorUtil.java | 16 +- .../MultiModuleJavaAnalysisCustomTest.kt | 4 +- .../AbstractJvmRuntimeDescriptorLoaderTest.kt | 10 +- .../parsing/AbstractJetParsingTest.java | 20 +- .../jetbrains/kotlin/psi/JetPsiUtilTest.java | 40 +- .../kotlin/psi/JetSimpleNameExpressionTest.kt | 2 +- .../AbstractDescriptorRendererTest.kt | 34 +- ...ctionDescriptorInExpressionRendererTest.kt | 16 +- .../kotlin/resolve/AbstractResolveTest.java | 4 +- .../kotlin/resolve/ExpectedResolveData.java | 54 +- .../resolve/ExtensibleResolveTestCase.java | 6 +- .../resolve/JetExpectedResolveDataUtil.java | 4 +- .../kotlin/resolve/MutableDiagnosticsTest.kt | 2 +- ...stractAnnotationDescriptorResolveTest.java | 34 +- .../calls/AbstractResolvedCallsTest.kt | 12 +- ...ResolvedConstructorDelegationCallsTests.kt | 8 +- .../AbstractEvaluateExpressionTest.kt | 4 +- .../AbstractConstraintSystemTest.kt | 4 +- .../ConstraintSystemTestData.kt | 20 +- .../kotlin/resolve/lazy/JvmResolveUtil.java | 22 +- .../resolve/lazy/LazyResolveTestUtil.java | 18 +- .../resolve/lazy/lazyResolveTestUtils.kt | 4 +- .../CapturedTypeApproximationTest.kt | 4 +- .../builtins/LoadBuiltinsTest.java | 4 +- .../jetbrains/kotlin/test/JetLiteFixture.java | 14 +- .../jetbrains/kotlin/test/JetTestUtils.java | 48 +- .../kotlin/test/util/DescriptorValidator.java | 52 +- .../util/RecursiveDescriptorComparator.java | 6 +- .../RecursiveDescriptorProcessorTest.java | 4 +- .../kotlin/test/util/jetTestUtils.kt | 6 +- .../types/AbstractJetTypeBindingTest.kt | 12 +- .../kotlin/types/BoundsSubstitutorTest.java | 6 +- .../JetDefaultModalityModifiersTest.java | 38 +- .../kotlin/types/JetOverloadTest.java | 6 +- .../kotlin/types/JetOverridingTest.java | 6 +- .../kotlin/types/JetTypeCheckerTest.java | 70 +- .../kotlin/types/TypeSubstitutorTest.java | 30 +- .../kotlin/types/TypeUnifierTest.java | 20 +- .../components/ExternalSignatureResolver.java | 44 +- .../java/components/SamConversionResolver.kt | 12 +- .../JavaCallableMemberDescriptor.java | 9 +- .../java/descriptors/JavaClassDescriptor.java | 4 +- .../JavaConstructorDescriptor.java | 8 +- .../descriptors/JavaMethodDescriptor.java | 12 +- .../descriptors/JavaPropertyDescriptor.java | 8 +- .../kotlin/load/java/descriptors/util.kt | 4 +- .../LazyJavaAnnotationDescriptor.kt | 2 +- .../descriptors/LazyJavaClassDescriptor.kt | 20 +- .../descriptors/LazyJavaClassMemberScope.kt | 26 +- .../lazy/descriptors/LazyJavaPackageScope.kt | 4 +- .../java/lazy/descriptors/LazyJavaScope.kt | 18 +- .../descriptors/LazyJavaStaticClassScope.kt | 4 +- .../lazy/descriptors/LazyJavaStaticScope.kt | 4 +- .../LazyJavaTypeParameterDescriptor.kt | 4 +- .../java/lazy/types/LazyJavaTypeResolver.kt | 32 +- .../kotlin/load/java/lazy/types/RawType.kt | 16 +- .../typeEnhacement/signatureEnhancement.kt | 12 +- .../java/typeEnhacement/typeEnhancement.kt | 12 +- .../java/typeEnhacement/typeQualifiers.kt | 18 +- ...tBinaryClassAnnotationAndConstantLoader.kt | 4 +- .../BuiltInClassesAreSerializableOnJvm.kt | 14 +- .../DeserializedDescriptorResolver.java | 14 +- .../kotlin/platform/JavaToKotlinClassMap.java | 6 +- .../resolve/jvm/JavaDescriptorResolver.kt | 2 +- .../BuiltInsAnnotationAndConstantLoader.kt | 4 +- .../kotlin/builtins/KotlinBuiltIns.java | 182 +-- .../kotlin/builtins/ReflectionTypes.kt | 32 +- .../functions/FunctionClassDescriptor.kt | 6 +- .../builtins/functions/FunctionClassScope.kt | 4 +- .../descriptors/CallableDescriptor.java | 4 +- .../kotlin/descriptors/ClassDescriptor.java | 16 +- .../descriptors/ClassifierDescriptor.java | 4 +- .../jetbrains/kotlin/descriptors/ConstUtil.kt | 6 +- .../descriptors/ConstructorDescriptor.java | 4 +- .../kotlin/descriptors/EffectiveVisibility.kt | 6 +- .../descriptors/PackageFragmentDescriptor.kt | 4 +- .../descriptors/PackageViewDescriptor.kt | 4 +- .../descriptors/ParameterDescriptor.java | 4 +- .../kotlin/descriptors/ScriptDescriptor.java | 1 - .../descriptors/TypeParameterDescriptor.java | 8 +- .../descriptors/ValueParameterDescriptor.java | 4 +- .../descriptors/VariableDescriptor.java | 4 +- .../annotations/AnnotationDescriptor.java | 4 +- .../annotations/AnnotationDescriptorImpl.java | 8 +- .../impl/AbstractClassDescriptor.java | 22 +- .../AbstractLazyTypeParameterDescriptor.java | 4 +- .../AbstractReceiverParameterDescriptor.java | 8 +- .../impl/AbstractTypeParameterDescriptor.java | 47 +- .../descriptors/impl/ClassDescriptorImpl.java | 16 +- .../EnumEntrySyntheticClassDescriptor.java | 24 +- .../impl/FunctionDescriptorImpl.java | 29 +- .../impl/LazyPackageViewDescriptorImpl.kt | 6 +- .../impl/LazySubstitutingClassDescriptor.java | 28 +- .../impl/PropertyDescriptorImpl.java | 18 +- .../impl/PropertyGetterDescriptorImpl.java | 8 +- .../impl/PropertySetterDescriptorImpl.java | 6 +- .../impl/ScriptCodeDescriptor.java | 4 +- .../impl/SimpleFunctionDescriptorImpl.java | 6 +- .../descriptors/impl/SubpackagesScope.kt | 4 +- .../impl/TypeParameterDescriptorImpl.java | 10 +- .../impl/ValueParameterDescriptorImpl.java | 10 +- .../impl/VariableDescriptorImpl.java | 12 +- ...VariableDescriptorWithInitializerImpl.java | 4 +- .../kotlin/renderer/CustomRendering.kt | 4 +- .../kotlin/renderer/DescriptorRenderer.kt | 6 +- .../kotlin/renderer/DescriptorRendererImpl.kt | 18 +- .../renderer/DescriptorRendererOptionsImpl.kt | 4 +- .../kotlin/resolve/DescriptorFactory.java | 8 +- .../kotlin/resolve/DescriptorUtils.java | 46 +- .../kotlin/resolve/DescriptorUtils.kt | 4 +- .../kotlin/resolve/OverridingUtil.java | 60 +- .../kotlin/resolve/annotationsForResolve.kt | 6 +- .../inference/CapturedTypeConstructor.kt | 18 +- .../calls/inference/ConstraintSystem.kt | 6 +- .../calls/inference/ConstraintSystemImpl.kt | 72 +- .../resolve/calls/inference/TypeBounds.kt | 8 +- .../resolve/calls/inference/TypeBoundsImpl.kt | 30 +- .../inference/constraintIncorporation.kt | 4 +- .../resolve/constants/CompileTimeConstant.kt | 14 +- .../resolve/constants/ConstantValueFactory.kt | 8 +- .../constants/IntegerValueTypeConstructor.kt | 8 +- .../resolve/constants/constantValues.kt | 18 +- .../resolve/scopes/AbstractScopeAdapter.kt | 16 +- .../kotlin/resolve/scopes/ChainedScope.kt | 14 +- .../resolve/scopes/ExplicitImportsScope.kt | 2 +- .../kotlin/resolve/scopes/FilteringScope.kt | 12 +- .../scopes/InnerClassesScopeWrapper.kt | 2 +- .../scopes/{JetScope.kt => KtScope.kt} | 16 +- .../{JetScopeImpl.kt => KtScopeImpl.kt} | 12 +- .../kotlin/resolve/scopes/LazyScopeAdapter.kt | 4 +- .../jetbrains/kotlin/resolve/scopes/Scopes.kt | 12 +- .../scopes/StaticScopeForKotlinClass.kt | 2 +- .../resolve/scopes/SubstitutingScope.kt | 12 +- .../receivers/AbstractReceiverValue.java | 8 +- .../scopes/receivers/ClassReceiver.java | 4 +- .../scopes/receivers/ExtensionReceiver.java | 4 +- .../scopes/receivers/ReceiverValue.java | 8 +- .../scopes/receivers/TransientReceiver.java | 4 +- ...stractJetType.java => AbstractKtType.java} | 11 +- .../kotlin/types/AbstractLazyType.kt | 8 +- .../kotlin/types/CapturedTypeApproximation.kt | 16 +- .../kotlin/types/CommonSupertypes.java | 78 +- .../kotlin/types/DelegatingType.java | 16 +- .../kotlin/types/DescriptorSubstitutor.java | 2 +- .../DisjointKeysUnionTypeSubstitution.kt | 2 +- .../jetbrains/kotlin/types/ErrorUtils.java | 72 +- .../kotlin/types/FunctionPlaceholders.kt | 10 +- .../types/IntersectionTypeConstructor.java | 14 +- .../types/{JetType.java => KtType.java} | 10 +- .../types/{JetTypeImpl.kt => KtTypeImpl.kt} | 26 +- .../org/jetbrains/kotlin/types/LazyType.java | 2 +- .../kotlin/types/StarProjectionImpl.kt | 6 +- .../kotlin/types/TypeCapabilities.kt | 28 +- .../kotlin/types/TypeConstructor.java | 2 +- .../kotlin/types/TypeConstructorImpl.java | 10 +- .../kotlin/types/TypeIntersector.java | 46 +- .../kotlin/types/TypeProjection.java | 2 +- .../kotlin/types/TypeProjectionImpl.java | 8 +- .../kotlin/types/TypeSubstitution.kt | 12 +- .../kotlin/types/TypeSubstitutor.java | 30 +- .../org/jetbrains/kotlin/types/TypeUtils.java | 182 +-- .../org/jetbrains/kotlin/types/TypeUtils.kt | 48 +- ...ypeChecker.java => KotlinTypeChecker.java} | 24 +- .../TypeCheckerProcedureCallbacksImpl.java | 10 +- .../types/checker/TypeCheckingProcedure.java | 32 +- .../TypeCheckingProcedureCallbacks.java | 10 +- .../jetbrains/kotlin/types/checker/utils.kt | 8 +- .../jetbrains/kotlin/types/dynamicTypes.kt | 10 +- .../jetbrains/kotlin/types/flexibleTypes.kt | 54 +- .../deserialization/AdditionalSupertypes.kt | 6 +- .../AnnotationAndConstantLoader.java | 4 +- .../deserialization/AnnotationDeserializer.kt | 6 +- .../deserialization/TypeDeserializer.kt | 2 +- .../DeserializedClassDescriptor.kt | 10 +- .../descriptors/DeserializedMemberScope.kt | 4 +- .../DeserializedTypeParameterDescriptor.kt | 6 +- .../kotlin/reflect/jvm/internal/KClassImpl.kt | 6 +- .../jvm/internal/KDeclarationContainerImpl.kt | 4 +- .../reflect/jvm/internal/KPackageImpl.kt | 4 +- .../kotlin/reflect/jvm/internal/KTypeImpl.kt | 4 +- .../jvm/internal/ReflectionObjectRenderer.kt | 4 +- .../evaluate/GenerateOperationsMap.kt | 16 +- .../frontend/GenerateKeywordStrings.java | 14 +- .../tests/generateTestDataForReservedWords.kt | 4 +- .../codeInsight/ReferenceVariantsHelper.kt | 60 +- .../kotlin/idea/resolve/ResolutionFacade.kt | 10 +- .../jetbrains/kotlin/idea/util/CallType.kt | 78 +- .../jetbrains/kotlin/idea/util/FuzzyType.kt | 12 +- .../idea/util/IdeDescriptorRenderers.kt | 8 +- .../kotlin/idea/util/ImportsUtils.kt | 8 +- .../idea/util/ShadowedDeclarationsFilter.kt | 14 +- .../jetbrains/kotlin/idea/util/TypeUtils.kt | 18 +- .../org/jetbrains/kotlin/idea/util/Utils.kt | 16 +- .../kotlin/idea/util/extensionsUtils.kt | 14 +- .../idea/util/implicitReceiversUtils.kt | 18 +- .../jetbrains/kotlin/idea/util/scopeUtils.kt | 10 +- .../resolve/lazy/PartialBodyResolveFilter.kt | 184 +-- .../jetbrains/kotlin/util/TypeIndexUtil.kt | 20 +- .../jetbrains/kotlin/util/descriptorUtils.kt | 4 +- .../kotlin/util/substitutionUtils.kt | 4 +- .../idea/JetDescriptorIconProvider.java | 24 +- .../kotlin/idea/JetIconProvider.java | 90 +- .../idea/{JetIcons.java => KtIcons.java} | 2 +- .../kotlin/idea/analysis/AnalyzerUtil.kt | 32 +- .../caches/resolve/CodeFragmentAnalyzer.kt | 36 +- .../resolve/IDELightClassGenerationSupport.kt | 54 +- .../caches/resolve/JavaResolveExtension.kt | 4 +- .../idea/caches/resolve/KotlinCacheService.kt | 30 +- ...otlinLightClassForDecompiledDeclaration.kt | 6 +- .../idea/caches/resolve/KotlinResolveCache.kt | 54 +- .../caches/resolve/ModuleDependencyMapper.kt | 4 +- .../caches/resolve/ProjectResolutionFacade.kt | 18 +- .../idea/caches/resolve/getModuleInfo.kt | 8 +- .../idea/caches/resolve/resolutionApi.kt | 32 +- .../codeInsight/DescriptorToSourceUtilsIde.kt | 2 +- .../codeInsight/JetFileReferencesResolver.kt | 46 +- .../codeInsight/shorten/shortenWaitingSet.kt | 6 +- ...ionLoaderForKotlinJavaScriptStubBuilder.kt | 4 +- .../idea/decompiler/KotlinClsFileBase.kt | 18 +- .../decompiler/kotlinFileViewProviders.kt | 4 +- .../navigation/DecompiledNavigationUtils.java | 10 +- .../navigation/JetSourceNavigationHelper.java | 164 +-- .../KotlinDeclarationNavigationPolicyImpl.kt | 8 +- .../decompiler/navigation/MemberMatching.java | 92 +- .../stubBuilder/CallableClsStubBuilder.kt | 6 +- .../stubBuilder/ClassClsStubBuilder.kt | 47 +- .../stubBuilder/KotlinClsStubBuilder.kt | 4 +- .../KotlinJavaScriptStubBuilder.kt | 4 +- .../stubBuilder/TypeClsStubBuilder.kt | 58 +- .../decompiler/stubBuilder/clsStubBuilding.kt | 82 +- .../textBuilder/missingDependencies.kt | 10 +- .../idea/findUsages/JetFindUsagesProvider.kt | 18 +- .../kotlin/idea/findUsages/UsageTypeUtils.kt | 78 +- .../idea/highlighter/DebugInfoAnnotator.java | 16 +- .../DuplicateJvmSignatureAnnotator.java | 12 +- .../FunctionsHighlightingVisitor.java | 26 +- .../idea/highlighter/HighlightingVisitor.java | 4 +- .../HtmlTabledDescriptorRenderer.java | 12 +- .../kotlin/idea/highlighter/IdeRenderers.kt | 4 +- .../idea/highlighter/JetHighlighter.java | 60 +- .../highlighter/JetHighlightingLexer.java | 8 +- .../kotlin/idea/highlighter/JetPsiChecker.kt | 22 +- .../KotlinBeforeResolveHighlightingPass.kt | 6 +- .../KotlinProblemHighlightFilter.kt | 4 +- .../KotlinSuppressableWarningProblemGroup.kt | 36 +- .../LabelsHighlightingVisitor.java | 12 +- .../PropertiesHighlightingVisitor.java | 20 +- .../SoftKeywordsHighlightingVisitor.java | 20 +- .../TypeKindHighlightingVisitor.java | 18 +- .../VariablesHighlightingVisitor.java | 14 +- .../inspections/IntentionBasedInspection.kt | 8 +- .../intentions/JetSelfTargetingIntention.kt | 10 +- .../intentions/OperatorToFunctionIntention.kt | 150 +-- .../kotlin/idea/kdoc/KDocElementFactory.kt | 6 +- .../jetbrains/kotlin/idea/kdoc/KDocFinder.kt | 8 +- .../kotlin/idea/kdoc/KDocReference.kt | 10 +- .../project/IdeaLocalDescriptorResolver.kt | 4 +- .../jetbrains/kotlin/idea/project/Platform.kt | 4 +- .../idea/project/ProjectStructureUtil.java | 10 +- .../idea/project/ResolveElementCache.kt | 200 ++-- .../idea/project/TargetPlatformDetector.java | 4 +- .../quickfix/JetIntentionActionsFactory.kt | 4 +- .../quickfix/KotlinSuppressIntentionAction.kt | 34 +- .../kotlin/idea/quickfix/generateUtil.kt | 18 +- .../idea/refactoring/fqName/fqNameUtil.kt | 4 +- .../references/BuiltInsReferenceResolver.kt | 16 +- ...butor.kt => KotlinReferenceContributor.kt} | 40 +- ...rence.java => KtArrayAccessReference.java} | 16 +- ... => KtConstructorDelegationReference.java} | 6 +- ...InReference.kt => KtForLoopInReference.kt} | 6 +- ...ce.java => KtInvokeFunctionReference.java} | 18 +- ...ence.kt => KtMultiDeclarationReference.kt} | 4 +- ...> KtPropertyDelegationMethodsReference.kt} | 8 +- .../{JetReference.kt => KtReference.kt} | 20 +- ...eReference.kt => KtSimpleNameReference.kt} | 44 +- .../SyntheticPropertyAccessorReference.kt | 12 +- .../kotlin/idea/references/referenceUtil.kt | 54 +- .../idea/search/KotlinIndexPatternBuilder.kt | 14 +- .../kotlin/idea/search/KotlinIndexers.kt | 26 +- .../classInheritorsSearch.kt | 4 +- .../declarationsSearch/overridersSearch.kt | 4 +- .../KotlinReadWriteAccessDetector.kt | 10 +- .../KotlinReferencesSearcher.kt | 54 +- .../idea/search/usagesSearch/conventions.kt | 26 +- .../idea/search/usagesSearch/searchHelpers.kt | 22 +- .../kotlin/idea/search/usagesSearch/utils.kt | 64 +- .../JetStructureViewElement.java | 36 +- .../JetStructureViewFactory.java | 6 +- .../structureView/JetStructureViewModel.java | 8 +- .../KotlinInheritedMembersNodeProvider.kt | 4 +- .../KotlinStructureElementPresentation.java | 10 +- .../idea/stubindex/IdeStubIndexService.java | 8 +- .../kotlin/idea/stubindex/IndexUtils.kt | 12 +- .../idea/stubindex/JetAnnotationsIndex.java | 10 +- .../stubindex/JetClassShortNameIndex.java | 10 +- .../idea/stubindex/JetExactPackagesIndex.java | 10 +- .../JetFileFacadeClassByPackageIndex.kt | 6 +- .../stubindex/JetFileFacadeFqNameIndex.kt | 6 +- .../stubindex/JetFileFacadeShortNameIndex.kt | 6 +- .../idea/stubindex/JetFilePartClassIndex.kt | 6 +- .../idea/stubindex/JetFullClassNameIndex.java | 10 +- .../stubindex/JetFunctionShortNameIndex.java | 10 +- .../stubindex/JetMultifileClassPartIndex.kt | 6 +- ...ProbablyNothingFunctionShortNameIndex.java | 10 +- ...ProbablyNothingPropertyShortNameIndex.java | 10 +- .../stubindex/JetPropertyShortNameIndex.java | 10 +- .../idea/stubindex/JetSuperClassIndex.java | 10 +- .../JetTopLevelClassByPackageIndex.java | 10 +- ...etTopLevelExtensionsByReceiverTypeIndex.kt | 6 +- .../JetTopLevelFunctionByPackageIndex.java | 10 +- .../JetTopLevelFunctionFqnNameIndex.java | 10 +- .../JetTopLevelPropertyByPackageIndex.java | 10 +- .../JetTopLevelPropertyFqnNameIndex.java | 10 +- .../idea/stubindex/KotlinFileStubForIde.kt | 8 +- .../kotlin/idea/stubindex/PackageIndexUtil.kt | 8 +- .../idea/stubindex/StaticFacadeIndexUtil.kt | 6 +- .../PluginDeclarationProviderFactory.kt | 4 +- ...PluginDeclarationProviderFactoryService.kt | 4 +- ...ubBasedPackageMemberDeclarationProvider.kt | 12 +- .../kotlin/idea/util/ImportInsertHelper.kt | 6 +- .../kotlin/idea/util/JetPsiPrecedences.kt | 12 +- .../kotlin/idea/util/ShortenReferences.kt | 118 +- .../SimpleNameReferenceExtension.kt | 8 +- .../idea/completion/AllClassesCompletion.kt | 8 +- .../idea/completion/BasicCompletionSession.kt | 24 +- .../idea/completion/CompletionSession.kt | 36 +- .../kotlin/idea/completion/CompletionUtils.kt | 36 +- .../DataFlowInfoUtilForCompletion.kt | 4 +- .../kotlin/idea/completion/ExpectedInfos.kt | 116 +- .../idea/completion/HeuristicSignatures.kt | 12 +- .../idea/completion/InsertHandlerProvider.kt | 4 +- .../idea/completion/KeywordCompletion.kt | 70 +- .../kotlin/idea/completion/KeywordValues.kt | 6 +- .../completion/KotlinCompletionCharFilter.kt | 14 +- .../completion/KotlinCompletionContributor.kt | 104 +- .../idea/completion/LookupElementFactory.kt | 6 +- .../completion/NamedArgumentCompletion.kt | 20 +- .../idea/completion/OverridesCompletion.kt | 16 +- .../completion/PackageDirectiveCompletion.kt | 12 +- .../ParameterNameAndTypeCompletion.kt | 16 +- .../idea/completion/PropertyKeyCompletion.kt | 4 +- .../idea/completion/SmartCastCalculator.kt | 24 +- .../kotlin/idea/completion/Statisticians.kt | 4 +- .../completion/ToFromOriginalFileMapper.kt | 16 +- .../UnfocusedPossibleFunctionParameter.java | 14 +- .../handlers/CastReceiverInsertHandler.kt | 12 +- .../completion/handlers/GenerateLambda.kt | 20 +- .../handlers/KotlinCallableInsertHandler.kt | 4 +- .../handlers/KotlinClassifierInsertHandler.kt | 8 +- .../handlers/KotlinFunctionInsertHandler.kt | 12 +- .../handlers/KotlinKeywordInsertHandler.kt | 2 +- .../WithExpressionPrefixInsertHandler.kt | 16 +- .../completion/smart/ClassLiteralItems.kt | 4 +- .../smart/MultipleArgumentsItemProvider.kt | 12 +- .../idea/completion/smart/SmartCompletion.kt | 56 +- .../smart/SmartCompletionSession.kt | 4 +- .../idea/completion/smart/StaticMembers.kt | 6 +- .../smart/TypeInstantiationItems.kt | 14 +- .../smart/TypesWithContainsDetector.kt | 10 +- .../kotlin/idea/core/CommentSaver.kt | 24 +- .../idea/core/ImportableFqNameClassifier.kt | 4 +- .../idea/core/IterableTypesDetection.kt | 26 +- .../kotlin/idea/core/KotlinIndicesHelper.kt | 26 +- .../kotlin/idea/core/KotlinNameSuggester.kt | 36 +- .../kotlin/idea/core/NameValidators.kt | 18 +- .../idea/core/OptionalParametersHelper.kt | 30 +- .../org/jetbrains/kotlin/idea/core/Utils.kt | 30 +- .../kotlin/idea/core/descriptorUtils.kt | 18 +- .../OverrideImplementMembersHandler.kt | 14 +- .../OverrideMemberChooserObject.kt | 14 +- .../kotlin/idea/core/packageUtils.kt | 4 +- .../kotlin/idea/core/psiClassToDescriptor.kt | 4 +- .../kotlin/idea/core/psiModificationUtils.kt | 48 +- .../idea/core/quickfix/QuickFixUtil.java | 54 +- .../util/DescriptorMemberChooserObject.kt | 20 +- .../kotlin/console/KotlinConsoleRunner.kt | 4 +- .../kotlin/console/gutter/ReplIcons.kt | 4 +- .../kotlin/idea/test/AstAccessControl.kt | 4 +- .../idea/test/DirectiveBasedActionUtils.kt | 4 +- .../jetbrains/kotlin/idea/test/testUtils.kt | 4 +- .../KotlinAndroidGotoDeclarationHandler.java | 4 +- .../android/navigation/gotoResourceHelper.kt | 28 +- idea/src/META-INF/plugin.xml | 18 +- .../jetbrains/kotlin/idea/JetCommenter.java | 8 +- .../jetbrains/kotlin/idea/JetFileFactory.java | 2 +- .../jetbrains/kotlin/idea/JetPairMatcher.java | 28 +- .../kotlin/idea/KotlinFoldingBuilder.kt | 34 +- .../idea/KotlinQuickDocumentationProvider.kt | 14 +- .../kotlin/idea/PluginStartupComponent.java | 2 +- .../kotlin/idea/actions/JavaToKotlinAction.kt | 6 +- .../idea/actions/KotlinAddImportAction.kt | 12 +- .../actions/KotlinQualifiedNameProvider.kt | 14 +- .../idea/actions/NewKotlinFileAction.java | 16 +- .../idea/actions/ShowExpressionTypeAction.kt | 20 +- .../idea/actions/ShowKotlinBytecodeAction.kt | 8 +- .../generate/KotlinGenerateActionBase.kt | 12 +- .../KotlinGenerateEqualsAndHashcodeAction.kt | 40 +- .../generate/KotlinGenerateEqualsWizard.kt | 22 +- .../KotlinGenerateMemberActionBase.kt | 10 +- ...otlinGenerateSecondaryConstructorAction.kt | 42 +- .../KotlinGenerateTestSupportActionBase.kt | 34 +- .../internal/CheckPartialBodyResolveAction.kt | 40 +- .../internal/CopyAsDiagnosticTestAction.java | 6 +- .../internal/FindImplicitNothingAction.kt | 26 +- .../idea/caches/JetGotoClassContributor.java | 16 +- .../idea/codeInsight/CodeInsightUtils.java | 54 +- .../codeInsight/GotoSuperActionHandler.java | 18 +- .../JetFunctionPsiElementCellRenderer.java | 6 +- .../JetTypeDeclarationProvider.java | 12 +- .../KotlinCopyPasteReferenceProcessor.kt | 46 +- .../KotlinExpressionTypeProvider.kt | 18 +- .../KotlinSpellcheckingStrategy.kt | 6 +- .../surroundWith/KotlinSurrounderUtils.java | 4 +- .../MoveDeclarationsOutHelper.java | 44 +- .../KotlinExpressionSurroundDescriptor.java | 4 +- .../KotlinExpressionSurrounder.java | 22 +- .../expression/KotlinNotSurrounder.java | 24 +- .../KotlinParenthesesSurrounder.java | 18 +- .../KotlinRuntimeTypeCastSurrounder.kt | 24 +- .../KotlinStringTemplateSurrounder.java | 18 +- .../expression/KotlinWhenSurrounder.java | 22 +- .../KotlinFunctionLiteralSurrounder.java | 12 +- .../statement/KotlinIfSurrounderBase.java | 16 +- .../KotlinTryCatchFinallySurrounder.java | 4 +- .../statement/KotlinTryCatchSurrounder.java | 4 +- .../statement/KotlinTryFinallySurrounder.java | 12 +- .../statement/KotlinTrySurrounderBase.java | 14 +- .../unwrap/KotlinComponentUnwrapper.java | 20 +- .../unwrap/KotlinLambdaUnwrapper.java | 30 +- .../unwrap/KotlinUnwrapRemoveBase.java | 30 +- .../codeInsight/unwrap/KotlinUnwrappers.java | 52 +- .../upDownMover/AbstractJetUpDownMover.java | 14 +- .../upDownMover/JetDeclarationMover.java | 88 +- .../upDownMover/JetExpressionMover.java | 144 +-- .../idea/compiler/JetCompilerManager.java | 4 +- .../ConfigureKotlinInProjectUtils.java | 6 +- .../KotlinSetupSDKNotificationProvider.kt | 4 +- .../copy/ConvertJavaCopyPastePostProcessor.kt | 10 +- .../idea/coverage/KotlinCoverageExtension.kt | 20 +- .../DiagnosticSuppressorForDebugger.kt | 4 +- .../idea/debugger/JetPositionManager.kt | 84 +- .../idea/debugger/KotlinEditorTextProvider.kt | 36 +- .../KotlinFrameExtraVariablesProvider.kt | 38 +- .../KotlinSourcePositionHighlighter.kt | 4 +- .../debugger/KotlinSourcePositionProvider.kt | 10 +- .../breakpoints/KotlinFieldBreakpoint.kt | 26 +- .../breakpoints/KotlinFieldBreakpointType.kt | 8 +- .../breakpoints/KotlinLineBreakpointType.java | 4 +- .../breakpoints/breakpointTypeUtils.kt | 8 +- .../dialog/AddFieldBreakpointDialog.java | 4 +- .../dialog/fieldBreakpointDialogUtil.kt | 6 +- .../evaluate/KotlinCodeFragmentFactory.kt | 50 +- .../evaluate/KotlinEvaluateExpressionCache.kt | 12 +- .../evaluate/KotlinEvaluationBuilder.kt | 58 +- .../evaluate/KotlinRuntimeTypeEvaluator.kt | 20 +- .../extractFunctionForDebuggerUtil.kt | 76 +- .../stepping/DebuggerSteppingHelper.java | 16 +- .../stepping/KotlinBasicStepMethodFilter.kt | 14 +- .../stepping/KotlinLambdaMethodFilter.kt | 6 +- .../KotlinLambdaSmartStepIntoTarget.kt | 12 +- .../KotlinMethodSmartStepIntoTarget.kt | 12 +- .../stepping/KotlinSmartStepIntoHandler.kt | 42 +- .../stepping/KotlinSteppingCommandProvider.kt | 72 +- .../idea/editor/JetLtGtTypingUtils.java | 16 +- .../idea/editor/KotlinBackspaceHandler.java | 4 +- .../kotlin/idea/editor/KotlinEnterHandler.kt | 18 +- .../kotlin/idea/editor/KotlinQuoteHandler.kt | 20 +- .../idea/editor/KotlinSmartEnterHandler.kt | 52 +- .../idea/editor/KotlinTypedHandler.java | 26 +- .../idea/editor/fixers/KotlinDoWhileFixer.kt | 8 +- .../editor/fixers/KotlinForConditionFixer.kt | 14 +- .../KotlinFunctionDeclarationBodyFixer.kt | 18 +- .../fixers/KotlinFunctionParametersFixer.kt | 4 +- .../editor/fixers/KotlinIfConditionFixer.kt | 14 +- .../KotlinMissingForOrWhileBodyFixer.kt | 16 +- .../fixers/KotlinMissingIfBranchFixer.kt | 10 +- .../fixers/KotlinMissingWhenBodyFixer.kt | 6 +- .../fixers/KotlinWhenSubjectCaretFixer.kt | 4 +- .../fixers/KotlinWhileConditionFixer.kt | 14 +- .../KotlinCodeBlockSelectioner.kt | 12 +- .../KotlinDeclarationSelectioner.kt | 10 +- .../wordSelection/KotlinListSelectioner.kt | 18 +- .../KotlinStatementGroupSelectioner.kt | 10 +- .../KotlinStringLiteralSelectioner.kt | 6 +- .../KotlinWordSelectionFilter.kt | 8 +- .../idea/filters/JetExceptionFilter.java | 4 +- .../findUsages/BuiltInsUseScopeEnlarger.kt | 4 +- .../JetElementDescriptionProvider.kt | 22 +- .../idea/findUsages/JetImportFilteringRule.kt | 4 +- .../KotlinDeclarationGroupRuleProvider.kt | 8 +- .../KotlinFindUsagesHandlerFactory.kt | 28 +- .../dialogs/KotlinFindClassUsagesDialog.java | 20 +- .../KotlinFindPropertyUsagesDialog.java | 12 +- .../KotlinTypeParameterFindUsagesDialog.java | 6 +- .../kotlin/idea/findUsages/dialogs/Utils.java | 4 +- .../DelegatingFindMemberUsagesHandler.kt | 6 +- .../handlers/KotlinFindClassUsagesHandler.kt | 26 +- .../handlers/KotlinFindMemberUsagesHandler.kt | 20 +- .../KotlinTypeParameterFindUsagesHandler.kt | 8 +- .../kotlin/idea/formatter/JetBlock.java | 14 +- .../idea/formatter/KotlinSpacingBuilder.kt | 8 +- .../idea/formatter/kotlinSpacingRules.kt | 8 +- .../idea/framework/JSFrameworkType.java | 4 +- .../JSLibraryStdPresentationProvider.java | 4 +- .../idea/framework/JavaFrameworkType.java | 4 +- .../JavaRuntimePresentationProvider.java | 4 +- .../idea/framework/KotlinModuleBuilder.kt | 6 +- .../idea/framework/KotlinTemplatesFactory.kt | 4 +- .../kotlin/idea/hierarchy/HierarchyUtils.java | 12 +- .../KotlinTypeHierarchyProvider.java | 26 +- .../calls/CalleeReferenceVisitorBase.java | 20 +- .../KotlinCallHierarchyNodeDescriptor.java | 28 +- .../calls/KotlinCallHierarchyProvider.java | 4 +- .../calls/KotlinCallTreeStructure.java | 24 +- .../KotlinCalleeMethodsTreeStructure.java | 44 +- .../KotlinCallerMethodsTreeStructure.java | 40 +- .../KotlinOverrideHierarchyBrowser.kt | 4 +- .../KotlinOverrideHierarchyProvider.kt | 6 +- ...orDuringFileAnalyzeNotificationProvider.kt | 10 +- .../JetPsiCheckerAndHighlightingUpdater.java | 18 +- .../highlighter/KotlinColorSettingsPage.kt | 4 +- ...KotlinHighlightExitPointsHandlerFactory.kt | 32 +- .../KotlinRecursiveCallLineMarkerProvider.kt | 40 +- .../KotlinRunLineMarkerContributor.kt | 8 +- .../KotlinTestRunLineMarkerContributor.kt | 12 +- .../idea/highlighter/markers/JavaPsiUtils.kt | 14 +- .../markers/KotlinLineMarkerProvider.kt | 34 +- .../markers/OverridenPropertyMarker.kt | 16 +- .../markers/SuperDeclarationMarker.kt | 14 +- .../idea/imports/KotlinImportOptimizer.kt | 40 +- .../idea/inspections/AddModifierFixFactory.kt | 8 +- .../idea/inspections/AddReflectionQuickFix.kt | 8 +- .../ConflictingExtensionPropertyInspection.kt | 58 +- .../DeprecatedObjectInstanceFieldReference.kt | 4 +- .../DeprecatedUsageOfStaticField.kt | 40 +- .../inspections/EqualsOrHashCodeInspection.kt | 16 +- .../inspections/KotlinCleanupInspection.kt | 20 +- ...KotlinInvalidBundleOrPropertyInspection.kt | 14 +- .../RedundantSamConstructorInspection.kt | 32 +- .../inspections/UnusedImportInspection.kt | 14 +- .../UnusedReceiverParameterInspection.kt | 22 +- .../inspections/UnusedSymbolInspection.kt | 78 +- .../idea/intentions/AddBracesIntention.kt | 24 +- .../intentions/AddForLoopIndicesIntention.kt | 18 +- .../intentions/AddNameToArgumentIntention.kt | 20 +- .../AddOperatorModifierIntention.kt | 14 +- .../ChangeVisibilityModifierIntention.kt | 70 +- .../ConvertAssertToIfWithThrowIntention.kt | 30 +- .../ConvertForEachToForLoopIntention.kt | 28 +- .../ConvertFunctionToPropertyIntention.kt | 32 +- .../ConvertIfWithThrowToAssertIntention.kt | 22 +- .../ConvertNegatedBooleanSequenceIntention.kt | 38 +- ...atedExpressionWithDemorgansLawIntention.kt | 38 +- .../ConvertParameterToReceiverIntention.kt | 14 +- .../ConvertPropertyToFunctionIntention.kt | 36 +- .../ConvertReceiverToParameterIntention.kt | 14 +- .../intentions/ConvertToBlockBodyIntention.kt | 28 +- .../ConvertToConcatenatedStringIntention.kt | 28 +- .../ConvertToExpressionBodyIntention.kt | 38 +- .../ConvertToForEachFunctionCallIntention.kt | 16 +- .../ConvertToStringTemplateIntention.kt | 42 +- ...precatedCallableAddReplaceWithIntention.kt | 52 +- .../idea/intentions/IfNullToElvisIntention.kt | 38 +- .../InfixCallToOrdinaryIntention.kt | 20 +- .../InsertCurlyBracesToTemplateIntention.kt | 12 +- .../InsertExplicitTypeArgumentsIntention.kt | 20 +- .../IntroduceBackingPropertyIntention.kt | 58 +- .../intentions/InvertIfConditionIntention.kt | 60 +- .../intentions/IterateExpressionIntention.kt | 18 +- .../MoveAssignmentToInitializerIntention.kt | 30 +- .../MoveLambdaInsideParenthesesIntention.kt | 8 +- .../MoveLambdaOutsideParenthesesIntention.kt | 14 +- .../ReconstructTypeInCastOrIsIntention.kt | 18 +- .../intentions/RemoveArgumentNameIntention.kt | 20 +- .../idea/intentions/RemoveBracesIntention.kt | 20 +- .../RemoveCurlyBracesFromTemplateIntention.kt | 24 +- ...veExplicitLambdaParameterTypesIntention.kt | 14 +- .../RemoveExplicitSuperQualifierIntention.kt | 22 +- .../RemoveExplicitTypeArgumentsIntention.kt | 28 +- .../intentions/RemoveExplicitTypeIntention.kt | 16 +- .../RemoveForLoopIndicesIntention.kt | 20 +- .../RemoveUnnecessaryParenthesesIntention.kt | 12 +- ...icitFunctionLiteralParamWithItIntention.kt | 14 +- ...thExplicitFunctionLiteralParamIntention.kt | 12 +- .../ReplaceWithOperatorAssignmentIntention.kt | 50 +- .../ReplaceWithOrdinaryAssignmentIntention.kt | 20 +- .../SimplifyBooleanWithConstantsIntention.kt | 50 +- ...implifyNegatedBinaryExpressionIntention.kt | 58 +- ...SpecifyExplicitLambdaSignatureIntention.kt | 12 +- .../SpecifyTypeExplicitlyIntention.kt | 38 +- .../idea/intentions/SplitIfIntention.kt | 50 +- .../SwapBinaryExpressionIntention.kt | 28 +- .../idea/intentions/ToInfixCallIntention.kt | 14 +- .../UsePropertyAccessSyntaxIntention.kt | 44 +- .../jetbrains/kotlin/idea/intentions/Utils.kt | 102 +- .../BranchedFoldingUtils.kt | 22 +- .../BranchedUnfoldingUtils.kt | 12 +- .../branchedTransformations/IfThenUtils.kt | 64 +- .../branchedTransformationUtils.kt | 48 +- .../intentions/DoubleBangToIfThenIntention.kt | 24 +- .../EliminateWhenSubjectIntention.kt | 16 +- .../intentions/ElvisToIfThenIntention.kt | 18 +- .../intentions/FlattenWhenIntention.kt | 20 +- .../intentions/FoldIfToAssignmentIntention.kt | 12 +- .../FoldIfToReturnAsymmetricallyIntention.kt | 12 +- .../intentions/FoldIfToReturnIntention.kt | 12 +- .../FoldWhenToAssignmentIntention.kt | 16 +- .../intentions/FoldWhenToReturnIntention.kt | 12 +- .../intentions/IfThenToDoubleBangIntention.kt | 26 +- .../intentions/IfThenToElvisIntention.kt | 38 +- .../intentions/IfThenToSafeAccessIntention.kt | 32 +- .../intentions/IfToWhenIntention.kt | 22 +- .../IntroduceWhenSubjectIntention.kt | 10 +- .../intentions/MergeWhenIntention.kt | 26 +- .../intentions/SafeAccessToIfThenIntention.kt | 12 +- .../UnfoldAssignmentToIfIntention.kt | 16 +- .../UnfoldAssignmentToWhenIntention.kt | 20 +- .../intentions/UnfoldPropertyToIfIntention.kt | 12 +- .../UnfoldPropertyToWhenIntention.kt | 16 +- .../intentions/UnfoldReturnToIfIntention.kt | 18 +- .../intentions/UnfoldReturnToWhenIntention.kt | 14 +- .../intentions/WhenToIfIntention.kt | 10 +- .../ReplaceCallWithBinaryOperatorIntention.kt | 12 +- .../ReplaceCallWithUnaryOperatorIntention.kt | 12 +- .../ReplaceContainsIntention.kt | 22 +- .../ReplaceGetIntention.kt | 18 +- .../ReplaceInvokeIntention.kt | 12 +- .../ConvertMemberToExtensionIntention.kt | 54 +- .../SplitPropertyDeclarationIntention.kt | 8 +- .../internal/KotlinBytecodeToolWindow.java | 24 +- .../kotlin/idea/internal/Location.java | 8 +- .../idea/j2k/IdeaResolverForConverter.kt | 4 +- .../kotlin/idea/j2k/J2kPostProcessings.kt | 62 +- .../kotlin/idea/j2k/J2kPostProcessor.kt | 18 +- .../JoinBlockIntoSingleStatementHandler.kt | 16 +- .../JoinDeclarationAndAssignmentHandler.kt | 26 +- .../k2jsrun/K2JSRunConfigurationType.java | 4 +- .../kotlin/idea/kdoc/KDocTypedHandler.kt | 10 +- .../liveTemplates/JetTemplateContextType.java | 32 +- .../KotlinShortenFQNamesProcessor.kt | 4 +- .../AnonymousTemplateEditingListener.java | 8 +- .../macro/BaseJetVariableMacro.java | 32 +- .../macro/JetAnonymousSuperMacro.java | 14 +- .../macro/JetFunctionParametersMacro.java | 8 +- .../KotlinFunctionParameterInfoHandler.kt | 40 +- .../idea/presentation/JetClassPresenter.java | 6 +- ...etDefaultNamedDeclarationPresentation.java | 10 +- .../presentation/JetFunctionPresenter.java | 18 +- .../idea/presentation/JetObjectPresenter.java | 6 +- .../presentation/JetParameterPresenter.java | 6 +- .../presentation/JetPropertyPresenter.java | 6 +- .../idea/project/PluginJetFilesProvider.java | 6 +- .../projectView/JetClassOrObjectTreeNode.java | 14 +- .../projectView/JetDeclarationTreeNode.java | 32 +- .../idea/projectView/JetFileTreeNode.java | 18 +- .../projectView/JetProjectViewProvider.java | 34 +- .../idea/projectView/JetProjectViewUtil.java | 15 +- .../KotlinProblemFileHighlightFilter.kt | 4 +- .../KotlinPropertiesReferenceContributor.kt | 8 +- .../idea/properties/referenceProviders.kt | 28 +- .../idea/quickfix/AddConstModifierFix.kt | 30 +- .../idea/quickfix/AddFunctionBodyFix.java | 20 +- .../idea/quickfix/AddFunctionParametersFix.kt | 18 +- .../quickfix/AddFunctionToSupertypeFix.kt | 38 +- .../idea/quickfix/AddGenericUpperBoundFix.kt | 22 +- .../kotlin/idea/quickfix/AddLoopLabelFix.kt | 24 +- .../kotlin/idea/quickfix/AddModifierFix.java | 44 +- .../idea/quickfix/AddNameToArgumentFix.kt | 26 +- .../AddOpenModifierToClassDeclarationFix.java | 24 +- ...ddOverrideToEqualsHashCodeToStringFix.java | 20 +- .../idea/quickfix/AddStarProjectionsFix.java | 32 +- .../AddTypeToLHSOfCallableReferenceFix.kt | 16 +- .../idea/quickfix/AddWhenElseBranchFix.java | 14 +- .../kotlin/idea/quickfix/AutoImportFix.kt | 22 +- .../idea/quickfix/CastExpressionFix.java | 44 +- .../idea/quickfix/ChangeAccessorTypeFix.java | 28 +- .../ChangeFunctionLiteralReturnTypeFix.java | 51 +- .../ChangeFunctionLiteralSignatureFix.kt | 22 +- .../quickfix/ChangeFunctionReturnTypeFix.java | 57 +- .../quickfix/ChangeFunctionSignatureFix.kt | 22 +- .../ChangeMemberFunctionSignatureFix.kt | 28 +- .../idea/quickfix/ChangeParameterTypeFix.java | 16 +- .../ChangePrivateTopLevelToInternalFix.kt | 14 +- .../ChangeToFunctionInvocationFix.java | 22 +- .../quickfix/ChangeToPropertyNameFix.java | 20 +- .../quickfix/ChangeToStarProjectionFix.java | 20 +- .../kotlin/idea/quickfix/ChangeTypeFix.java | 24 +- .../quickfix/ChangeVariableMutabilityFix.kt | 22 +- .../idea/quickfix/ChangeVariableTypeFix.java | 62 +- .../quickfix/ChangeVisibilityModifierFix.java | 30 +- .../DeprecatedFunctionConventionFix.kt | 16 +- .../kotlin/idea/quickfix/ExclExlCallFixes.kt | 26 +- .../quickfix/InsertDelegationCallQuickfix.kt | 20 +- .../quickfix/JetWholeProjectModalAction.kt | 32 +- .../KotlinAddOrderEntryActionFactory.kt | 10 +- ...otlinIntentionActionFactoryWithDelegate.kt | 6 +- .../idea/quickfix/KotlinQuickFixAction.kt | 10 +- .../idea/quickfix/KotlinReferenceImporter.kt | 16 +- .../MakeClassAnAnnotationClassFix.java | 30 +- .../quickfix/MakeOverriddenMemberOpenFix.kt | 20 +- .../quickfix/MapPlatformClassToKotlinFix.kt | 38 +- .../quickfix/MigrateBackingFieldSyntaxFix.kt | 26 +- .../quickfix/MissingConstructorKeywordFix.kt | 10 +- .../MoveTypeParameterConstraintFix.kt | 16 +- .../idea/quickfix/MoveWhenElseBranchFix.java | 20 +- .../QuickFixFactoryForTypeMismatchError.java | 66 +- .../kotlin/idea/quickfix/QuickFixRegistrar.kt | 16 +- .../idea/quickfix/RemoveFunctionBodyFix.java | 24 +- .../kotlin/idea/quickfix/RemoveModifierFix.kt | 50 +- .../RemoveNameFromFunctionExpressionFix.kt | 10 +- .../idea/quickfix/RemoveNullableFix.java | 18 +- .../quickfix/RemovePartsFromPropertyFix.java | 32 +- .../quickfix/RemovePsiElementSimpleFix.java | 18 +- .../RemoveRightPartOfBinaryExpressionFix.java | 32 +- .../idea/quickfix/RemoveSupertypeFix.java | 20 +- .../RemoveUnusedFunctionParameterFix.kt | 10 +- .../RemoveValVarFromParameterFix.java | 12 +- ...meParameterToMatchOverriddenMethodFix.java | 14 +- .../idea/quickfix/RenameUnderscoreFix.kt | 10 +- .../kotlin/idea/quickfix/ReplaceCallFix.kt | 14 +- .../idea/quickfix/ReplaceInfixCallFix.kt | 14 +- ...aceJavaAnnotationPositionedArgumentsFix.kt | 14 +- .../quickfix/ReplaceObsoleteLabelSyntaxFix.kt | 32 +- ...ReplaceOperationInBinaryExpressionFix.java | 12 +- .../idea/quickfix/SpecifyTypeExplicitlyFix.kt | 14 +- .../idea/quickfix/SuperClassNotInitialized.kt | 40 +- .../createFromUsage/CreateFromUsageFixBase.kt | 4 +- .../callableBuilder/CallableBuilder.kt | 192 +-- .../callableBuilder/CallableInfo.kt | 44 +- .../callableBuilder/generationUtils.kt | 12 +- .../callableBuilder/templateExpressions.kt | 14 +- .../callableBuilder/typeUtils.kt | 84 +- .../CreateBinaryOperationActionFactory.kt | 20 +- .../CreateCallableFromCallActionFactory.kt | 58 +- .../CreateCallableFromUsageFix.kt | 20 +- .../CreateCallableMemberFromUsageFactory.kt | 4 +- .../CreateComponentFunctionActionFactory.kt | 14 +- ...structorFromDelegationCallActionFactory.kt | 16 +- ...orFromDelegatorToSuperCallActionFactory.kt | 14 +- .../CreateGetFunctionActionFactory.kt | 10 +- .../CreateHasNextFunctionActionFactory.kt | 10 +- .../CreateInvokeFunctionActionFactory.kt | 10 +- .../CreateIteratorFunctionActionFactory.kt | 22 +- .../CreateNextFunctionActionFactory.kt | 14 +- ...ePropertyDelegateAccessorsActionFactory.kt | 14 +- .../CreateSetFunctionActionFactory.kt | 22 +- .../CreateUnaryOperationActionFactory.kt | 14 +- ...mCallWithConstructorCalleeActionFactory.kt | 26 +- ...teClassFromConstructorCallActionFactory.kt | 28 +- ...assFromReferenceExpressionActionFactory.kt | 36 +- ...eateClassFromTypeReferenceActionFactory.kt | 28 +- .../CreateClassFromUsageFactory.kt | 4 +- .../createClass/CreateClassFromUsageFix.kt | 18 +- .../createClass/createClassUtils.kt | 16 +- .../CreateLocalVariableActionFactory.kt | 22 +- ...teParameterByNamedArgumentActionFactory.kt | 14 +- .../CreateParameterByRefActionFactory.kt | 50 +- .../CreateParameterFromUsageFactory.kt | 6 +- .../CreateParameterFromUsageFix.kt | 8 +- .../migration/MigrateTypeParameterListFix.kt | 16 +- .../quickfix/quickfixUtil/quickfixUtil.kt | 8 +- .../quickfix/replaceWith/CallKindHandler.kt | 24 +- .../CallableUsageReplacementStrategy.kt | 208 ++-- .../ClassUsageReplacementStrategy.kt | 14 +- .../replaceWith/DeprecatedSymbolUsageFix.kt | 8 +- .../DeprecatedSymbolUsageFixBase.kt | 18 +- .../DeprecatedSymbolUsageInWholeProjectFix.kt | 20 +- .../ReplaceWithAnnotationAnalyzer.kt | 36 +- .../replaceWith/UsageReplacementStrategy.kt | 8 +- .../AbstractPullPushMembersHandler.kt | 16 +- .../idea/refactoring/CallableRefactoring.kt | 16 +- .../idea/refactoring/JetRefactoringUtil.java | 82 +- .../idea/refactoring/KotlinNamesValidator.kt | 6 +- .../KotlinRefactoringSupportProvider.kt | 16 +- .../changeSignature/JetChangeInfo.kt | 24 +- .../changeSignature/JetChangeSignature.kt | 16 +- .../changeSignature/JetChangeSignatureData.kt | 20 +- .../JetChangeSignatureHandler.kt | 44 +- .../JetChangeSignatureUsageProcessor.java | 248 ++-- .../changeSignature/JetParameterInfo.kt | 28 +- .../refactoring/changeSignature/JetValVar.kt | 16 +- .../KotlinAwareJavaParameterInfoImpl.kt | 4 +- .../changeSignature/changeSignatureUtils.kt | 22 +- .../ui/JetCallableParameterTableModel.java | 10 +- .../ui/JetChangePropertySignatureDialog.kt | 28 +- .../ui/JetChangeSignatureDialog.kt | 16 +- .../ui/JetFunctionParameterTableModel.java | 6 +- ...PrimaryConstructorParameterTableModel.java | 6 +- ...condaryConstructorParameterTableModel.java | 6 +- .../changeSignature/ui/KotlinCallerChooser.kt | 14 +- .../usages/JavaMethodDeferredKotlinUsage.kt | 34 +- .../JavaMethodKotlinUsageWithDelegate.kt | 8 +- .../usages/JetCallableDefinitionUsage.java | 108 +- .../JetConstructorDelegationCallUsage.kt | 18 +- .../JetEnumEntryWithoutSuperCallUsage.kt | 8 +- .../usages/JetFunctionCallUsage.java | 188 +-- .../usages/JetImplicitThisToParameterUsage.kt | 26 +- .../usages/JetParameterUsage.kt | 34 +- .../usages/JetPropertyCallUsage.kt | 18 +- .../usages/KotlinCallerUsages.kt | 16 +- .../refactoring/copy/CopyKotlinFileHandler.kt | 4 +- .../inline/KotlinInlineValHandler.java | 118 +- .../introduce/AbstractIntroduceAction.kt | 2 +- .../AbstractKotlinInplaceIntroducer.kt | 24 +- .../ExtractKotlinFunctionHandler.kt | 12 +- .../ui/KotlinExtractFunctionDialog.java | 14 +- .../ui/KotlinFunctionSignatureComponent.kt | 6 +- .../ui/KotlinParameterTablePanel.java | 14 +- .../ExtractableCodeDescriptor.kt | 118 +- .../extractionEngine/ExtractionData.kt | 56 +- .../extractableAnalysisUtil.kt | 218 ++-- .../extractionEngine/extractorUtil.kt | 116 +- .../KotlinInplaceParameterIntroducer.kt | 28 +- .../KotlinIntroduceParameterDialog.kt | 26 +- .../KotlinIntroduceParameterHandler.kt | 86 +- ...nIntroduceParameterMethodUsageProcessor.kt | 22 +- .../KotlinInplacePropertyIntroducer.kt | 26 +- .../KotlinIntroducePropertyHandler.kt | 10 +- .../refactoring/introduce/introduceUtil.kt | 10 +- .../KotlinInplaceVariableIntroducer.java | 36 +- .../KotlinIntroduceVariableHandler.java | 238 ++-- .../KotlinVariableInplaceIntroducer.kt | 30 +- .../idea/refactoring/jetRefactoringUtil.kt | 112 +- .../memberInfo/KotlinMemberInfo.kt | 10 +- .../memberInfo/KotlinMemberInfoStorage.kt | 22 +- .../memberInfo/KotlinMemberSelectionPanel.kt | 4 +- .../memberInfo/KotlinMemberSelectionTable.kt | 22 +- .../refactoring/memberInfo/memberInfoUtils.kt | 14 +- .../MoveJavaInnerClassKotlinUsagesHandler.kt | 22 +- .../changePackage/ChangePackageIntention.kt | 8 +- .../ChangePackageToMatchDirectoryIntention.kt | 8 +- .../KotlinChangePackageRefactoring.kt | 8 +- ...FileToPackageMatchingDirectoryIntention.kt | 8 +- .../PackageDirectoryMismatchInspection.kt | 4 +- .../KotlinMoveDirectoryWithClassesHelper.kt | 6 +- .../KotlinMoveFilesOrDirectoriesHandler.kt | 6 +- .../MoveKotlinFileHandler.kt | 22 +- .../KotlinMoveTarget.kt | 10 +- .../MoveDeclarationToSeparateFileIntention.kt | 28 +- .../MoveKotlinTopLevelDeclarationsHandler.kt | 14 +- ...MoveKotlinTopLevelDeclarationsProcessor.kt | 36 +- ...lesOrDirectoriesDialogWithKotlinOptions.kt | 4 +- .../MoveKotlinTopLevelDeclarationsDialog.java | 110 +- .../kotlin/idea/refactoring/move/moveUtils.kt | 46 +- .../JavaToKotlinPostconversionPullUpHelper.kt | 6 +- .../JavaToKotlinPreconversionPullUpHelper.kt | 22 +- .../refactoring/pullUp/KotlinPullUpData.kt | 8 +- .../refactoring/pullUp/KotlinPullUpDialog.kt | 16 +- .../pullUp/KotlinPullUpDialogBase.java | 10 +- .../refactoring/pullUp/KotlinPullUpHandler.kt | 20 +- .../refactoring/pullUp/KotlinPullUpHelper.kt | 218 ++-- .../pullUp/KotlinPullUpHelperFactory.kt | 16 +- .../idea/refactoring/pullUp/markingUtils.kt | 46 +- .../pullUp/pullUpConflictsUtils.kt | 28 +- .../idea/refactoring/pullUp/pullUpUtils.kt | 66 +- .../pushDown/KotlinPushDownDialog.kt | 16 +- .../pushDown/KotlinPushDownHandler.kt | 16 +- .../pushDown/KotlinPushDownProcessor.kt | 44 +- .../pushDown/pushDownConflictsUtils.kt | 58 +- .../rename/AutomaticInheritorRenamer.kt | 8 +- .../rename/AutomaticOverloadsRenamer.kt | 24 +- .../rename/AutomaticVariableRenamer.kt | 24 +- .../rename/RenameDynamicMemberHandler.kt | 4 +- .../rename/RenameKotlinClassProcessor.kt | 20 +- .../rename/RenameKotlinFileProcessor.kt | 10 +- .../rename/RenameKotlinFunctionProcessor.kt | 18 +- .../RenameKotlinImplicitLambdaParameter.kt | 4 +- .../rename/RenameKotlinParameterProcessor.kt | 8 +- .../rename/RenameKotlinPropertyProcessor.kt | 22 +- .../rename/RenameKotlinPsiProcessor.kt | 4 +- .../RenameOnSecondaryConstructorHandler.kt | 12 +- .../idea/refactoring/rename/renameUtil.kt | 8 +- .../KotlinJavaSafeDeleteDelegate.kt | 14 +- .../safeDelete/KotlinOverridingDialog.java | 14 +- .../KotlinSafeDeleteOverridingUsageInfo.kt | 4 +- .../safeDelete/KotlinSafeDeleteProcessor.kt | 70 +- .../SafeDeleteImportDirectiveUsageInfo.kt | 8 +- .../SafeDeleteTypeArgumentListUsageInfo.kt | 2 +- .../SafeDeleteValueArgumentListUsageInfo.kt | 10 +- .../idea/refactoring/safeDelete/utils.kt | 26 +- .../kotlin/idea/run/JetRunConfiguration.java | 31 +- .../idea/run/JetRunConfigurationType.java | 4 +- .../run/JetTestNgConfigurationProducer.java | 44 +- .../KotlinJUnitRunConfigurationProducer.kt | 28 +- .../run/KotlinRunConfigurationProducer.kt | 26 +- .../JetTargetElementEvaluator.kt | 8 +- .../KotlinAnnotatedElementsSearcher.kt | 16 +- ...tlinClassesWithAnnotatedMembersSearcher.kt | 10 +- .../KotlinDefinitionsSearcher.java | 32 +- ...KotlinOverridingMethodReferenceSearcher.kt | 10 +- ...inOverridingMethodsWithGenericsSearcher.kt | 6 +- ...otlinPropertyAccessorsReferenceSearcher.kt | 8 +- .../KotlinCreateTestIntention.kt | 22 +- .../idea/testIntegration/KotlinTestFinder.kt | 4 +- .../testIntegration/testIntegrationUtils.kt | 4 +- .../kotlin/idea/util/DebuggerUtils.java | 59 +- .../kotlin/idea/util/DialogWithEditor.kt | 4 +- .../idea/util/ImportInsertHelperImpl.kt | 40 +- .../util/psi/patternMatching/JetPsiRange.kt | 8 +- .../util/psi/patternMatching/JetPsiUnifier.kt | 288 ++--- ...edAbiVersionNotificationPanelProvider.java | 4 +- .../companionObject/inContainingClass.0.kt | 2 +- .../kotlin/companionObject/javaUsage.0.kt | 2 +- .../kotlin/companionObject/named.0.kt | 2 +- .../kotlin/companionObject/simple.0.kt | 2 +- .../kotlin/conventions/compareTo.0.kt | 2 +- .../conventions/componentFunctions.0.kt | 2 +- .../conventions/componentFunctionsByRef.0.kt | 2 +- .../kotlin/conventions/contains.0.kt | 2 +- .../findUsages/kotlin/conventions/equals.0.kt | 2 +- .../kotlin/conventions/forIteration.0.kt | 2 +- .../findUsages/kotlin/conventions/get.0.kt | 2 +- .../conventions/getAsPropertyDelegate.0.kt | 2 +- .../kotlin/conventions/identityEquals.0.kt | 2 +- .../findUsages/kotlin/conventions/inc.0.kt | 2 +- .../findUsages/kotlin/conventions/invoke.0.kt | 2 +- .../findUsages/kotlin/conventions/plus.0.kt | 2 +- .../kotlin/conventions/plusAssign.0.kt | 2 +- .../propertyDelegatedFunction.0.kt | 2 +- .../findUsages/kotlin/conventions/set.0.kt | 2 +- .../conventions/setAsPropertyDelegate.0.kt | 2 +- .../kotlin/conventions/unaryMinus.0.kt | 2 +- .../findClassUsages/classUsedInPlainText.0.kt | 2 +- .../findClassUsages/classUsedInTextAsRef.0.kt | 2 +- .../findClassUsages/javaClassAllUsages.0.kt | 2 +- .../javaClassConstructorUsages.0.kt | 2 +- .../javaClassFunctionUsages1.0.kt | 2 +- .../javaClassFunctionUsages2.0.kt | 2 +- .../javaClassNonConstructorUsages.0.kt | 2 +- .../javaClassPropertyUsages1.0.kt | 2 +- .../javaClassPropertyUsages2.0.kt | 2 +- .../javaClassSecondaryCtrUsages.0.kt | 2 +- .../javaDerivedClassUsages1.0.kt | 2 +- .../javaDerivedClassUsages2.0.kt | 2 +- .../javaDerivedInterfaceUsages1.0.kt | 2 +- .../javaDerivedInterfaceUsages2.0.kt | 2 +- .../findClassUsages/kotlinClassAllUsages.0.kt | 2 +- .../kotlinClassAllUsages2.0.kt | 2 +- .../kotlinClassAllUsages3.0.kt | 2 +- .../kotlinClassAllUsagesNoImport.0.kt | 2 +- .../kotlinClassConstructorUsages.0.kt | 2 +- .../kotlinClassDerivedAnonymousObjects.0.kt | 2 +- .../kotlinClassDerivedAnonymousObjects.1.kt | 2 +- .../kotlinClassDerivedClasses.0.kt | 2 +- .../kotlinClassDerivedClasses.1.kt | 2 +- .../kotlinClassDerivedInnerClasses.0.kt | 2 +- .../kotlinClassDerivedInnerClasses.1.kt | 2 +- .../kotlinClassDerivedInnerObjects.0.kt | 2 +- .../kotlinClassDerivedInnerObjects.1.kt | 2 +- .../kotlinClassDerivedLocalClasses.0.kt | 2 +- .../kotlinClassDerivedLocalClasses.1.kt | 2 +- .../kotlinClassDerivedLocalObjects.0.kt | 2 +- .../kotlinClassDerivedLocalObjects.1.kt | 2 +- .../kotlinClassDerivedLocalTraits.0.kt | 2 +- .../kotlinClassDerivedLocalTraits.1.kt | 2 +- .../kotlinClassDerivedObjects.0.kt | 2 +- .../kotlinClassDerivedObjects.1.kt | 2 +- .../kotlinClassDerivedTraits.0.kt | 2 +- .../kotlinClassDerivedTraits.1.kt | 2 +- .../kotlinClassFunctionUsages1.0.kt | 2 +- .../kotlinClassFunctionUsages2.0.kt | 2 +- .../kotlinClassNonConstructorUsages.0.kt | 2 +- .../kotlinClassPropertyUsages1.0.kt | 2 +- .../kotlinClassPropertyUsages2.0.kt | 2 +- .../kotlinClassSecondaryCtorUsages.0.kt | 2 +- .../kotlinDeeplyNestedClassAllUsages.0.kt | 2 +- .../kotlinInnerClassAllUsages.0.kt | 2 +- ...tlinLocalClassDerivedAnonymousObjects.0.kt | 2 +- .../kotlinLocalClassDerivedLocalClasses.0.kt | 2 +- .../kotlinLocalClassDerivedLocalObjects.0.kt | 2 +- .../kotlinLocalClassDerivedLocalTraits.0.kt | 2 +- .../kotlinLocalClassUsages1.0.kt | 2 +- .../kotlinLocalClassUsages2.0.kt | 2 +- .../kotlinNestedClassAllUsages.0.kt | 2 +- .../kotlinPrivateClassUsages.0.kt | 2 +- .../kotlinTraitDerivedAnonymousObjects.0.kt | 2 +- .../kotlinTraitDerivedAnonymousObjects.1.kt | 2 +- .../kotlinTraitDerivedClasses.0.kt | 2 +- .../kotlinTraitDerivedClasses.1.kt | 2 +- .../kotlinTraitDerivedInnerClasses.0.kt | 2 +- .../kotlinTraitDerivedInnerClasses.1.kt | 2 +- .../kotlinTraitDerivedInnerObjects.0.kt | 2 +- .../kotlinTraitDerivedInnerObjects.1.kt | 2 +- .../kotlinTraitDerivedLocalClasses.0.kt | 2 +- .../kotlinTraitDerivedLocalClasses.1.kt | 2 +- .../kotlinTraitDerivedLocalObjects.0.kt | 2 +- .../kotlinTraitDerivedLocalObjects.1.kt | 2 +- .../kotlinTraitDerivedLocalTraits.0.kt | 2 +- .../kotlinTraitDerivedLocalTraits.1.kt | 2 +- .../kotlinTraitDerivedObjects.0.kt | 2 +- .../kotlinTraitDerivedObjects.1.kt | 2 +- .../kotlinTraitDerivedTraits.0.kt | 2 +- .../kotlinTraitDerivedTraits.1.kt | 2 +- .../localAndNonLocalClass.0.kt | 2 +- .../primaryConstructorWithDefaultParams.0.kt | 2 +- .../enumFunctionUsages.0.kt | 2 +- .../functionUsedInPlainText.0.kt | 2 +- .../javaAndKotlinOverrides.0.kt | 2 +- .../findFunctionUsages/javaMethodUsages.0.kt | 2 +- .../kotlinInternalMethodUsages.0.kt | 2 +- .../kotlinLocalMethodUsages1.0.kt | 2 +- .../kotlinLocalMethodUsages2.0.kt | 2 +- .../kotlinMethodUsages.0.kt | 2 +- .../kotlinMultiRefInImport.0.kt | 2 +- .../kotlinMultiRefInImport.1.kt | 2 +- .../kotlinNestedClassMethodUsages.0.kt | 2 +- .../kotlinOverloadAndExtensionUsages.0.kt | 2 +- .../kotlinOverloadAndExtensionUsages2.0.kt | 2 +- .../kotlinPrivateMethodUsages.0.kt | 2 +- .../kotlinTopLevelMethodUsages.0.kt | 2 +- .../kotlinTopLevelMethodUsagesMultifile.0.kt | 2 +- .../kotlinTopLevelMethodUsagesNoImport.0.kt | 2 +- ...inTopLevelMethodUsagesWithRenamedFile.0.kt | 2 +- .../kotlinTraitImplThroughDelegate.0.kt | 2 +- .../kotlinTraitNoImplThroughDelegate.0.kt | 2 +- .../findFunctionUsages/localClassMember.0.kt | 2 +- .../objectExpressionDeepMember.0.kt | 2 +- .../objectExpressionMember.0.kt | 2 +- .../objectExpressionMember2.0.kt | 2 +- .../objectExpressionMemberInClass.0.kt | 2 +- .../synthesizedFunction.0.kt | 2 +- .../usagesOfBaseForFunction.0.kt | 2 +- .../findObjectUsages/javaObjectUsages.0.kt | 2 +- .../kotlinLocalObjectUsages1.0.kt | 2 +- .../kotlinLocalObjectUsages2.0.kt | 2 +- .../kotlinNestedObjectUsages.0.kt | 2 +- .../findObjectUsages/kotlinObjectUsages.0.kt | 2 +- .../kotlinPrivateObjectUsages.0.kt | 2 +- ...otlinComponentFunctionParameterUsages.0.kt | 2 +- .../kotlinConstructorParameterUsages.0.kt | 2 +- .../kotlinFunctionParameterUsages.0.kt | 2 +- .../missingName.0.kt | 2 +- .../primaryConstructorByRef.0.kt | 2 +- .../primaryConstructorNoKeyword.0.kt | 2 +- .../primaryConstructorWithKeyword.0.kt | 2 +- .../javaAndKotlinOverrides.0.kt | 2 +- .../javaAndKotlinOverrides2.0.kt | 2 +- .../javaClassObjectPropertyUsages.0.kt | 2 +- .../javaPropertyReadUsages.0.kt | 2 +- .../javaPropertyReadUsages2.0.kt | 2 +- .../javaPropertyUsages.0.kt | 2 +- .../javaPropertyUsages2.0.kt | 2 +- .../javaPropertyWriteUsages.0.kt | 2 +- .../javaPropertyWriteUsages2.0.kt | 2 +- .../kotlinClassObjectPropertyUsage.0.kt | 2 +- .../kotlinLocalPropertyUsages1.0.kt | 2 +- .../kotlinLocalPropertyUsages2.0.kt | 2 +- .../kotlinMultiRefInImport.0.kt | 2 +- .../kotlinMultiRefInImport.1.kt | 2 +- .../kotlinNestedClassPropertyUsages.0.kt | 2 +- ...linPrivatePropertyInClassObjectUsages.0.kt | 2 +- .../kotlinPrivatePropertyUsages.0.kt | 2 +- .../kotlinPrivatePropertyUsages2.0.kt | 2 +- .../kotlinPropertyReadUsages.0.kt | 2 +- .../kotlinPropertyReadUsages2.0.kt | 2 +- .../kotlinPropertyUsages.0.kt | 2 +- .../kotlinPropertyUsages2.0.kt | 2 +- .../kotlinPropertyWriteUsages.0.kt | 2 +- .../kotlinPropertyWriteUsages2.0.kt | 2 +- .../kotlinTopLevelPropertyUsages.0.kt | 2 +- .../defaultSecondaryConstructor.0.kt | 2 +- .../secondaryConstructor.0.kt | 2 +- .../kotlinClassTypeParameterUsages.0.kt | 2 +- .../kotlinFunctionTypeParameterUsages.0.kt | 2 +- .../findWithFilteringImports.0.kt | 2 +- .../kotlinClassAllUsages.0.kt | 2 +- .../kotlinMethodUsages.0.kt | 2 +- .../kotlinPropertyUsages.0.kt | 2 +- .../unresolvedAnnotation.0.kt | 2 +- .../kotlin/variable/plusAssignFun.0.kt | 2 +- .../kotlin/variable/readAccess.0.kt | 2 +- .../kotlin/variable/writeAccess.0.kt | 2 +- .../kotlinLibrary/LibraryClassUsages.0.kt | 2 +- .../LibraryCompanionObjectUsages.0.kt | 2 +- .../kotlinLibrary/LibraryEnumEntryUsages.0.kt | 2 +- .../kotlinLibrary/LibraryFunctionUsages.0.kt | 2 +- .../LibraryFunctionUsages.1.java | 2 +- .../LibraryMemberFunctionUsages.0.kt | 2 +- .../LibraryMemberFunctionUsages.1.java | 2 +- ...ibraryNestedClassMemberFunctionUsages.0.kt | 2 +- ...raryNestedClassMemberFunctionUsages.1.java | 2 +- ...ryNestedClassPrimaryConstructorUsages.0.kt | 2 +- ...NestedClassSecondaryConstructorUsages.0.kt | 2 +- .../LibraryNestedClassUsages.0.kt | 2 +- .../kotlinLibrary/LibraryObjectUsages.0.kt | 2 +- .../LibraryPrimaryConstructorUsages.0.kt | 2 +- .../LibrarySecondaryConstructorUsages.0.kt | 2 +- .../jetbrains/kotlin/AbstractImportsTest.kt | 6 +- .../kotlin/DataFlowValueRenderingTest.kt | 8 +- .../kotlin/addImport/AbstractAddImportTest.kt | 4 +- .../asJava/KotlinLightClassInheritorTest.kt | 8 +- .../findUsages/AbstractJetFindUsagesTest.java | 8 +- .../KotlinFindUsagesWithLibraryCustomTest.kt | 4 +- .../kotlin/idea/AbstractCopyPasteTest.kt | 8 +- .../idea/AbstractExpressionSelectionTest.java | 8 +- .../idea/AbstractSmartSelectionTest.java | 10 +- .../kotlin/idea/ResolveElementCacheTest.kt | 46 +- .../kotlin/idea/actions/QualifiedNamesTest.kt | 8 +- .../AbstractInsertImportOnPasteTest.kt | 4 +- .../codeInsight/AbstractLineMarkersTest.java | 4 +- .../AbstractOverrideImplementTest.kt | 12 +- .../codeInsight/smartEnter/SmartEnterTest.kt | 4 +- .../AbstractKotlinCoverageOutputFilesTest.kt | 4 +- .../AbstractJetPositionManagerTest.java | 16 +- .../idea/debugger/KotlinDebuggerTestCase.java | 7 +- ...AbstractEditorForEvaluateExpressionTest.kt | 14 +- .../AbstractKotlinEvaluateExpressionTest.kt | 4 +- .../CodeFragmentCompletionInLibraryTest.kt | 12 +- .../AbstractNavigateToLibrarySourceTest.kt | 14 +- .../NavigateFromLibrarySourcesTest.kt | 10 +- .../NavigateToDecompiledLibraryTest.java | 30 +- .../NavigateToLibraryRegressionTest.java | 4 +- .../navigation/NavigateToStdlibSourceTest.kt | 4 +- .../stubBuilder/AbstractClsStubBuilderTest.kt | 4 +- .../stubBuilder/StubConsistencyBaseTest.kt | 8 +- .../quickDoc/QuickDocInCompletionTest.kt | 6 +- .../editor/quickDoc/QuickDocNavigationTest.kt | 10 +- .../AbstractDiagnosticMessageJsTest.java | 4 +- .../AbstractDiagnosticMessageTest.java | 6 +- .../idea/highlighter/NoErrorsInStdlibTest.kt | 4 +- .../imports/AbstractOptimizeImportsTest.kt | 2 +- .../intentions/AbstractIntentionTest.java | 6 +- .../AbstractBytecodeToolWindowTest.kt | 8 +- .../idea/javaFacade/JetJavaFacadeTest.java | 26 +- .../kotlin/idea/kdoc/KDocFinderTest.kt | 10 +- .../lightClasses/LightClassEqualsTest.java | 4 +- .../navigation/AbstractGotoSuperTest.java | 4 +- .../AbstractParameterInfoTest.kt | 10 +- .../AbstractQuickFixMultiFileTest.java | 16 +- .../idea/quickfix/AbstractQuickFixTest.java | 6 +- .../DeprecatedSymbolUsageFixSpecialTest.kt | 4 +- .../JetChangeSignatureTest.java | 94 +- .../introduce/AbstractJetExtractionTest.kt | 12 +- .../refactoring/move/AbstractJetMoveTest.kt | 10 +- .../nameSuggester/JetNameSuggesterTest.kt | 8 +- .../refactoring/rename/AbstractRenameTest.kt | 12 +- ...AdditionalResolveDescriptorRendererTest.kt | 10 +- .../resolve/AbstractPartialBodyResolveTest.kt | 48 +- .../kotlin/idea/run/RunConfigurationTest.kt | 14 +- .../idea/stubs/AbstractResolveByStubTest.java | 4 +- .../idea/stubs/AbstractStubBuilderTest.java | 8 +- .../kotlin/idea/stubs/DebugTextByStubTest.kt | 98 +- .../kotlin/idea/stubs/JetStubsTest.java | 20 +- ...StringTemplateExpressionManipulatorTest.kt | 2 +- .../psi/injection/StringInjectionHostTest.kt | 20 +- .../AbstractJetPsiUnifierTest.kt | 18 +- .../safeDelete/AbstractJetSafeDeleteTest.java | 22 +- .../search/KotlinReferencesSearchTest.kt | 12 +- .../shortenRefs/AbstractShortenRefsTest.kt | 4 +- .../jetbrains/kotlin/test/ReferenceUtils.java | 8 +- .../kotlin/j2k/AfterConversionPass.kt | 4 +- .../kotlin/j2k/ExpressionConverter.kt | 14 +- .../kotlin/j2k/JavaToKotlinConverter.kt | 10 +- .../kotlin/j2k/ResolverForConverter.kt | 6 +- .../org/jetbrains/kotlin/j2k/TypeConverter.kt | 4 +- .../jetbrains/kotlin/j2k/ast/Identifier.kt | 6 +- .../jetbrains/kotlin/j2k/propertyDetection.kt | 4 +- .../AccessorToPropertyProcessing.kt | 18 +- .../FieldToPropertyProcessing.kt | 4 +- ...tractJavaToKotlinConverterMultiFileTest.kt | 10 +- ...ractJavaToKotlinConverterSingleFileTest.kt | 6 +- .../analyze/TopDownAnalyzerFacadeForJS.java | 12 +- .../kotlin/js/analyze/suppressWarnings.kt | 8 +- .../jetbrains/kotlin/js/config/Config.java | 12 +- .../js/config/LibrarySourcesConfig.java | 16 +- .../js/descriptorUtils/descriptorUtils.kt | 6 +- .../js/resolve/diagnostics/ErrorsJs.java | 36 +- .../js/resolve/diagnostics/JsCallChecker.kt | 18 +- .../diagnostics/JsCodePositioningStrategy.kt | 4 +- .../js/resolve/nativeAnnotationCheckers.kt | 16 +- .../js/resolve/unsupportedFeatureCheckers.kt | 4 +- ...inJavascriptAnnotationAndConstantLoader.kt | 4 +- .../js/KotlinJavascriptSerializerExtension.kt | 4 +- .../jetbrains/kotlin/js/test/BasicTest.java | 28 +- .../kotlin/js/facade/K2JSTranslator.java | 6 +- .../kotlin/js/facade/TranslationResult.kt | 4 +- .../callTranslator/CallInfoExtensions.kt | 4 +- .../callTranslator/FunctionCallCases.kt | 18 +- .../js/translate/context/AliasingContext.java | 10 +- .../translate/context/TranslationContext.java | 4 +- .../translate/declaration/ClassTranslator.kt | 22 +- .../declaration/DeclarationBodyVisitor.java | 18 +- .../declaration/DelegationTranslator.kt | 14 +- .../translate/declaration/FileDeclaration.kt | 16 +- .../declaration/JsDataClassGenerator.java | 10 +- .../PackageDeclarationTranslator.java | 10 +- .../declaration/PackageTranslator.java | 8 +- .../declaration/PropertyTranslator.kt | 14 +- .../translate/expression/CatchTranslator.kt | 12 +- .../expression/ExpressionVisitor.java | 116 +- .../expression/FunctionTranslator.java | 12 +- .../expression/LiteralFunctionTranslator.kt | 4 +- .../js/translate/expression/LoopTranslator.kt | 20 +- .../MultiDeclarationTranslator.java | 13 +- .../expression/PatternTranslator.java | 28 +- .../expression/StringTemplateTranslator.java | 24 +- .../js/translate/expression/TryTranslator.kt | 8 +- .../translate/expression/WhenTranslator.java | 50 +- .../general/JetTestFunctionDetector.java | 26 +- .../js/translate/general/Translation.java | 36 +- .../translate/general/TranslatorVisitor.java | 16 +- .../ClassInitializerTranslator.java | 30 +- .../initializer/InitializerUtils.java | 12 +- .../initializer/InitializerVisitor.java | 14 +- .../js/translate/intrinsic/Intrinsics.java | 4 +- .../PrimitiveBinaryOperationFIF.java | 4 +- .../factories/PrimitiveUnaryOperationFIF.java | 4 +- .../functions/factories/TopLevelFIF.java | 27 +- .../intrinsic/operation/CompareToBOIF.kt | 12 +- .../intrinsic/operation/EqualsBOIF.kt | 14 +- .../intrinsic/operation/LongCompareToBOIF.kt | 8 +- .../operation/binaryOperationIntrinsics.kt | 22 +- .../operation/AssignmentTranslator.java | 24 +- .../operation/BinaryOperationTranslator.java | 62 +- .../operation/CompareToTranslator.java | 12 +- .../operation/IncrementTranslator.java | 14 +- .../IntrinsicAssignmentTranslator.java | 18 +- .../IntrinsicIncrementTranslator.java | 20 +- .../js/translate/operation/OperatorTable.java | 70 +- .../OverloadedAssignmentTranslator.java | 6 +- .../OverloadedIncrementTranslator.java | 4 +- .../operation/UnaryOperationTranslator.java | 28 +- .../AbstractCallExpressionTranslator.java | 6 +- .../reference/AccessTranslationUtils.java | 30 +- .../reference/ArrayAccessTranslator.java | 24 +- .../BackingFieldAccessTranslator.java | 4 +- .../reference/CallArgumentTranslator.kt | 6 +- .../reference/CallExpressionTranslator.java | 14 +- .../reference/CallableReferenceTranslator.kt | 10 +- .../CompanionObjectAccessTranslator.java | 8 +- .../QualifiedExpressionTranslator.java | 36 +- .../reference/ReferenceAccessTranslator.java | 4 +- .../reference/ReferenceTranslator.java | 29 +- .../reference/VariableAccessTranslator.java | 4 +- .../js/translate/test/JSTestGenerator.java | 4 +- .../js/translate/utils/BindingUtils.java | 58 +- .../translate/utils/ErrorReportingUtils.java | 4 +- .../utils/FunctionBodyTranslator.java | 18 +- .../js/translate/utils/JsDescriptorUtils.java | 16 +- .../js/translate/utils/ManglingUtils.java | 6 +- .../kotlin/js/translate/utils/PsiUtils.java | 76 +- .../js/translate/utils/TranslationUtils.java | 26 +- .../kotlin/js/translate/utils/inlineUtils.kt | 4 +- .../synthetic/AndroidComponentRegistrar.kt | 4 +- .../kotlin/android/synthetic/AndroidConst.kt | 8 +- .../AndroidExpressionCodegenExtension.kt | 6 +- ...DestroyClassBuilderInterceptorExtension.kt | 6 +- .../synthetic/diagnostic/ErrorsAndroid.java | 6 +- .../res/AndroidLayoutXmlFileManager.kt | 4 +- .../res/CliSyntheticFileGenerator.kt | 4 +- .../synthetic/res/SyntheticFileGenerator.kt | 8 +- .../resolve/android/test/CompilerTestUtils.kt | 4 +- .../idea/AndroidFindMemberUsagesHandler.kt | 12 +- .../idea/AndroidGotoDeclarationHandler.kt | 12 +- .../synthetic/idea/AndroidRenameProcessor.kt | 12 +- .../AndroidSimpleNameReferenceExtension.kt | 12 +- .../IDEAndroidExternalDeclarationsProvider.kt | 4 +- .../res/IDEAndroidLayoutXmlFileManager.kt | 4 +- .../idea/res/IDESyntheticFileGenerator.kt | 6 +- .../kotlin/android/AbstractAndroidGotoTest.kt | 6 +- .../android/AbstractAndroidRenameTest.kt | 6 +- .../annotation/AnnotationCollectorPlugin.kt | 4 +- .../annotation/StubProducerExtension.kt | 4 +- 1965 files changed, 23732 insertions(+), 23757 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java rename compiler/frontend/src/org/jetbrains/kotlin/{JetNodeType.java => KtNodeType.java} (76%) create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java rename compiler/frontend/src/org/jetbrains/kotlin/idea/{JetFileType.java => KotlinFileType.java} (91%) delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java rename compiler/frontend/src/org/jetbrains/kotlin/lexer/{JetLexer.java => KotlinLexer.java} (91%) rename compiler/frontend/src/org/jetbrains/kotlin/lexer/{JetKeywordToken.java => KtKeywordToken.java} (70%) rename compiler/frontend/src/org/jetbrains/kotlin/lexer/{JetModifierKeywordToken.java => KtModifierKeywordToken.java} (70%) rename compiler/frontend/src/org/jetbrains/kotlin/lexer/{JetSingleValueToken.java => KtSingleValueToken.java} (85%) rename compiler/frontend/src/org/jetbrains/kotlin/lexer/{JetToken.java => KtToken.java} (89%) create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.kt delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitor.java delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoid.java delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoidWithParameter.java rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetAnnotated.java => KtAnnotated.java} (83%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetAnnotatedExpression.java => KtAnnotatedExpression.java} (66%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetAnnotation.java => KtAnnotation.java} (60%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetAnnotationEntry.java => KtAnnotationEntry.java} (54%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetAnnotationUseSiteTarget.kt => KtAnnotationUseSiteTarget.kt} (61%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetAnnotationsContainer.java => KtAnnotationsContainer.java} (91%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetArrayAccessExpression.java => KtArrayAccessExpression.java} (70%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetBinaryExpression.java => KtBinaryExpression.java} (70%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetBinaryExpressionWithTypeRHS.java => KtBinaryExpressionWithTypeRHS.java} (64%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetBlockCodeFragment.kt => KtBlockCodeFragment.kt} (84%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetBlockCodeFragmentType.java => KtBlockCodeFragmentType.java} (90%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetBlockExpression.java => KtBlockExpression.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetBlockStringTemplateEntry.java => KtBlockStringTemplateEntry.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetBreakExpression.java => KtBreakExpression.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetCallElement.java => KtCallElement.java} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetCallExpression.java => KtCallExpression.java} (56%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetCallableDeclaration.java => KtCallableDeclaration.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetCallableReferenceExpression.java => KtCallableReferenceExpression.java} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetCatchClause.java => KtCatchClause.java} (64%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetClass.kt => KtClass.kt} (63%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetClassBody.java => KtClassBody.java} (58%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetClassInitializer.java => KtClassInitializer.java} (60%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetClassLiteralExpression.kt => KtClassLiteralExpression.kt} (82%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetClassOrObject.kt => KtClassOrObject.kt} (51%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetCodeFragment.kt => KtCodeFragment.kt} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetConstantExpression.java => KtConstantExpression.java} (81%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetConstructor.kt => KtConstructor.kt} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetConstructorCalleeExpression.java => KtConstructorCalleeExpression.java} (53%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetConstructorDelegationCall.java => KtConstructorDelegationCall.java} (60%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetConstructorDelegationReferenceExpression.java => KtConstructorDelegationReferenceExpression.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetContainerNode.java => KtContainerNode.java} (91%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetContinueExpression.java => KtContinueExpression.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDeclaration.java => KtDeclaration.java} (72%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDeclarationContainer.java => KtDeclarationContainer.java} (89%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDeclarationImpl.java => KtDeclarationImpl.java} (65%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDeclarationModifierList.java => KtDeclarationModifierList.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDeclarationStub.java => KtDeclarationStub.java} (90%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDeclarationWithBody.java => KtDeclarationWithBody.java} (87%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDelegationSpecifier.java => KtDelegationSpecifier.java} (52%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDelegationSpecifierList.java => KtDelegationSpecifierList.java} (57%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDelegatorByExpressionSpecifier.java => KtDelegatorByExpressionSpecifier.java} (63%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDelegatorToSuperCall.java => KtDelegatorToSuperCall.java} (56%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDelegatorToSuperClass.java => KtDelegatorToSuperClass.java} (67%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDoWhileExpression.java => KtDoWhileExpression.java} (77%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDotQualifiedExpression.java => KtDotQualifiedExpression.java} (53%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDoubleColonExpression.kt => KtDoubleColonExpression.kt} (69%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetDynamicType.java => KtDynamicType.java} (66%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetElement.kt => KtElement.kt} (66%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetElementImpl.java => KtElementImpl.java} (76%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetElementImplStub.java => KtElementImplStub.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetEnumEntry.java => KtEnumEntry.java} (77%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetEnumEntrySuperclassReferenceExpression.kt => KtEnumEntrySuperclassReferenceExpression.kt} (73%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetEscapeStringTemplateEntry.java => KtEscapeStringTemplateEntry.java} (82%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetExpression.java => KtExpression.java} (67%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetExpressionCodeFragment.kt => KtExpressionCodeFragment.kt} (81%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetExpressionCodeFragmentType.java => KtExpressionCodeFragmentType.java} (89%) create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetExpressionImplStub.java => KtExpressionImplStub.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetExpressionWithLabel.kt => KtExpressionWithLabel.kt} (63%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFile.java => KtFile.java} (63%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFileAnnotationList.java => KtFileAnnotationList.java} (58%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFinallySection.java => KtFinallySection.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetForExpression.java => KtForExpression.java} (58%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFunction.java => KtFunction.java} (88%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFunctionLiteral.java => KtFunctionLiteral.java} (77%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFunctionLiteralArgument.kt => KtFunctionLiteralArgument.kt} (52%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFunctionLiteralExpression.java => KtFunctionLiteralExpression.java} (64%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFunctionNotStubbed.java => KtFunctionNotStubbed.java} (64%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFunctionType.java => KtFunctionType.java} (52%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetFunctionTypeReceiver.java => KtFunctionTypeReceiver.java} (60%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetIfExpression.java => KtIfExpression.java} (62%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetImportDirective.java => KtImportDirective.java} (73%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetImportList.java => KtImportList.java} (62%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetImportsFactory.java => KtImportsFactory.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetInitializerList.java => KtInitializerList.java} (59%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetInstanceExpressionWithLabel.java => KtInstanceExpressionWithLabel.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetIsExpression.java => KtIsExpression.java} (59%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetLabelReferenceExpression.kt => KtLabelReferenceExpression.kt} (85%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetLabeledExpression.java => KtLabeledExpression.java} (75%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetLiteralStringTemplateEntry.java => KtLiteralStringTemplateEntry.java} (79%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetLoopExpression.java => KtLoopExpression.java} (70%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetModifierList.java => KtModifierList.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetModifierListOwner.java => KtModifierListOwner.java} (63%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetModifierListOwnerStub.java => KtModifierListOwnerStub.java} (61%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetMultiDeclaration.java => KtMultiDeclaration.java} (70%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetMultiDeclarationEntry.java => KtMultiDeclarationEntry.java} (67%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNameReferenceExpression.kt => KtNameReferenceExpression.kt} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNamed.java => KtNamed.java} (96%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNamedDeclaration.java => KtNamedDeclaration.java} (88%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNamedDeclarationNotStubbed.java => KtNamedDeclarationNotStubbed.java} (76%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNamedDeclarationStub.java => KtNamedDeclarationStub.java} (70%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNamedDeclarationUtil.java => KtNamedDeclarationUtil.java} (65%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNamedFunction.java => KtNamedFunction.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetNullableType.java => KtNullableType.java} (53%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetObjectDeclaration.kt => KtObjectDeclaration.kt} (82%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetObjectDeclarationName.java => KtObjectDeclarationName.java} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetObjectLiteralExpression.java => KtObjectLiteralExpression.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetOperationExpression.java => KtOperationExpression.java} (85%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetOperationReferenceExpression.kt => KtOperationReferenceExpression.kt} (84%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPackageDirective.java => KtPackageDirective.java} (64%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetParameter.java => KtParameter.java} (67%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetParameterList.java => KtParameterList.java} (58%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetParenthesizedExpression.java => KtParenthesizedExpression.java} (75%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPostfixExpression.java => KtPostfixExpression.java} (79%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPrefixExpression.java => KtPrefixExpression.java} (79%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPrimaryConstructor.kt => KtPrimaryConstructor.kt} (56%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetProjectionKind.java => KtProjectionKind.java} (67%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetProperty.java => KtProperty.java} (67%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPropertyAccessor.java => KtPropertyAccessor.java} (62%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPropertyDelegate.java => KtPropertyDelegate.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPsiFactory.kt => KtPsiFactory.kt} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetPsiUtil.java => KtPsiUtil.java} (53%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetQualifiedExpression.java => KtQualifiedExpression.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetQualifiedExpressionImpl.kt => KtQualifiedExpressionImpl.kt} (61%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetReferenceExpression.java => KtReferenceExpression.java} (90%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetReturnExpression.java => KtReturnExpression.java} (72%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetRootPackageExpression.java => KtRootPackageExpression.java} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetSafeQualifiedExpression.java => KtSafeQualifiedExpression.java} (58%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetScript.java => KtScript.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetSecondaryConstructor.kt => KtSecondaryConstructor.kt} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetSelfType.java => KtSelfType.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetSimpleNameExpression.kt => KtSimpleNameExpression.kt} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetSimpleNameStringTemplateEntry.java => KtSimpleNameStringTemplateEntry.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetStatementExpression.java => KtStatementExpression.java} (81%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetStringTemplateEntry.java => KtStringTemplateEntry.java} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetStringTemplateEntryWithExpression.java => KtStringTemplateEntryWithExpression.java} (77%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetStringTemplateExpression.java => KtStringTemplateExpression.java} (73%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetStubbedPsiUtil.java => KtStubbedPsiUtil.java} (73%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetSuperExpression.java => KtSuperExpression.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetThisExpression.java => KtThisExpression.java} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetThrowExpression.java => KtThrowExpression.java} (73%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTreeVisitor.java => KtTreeVisitor.java} (82%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTreeVisitorVoid.java => KtTreeVisitorVoid.java} (93%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTryExpression.java => KtTryExpression.java} (62%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeArgumentList.java => KtTypeArgumentList.java} (61%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeCodeFragment.java => KtTypeCodeFragment.java} (65%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeCodeFragmentType.java => KtTypeCodeFragmentType.java} (90%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeConstraint.java => KtTypeConstraint.java} (58%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeConstraintList.java => KtTypeConstraintList.java} (60%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeElement.java => KtTypeElement.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeParameter.java => KtTypeParameter.java} (57%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeParameterList.java => KtTypeParameterList.java} (61%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeParameterListOwner.java => KtTypeParameterListOwner.java} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeParameterListOwnerNotStubbed.java => KtTypeParameterListOwnerNotStubbed.java} (62%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeParameterListOwnerStub.java => KtTypeParameterListOwnerStub.java} (59%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeProjection.java => KtTypeProjection.java} (65%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypeReference.kt => KtTypeReference.kt} (52%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetTypedef.java => KtTypedef.java} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetUnaryExpression.java => KtUnaryExpression.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetUserType.java => KtUserType.java} (55%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetValueArgument.java => KtValueArgument.java} (68%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetValueArgumentList.java => KtValueArgumentList.java} (64%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetValueArgumentName.java => KtValueArgumentName.java} (73%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetVariableDeclaration.java => KtVariableDeclaration.java} (88%) create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhenCondition.java => KtWhenCondition.java} (86%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhenConditionInRange.java => KtWhenConditionInRange.java} (66%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhenConditionIsPattern.java => KtWhenConditionIsPattern.java} (66%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhenConditionWithExpression.java => KtWhenConditionWithExpression.java} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhenEntry.java => KtWhenEntry.java} (69%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhenExpression.java => KtWhenExpression.java} (63%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhileExpression.java => KtWhileExpression.java} (81%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWhileExpressionBase.java => KtWhileExpressionBase.java} (74%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{JetWithExpressionInitializer.java => KtWithExpressionInitializer.java} (88%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/{JetStringTemplateExpressionManipulator.kt => KtStringTemplateExpressionManipulator.kt} (70%) delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetAnnotationEntryElementType.java => KtAnnotationEntryElementType.java} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetAnnotationUseSiteTargetElementType.kt => KtAnnotationUseSiteTargetElementType.kt} (78%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetClassElementType.java => KtClassElementType.java} (79%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetDotQualifiedExpressionElementType.java => KtDotQualifiedExpressionElementType.java} (62%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetEnumEntrySuperClassReferenceExpressionElementType.kt => KtEnumEntrySuperClassReferenceExpressionElementType.kt} (77%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetFileElementType.java => KtFileElementType.java} (93%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetFileStubBuilder.java => KtFileStubBuilder.java} (77%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetFunctionElementType.java => KtFunctionElementType.java} (86%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetImportDirectiveElementType.java => KtImportDirectiveElementType.java} (85%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetModifierListElementType.java => KtModifierListElementType.java} (87%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetNameReferenceExpressionElementType.java => KtNameReferenceExpressionElementType.java} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetObjectElementType.java => KtObjectElementType.java} (89%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetParameterElementType.java => KtParameterElementType.java} (86%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetPlaceHolderStubElementType.java => KtPlaceHolderStubElementType.java} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetPropertyAccessorElementType.java => KtPropertyAccessorElementType.java} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetPropertyElementType.java => KtPropertyElementType.java} (90%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetStubElementType.java => KtStubElementType.java} (84%) create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetTypeParameterElementType.java => KtTypeParameterElementType.java} (83%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetTypeProjectionElementType.java => KtTypeProjectionElementType.java} (79%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/{JetUserTypeElementType.java => KtUserTypeElementType.java} (81%) rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{JetLightPackage.java => KotlinLightPackage.java} (85%) create mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~- InnerClasses & EnclosingMethod attributes for local classes create mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~HEAD create mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~- InnerClasses & EnclosingMethod attributes for local classes create mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~HEAD create mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~- InnerClasses & EnclosingMethod attributes for local classes create mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~HEAD rename core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/{JetScope.kt => KtScope.kt} (96%) rename core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/{JetScopeImpl.kt => KtScopeImpl.kt} (83%) rename core/descriptors/src/org/jetbrains/kotlin/types/{AbstractJetType.java => AbstractKtType.java} (88%) rename core/descriptors/src/org/jetbrains/kotlin/types/{JetType.java => KtType.java} (84%) rename core/descriptors/src/org/jetbrains/kotlin/types/{JetTypeImpl.kt => KtTypeImpl.kt} (81%) rename core/descriptors/src/org/jetbrains/kotlin/types/checker/{JetTypeChecker.java => KotlinTypeChecker.java} (56%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/{JetIcons.java => KtIcons.java} (98%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetReferenceContributor.kt => KotlinReferenceContributor.kt} (60%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetArrayAccessReference.java => KtArrayAccessReference.java} (85%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetConstructorDelegationReference.java => KtConstructorDelegationReference.java} (73%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetForLoopInReference.kt => KtForLoopInReference.kt} (90%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetInvokeFunctionReference.java => KtInvokeFunctionReference.java} (84%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetMultiDeclarationReference.kt => KtMultiDeclarationReference.kt} (92%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetPropertyDelegationMethodsReference.kt => KtPropertyDelegationMethodsReference.kt} (86%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetReference.kt => KtReference.kt} (87%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/{JetSimpleNameReference.kt => KtSimpleNameReference.kt} (78%) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index e9e0ffa6ec7..6745cfcf87c 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.codegen.CodegenTestFiles; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil; -import org.jetbrains.kotlin.idea.JetFileType; -import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.idea.KotlinFileType; +import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; @@ -133,7 +133,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { private class FilesWriter { private final boolean isFullJdk; - public List files = new ArrayList(); + public List files = new ArrayList(); private KotlinCoreEnvironment environment; private FilesWriter(boolean isFullJdk) { @@ -161,11 +161,11 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { public void writeFilesOnDisk() { writeFiles(files); - files = new ArrayList(); + files = new ArrayList(); environment = createEnvironment(isFullJdk); } - private void writeFiles(List filesToCompile) { + private void writeFiles(List filesToCompile) { System.out.println("Generating " + filesToCompile.size() + " files..."); OutputFileCollection outputFiles; try { @@ -207,7 +207,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { processFiles(printer, listFiles, holderFull, holderMock); } } - else if (!FileUtilRt.getExtension(file.getName()).equals(JetFileType.INSTANCE.getDefaultExtension())) { + else if (!FileUtilRt.getExtension(file.getName()).equals(KotlinFileType.INSTANCE.getDefaultExtension())) { // skip non kotlin files } else { 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 1245d6639a2..95125017cf9 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 @@ -32,9 +32,9 @@ import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.KtType; import org.jetbrains.kotlin.types.TypeUtils; -import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import java.util.*; @@ -63,9 +63,9 @@ public class CodegenUtil { } @Nullable - public static PropertyDescriptor getDelegatePropertyIfAny(JetExpression expression, ClassDescriptor classDescriptor, BindingContext bindingContext) { + public static PropertyDescriptor getDelegatePropertyIfAny(KtExpression expression, ClassDescriptor classDescriptor, BindingContext bindingContext) { PropertyDescriptor propertyDescriptor = null; - if (expression instanceof JetSimpleNameExpression) { + if (expression instanceof KtSimpleNameExpression) { ResolvedCall call = CallUtilKt.getResolvedCall(expression, bindingContext); if (call != null) { CallableDescriptor callResultingDescriptor = call.getResultingDescriptor(); @@ -140,8 +140,8 @@ public class CodegenUtil { } @NotNull - public static ClassDescriptor getSuperClassByDelegationSpecifier(@NotNull JetDelegationSpecifier specifier, @NotNull BindingContext bindingContext) { - JetType superType = bindingContext.get(BindingContext.TYPE, specifier.getTypeReference()); + public static ClassDescriptor getSuperClassByDelegationSpecifier(@NotNull KtDelegationSpecifier specifier, @NotNull BindingContext bindingContext) { + KtType superType = bindingContext.get(BindingContext.TYPE, specifier.getTypeReference()); assert superType != null : "superType should not be null: " + specifier.getText(); ClassDescriptor superClassDescriptor = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor(); @@ -164,16 +164,16 @@ public class CodegenUtil { return true; } - private static boolean rawTypeMatches(JetType type, ClassifierDescriptor classifier) { + private static boolean rawTypeMatches(KtType type, ClassifierDescriptor classifier) { return type.getConstructor().equals(classifier.getTypeConstructor()); } public static boolean isEnumValueOfMethod(@NotNull FunctionDescriptor functionDescriptor) { List methodTypeParameters = functionDescriptor.getValueParameters(); - JetType nullableString = TypeUtils.makeNullable(DescriptorUtilsKt.getBuiltIns(functionDescriptor).getStringType()); + KtType nullableString = TypeUtils.makeNullable(DescriptorUtilsKt.getBuiltIns(functionDescriptor).getStringType()); return DescriptorUtils.ENUM_VALUE_OF.equals(functionDescriptor.getName()) && methodTypeParameters.size() == 1 - && JetTypeChecker.DEFAULT.isSubtypeOf(methodTypeParameters.get(0).getType(), nullableString); + && KotlinTypeChecker.DEFAULT.isSubtypeOf(methodTypeParameters.get(0).getType(), nullableString); } public static boolean isEnumValuesProperty(@NotNull VariableDescriptor propertyDescriptor) { @@ -183,8 +183,8 @@ public class CodegenUtil { @Nullable public static Integer getLineNumberForElement(@NotNull PsiElement statement, boolean markEndOffset) { PsiFile file = statement.getContainingFile(); - if (file instanceof JetFile) { - if (JetPsiFactoryKt.getDoNotAnalyze((JetFile) file) != null) { + if (file instanceof KtFile) { + if (KtPsiFactoryKt.getDoNotAnalyze((KtFile) file) != null) { return null; } } diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt index e43b9de56a8..e80b74e0c1d 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.MemberComparator -import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.KtType import org.jetbrains.kotlin.types.isDynamic import org.jetbrains.kotlin.utils.keysToMapExceptNulls import java.util.Comparator @@ -38,7 +38,7 @@ public object CodegenUtilKt { public fun getDelegates( descriptor: ClassDescriptor, toTrait: ClassDescriptor, - delegateExpressionType: JetType? = null + delegateExpressionType: KtType? = null ): Map { if (delegateExpressionType?.isDynamic() ?: false) return mapOf(); diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java index 2a292ba0b52..5b9c978b44f 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java @@ -22,9 +22,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.psi.JetClass; -import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.KtClass; +import org.jetbrains.kotlin.psi.KtClassOrObject; +import org.jetbrains.kotlin.psi.KtParameter; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.OverrideResolver; @@ -39,12 +39,12 @@ import java.util.List; * changed here with the platform backends adopted. */ public abstract class DataClassMethodGenerator { - private final JetClassOrObject declaration; + private final KtClassOrObject declaration; private final BindingContext bindingContext; private final ClassDescriptor classDescriptor; private final KotlinBuiltIns builtIns; - public DataClassMethodGenerator(JetClassOrObject declaration, BindingContext bindingContext) { + public DataClassMethodGenerator(KtClassOrObject declaration, BindingContext bindingContext) { this.declaration = declaration; this.bindingContext = bindingContext; this.classDescriptor = BindingContextUtils.getNotNull(bindingContext, BindingContext.CLASS, declaration); @@ -66,7 +66,7 @@ public abstract class DataClassMethodGenerator { protected abstract void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull ValueParameterDescriptor parameter); - protected abstract void generateCopyFunction(@NotNull FunctionDescriptor function, @NotNull List constructorParameters); + protected abstract void generateCopyFunction(@NotNull FunctionDescriptor function, @NotNull List constructorParameters); protected abstract void generateToStringMethod(@NotNull FunctionDescriptor function, @NotNull List properties); @@ -93,7 +93,7 @@ public abstract class DataClassMethodGenerator { } } - private void generateCopyFunctionForDataClasses(List constructorParameters) { + private void generateCopyFunctionForDataClasses(List constructorParameters) { FunctionDescriptor copyFunction = bindingContext.get(BindingContext.DATA_CLASS_COPY_FUNCTION, classDescriptor); if (copyFunction != null) { generateCopyFunction(copyFunction, constructorParameters); @@ -123,7 +123,7 @@ public abstract class DataClassMethodGenerator { private List getDataProperties() { List result = Lists.newArrayList(); - for (JetParameter parameter : getPrimaryConstructorParameters()) { + for (KtParameter parameter : getPrimaryConstructorParameters()) { if (parameter.hasValOrVar()) { result.add(bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, parameter)); } @@ -132,8 +132,8 @@ public abstract class DataClassMethodGenerator { } @NotNull - private List getPrimaryConstructorParameters() { - if (declaration instanceof JetClass) { + private List getPrimaryConstructorParameters() { + if (declaration instanceof KtClass) { return declaration.getPrimaryConstructorParameters(); } return Collections.emptyList(); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java index 2b4077f13b1..0105f98ddd1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; -import org.jetbrains.kotlin.psi.JetSuperExpression; +import org.jetbrains.kotlin.psi.KtSuperExpression; public interface AccessorForCallableDescriptor { @NotNull T getCalleeDescriptor(); @Nullable - JetSuperExpression getSuperCallExpression(); + KtSuperExpression getSuperCallExpression(); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt index 585f0b0d543..eac7f44874b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt @@ -18,14 +18,14 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.psi.JetSuperExpression +import org.jetbrains.kotlin.psi.KtSuperExpression import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.KtType public class AccessorForConstructorDescriptor( private val calleeDescriptor: ConstructorDescriptor, containingDeclaration: DeclarationDescriptor, - private val superCallExpression: JetSuperExpression? + private val superCallExpression: KtSuperExpression? ) : AbstractAccessorForFunctionDescriptor(containingDeclaration, Name.special("")), ConstructorDescriptor, AccessorForCallableDescriptor { @@ -35,9 +35,9 @@ public class AccessorForConstructorDescriptor( override fun isPrimary(): Boolean = false - override fun getReturnType(): JetType = super.getReturnType()!! + override fun getReturnType(): KtType = super.getReturnType()!! - override fun getSuperCallExpression(): JetSuperExpression? = superCallExpression + override fun getSuperCallExpression(): KtSuperExpression? = superCallExpression init { initialize( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java index d5e77bc16a6..c5d0954e567 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java @@ -20,18 +20,18 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.psi.JetSuperExpression; +import org.jetbrains.kotlin.psi.KtSuperExpression; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDescriptor implements AccessorForCallableDescriptor { private final FunctionDescriptor calleeDescriptor; - private final JetSuperExpression superCallExpression; + private final KtSuperExpression superCallExpression; public AccessorForFunctionDescriptor( @NotNull FunctionDescriptor descriptor, @NotNull DeclarationDescriptor containingDeclaration, - @Nullable JetSuperExpression superCallExpression, + @Nullable KtSuperExpression superCallExpression, @NotNull String nameSuffix ) { super(containingDeclaration, @@ -57,7 +57,7 @@ public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDe } @Override - public JetSuperExpression getSuperCallExpression() { + public KtSuperExpression getSuperCallExpression() { return superCallExpression; } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java index d072f5f0628..4b1baa5746e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java @@ -20,13 +20,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.KtType; public class AccessorForPropertyBackingFieldInOuterClass extends AccessorForPropertyDescriptor { public AccessorForPropertyBackingFieldInOuterClass( @NotNull PropertyDescriptor property, @NotNull DeclarationDescriptor containingDeclaration, - @Nullable JetType delegationType, + @Nullable KtType delegationType, @NotNull String nameSuffix ) { super(property, delegationType != null ? delegationType : property.getType(), null, null, containingDeclaration, null, nameSuffix); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java index 536a2c24739..8e0507d4e59 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java @@ -25,21 +25,21 @@ import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.PropertySetterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.psi.JetSuperExpression; +import org.jetbrains.kotlin.psi.KtSuperExpression; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.KtType; import java.util.Collections; public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implements AccessorForCallableDescriptor { private final PropertyDescriptor calleeDescriptor; - private final JetSuperExpression superCallExpression; + private final KtSuperExpression superCallExpression; @NotNull private final String nameSuffix; public AccessorForPropertyDescriptor( @NotNull PropertyDescriptor property, @NotNull DeclarationDescriptor containingDeclaration, - @Nullable JetSuperExpression superCallExpression, + @Nullable KtSuperExpression superCallExpression, @NotNull String nameSuffix ) { this(property, property.getType(), DescriptorUtils.getReceiverParameterType(property.getExtensionReceiverParameter()), @@ -48,11 +48,11 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem protected AccessorForPropertyDescriptor( @NotNull PropertyDescriptor original, - @NotNull JetType propertyType, - @Nullable JetType receiverType, + @NotNull KtType propertyType, + @Nullable KtType receiverType, @Nullable ReceiverParameterDescriptor dispatchReceiverParameter, @NotNull DeclarationDescriptor containingDeclaration, - @Nullable JetSuperExpression superCallExpression, + @Nullable KtSuperExpression superCallExpression, @NotNull String nameSuffix ) { super(containingDeclaration, null, Annotations.Companion.getEMPTY(), Modality.FINAL, Visibilities.LOCAL, @@ -84,7 +84,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem @Nullable @Override - public JetSuperExpression getSuperCallExpression() { + public KtSuperExpression getSuperCallExpression() { return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getSuperCallExpression(); } @@ -108,7 +108,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem @Nullable @Override - public JetSuperExpression getSuperCallExpression() { + public KtSuperExpression getSuperCallExpression() { return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getSuperCallExpression(); } } @@ -120,7 +120,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem } @Override - public JetSuperExpression getSuperCallExpression() { + public KtSuperExpression getSuperCallExpression() { return superCallExpression; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index 4ceada00ad9..4c8b7bd5b5b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -157,7 +157,7 @@ public abstract class AnnotationCodegen { return false; } - private void generateNullabilityAnnotation(@Nullable JetType type, @NotNull Set annotationDescriptorsAlreadyPresent) { + private void generateNullabilityAnnotation(@Nullable KtType type, @NotNull Set annotationDescriptorsAlreadyPresent) { if (type == null) return; if (isBareTypeParameterWithNullableUpperBound(type)) { @@ -253,12 +253,12 @@ public abstract class AnnotationCodegen { } } - private static boolean isBareTypeParameterWithNullableUpperBound(@NotNull JetType type) { + private static boolean isBareTypeParameterWithNullableUpperBound(@NotNull KtType type) { ClassifierDescriptor classifier = type.getConstructor().getDeclarationDescriptor(); return !type.isMarkedNullable() && classifier instanceof TypeParameterDescriptor && TypeUtils.hasNullableSuperType(type); } - public void generateAnnotationDefaultValue(@NotNull ConstantValue value, @NotNull JetType expectedType) { + public void generateAnnotationDefaultValue(@NotNull ConstantValue value, @NotNull KtType expectedType) { AnnotationVisitor visitor = visitAnnotation(null, false); // Parameters are unimportant genCompileTimeValue(null, value, visitor); visitor.visitEnd(); @@ -418,7 +418,7 @@ public abstract class AnnotationCodegen { for (ConstantValue value : values) { if (value instanceof EnumValue) { ClassDescriptor enumEntry = ((EnumValue) value).getValue(); - JetType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry); + KtType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry); if (classObjectType != null) { if ("java/lang/annotation/ElementType".equals(typeMapper.mapType(classObjectType).getInternalName())) { result.add(ElementType.valueOf(enumEntry.getName().asString())); @@ -446,7 +446,7 @@ public abstract class AnnotationCodegen { ConstantValue compileTimeConstant = valueArguments.iterator().next(); if (compileTimeConstant instanceof EnumValue) { ClassDescriptor enumEntry = ((EnumValue) compileTimeConstant).getValue(); - JetType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry); + KtType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry); if (classObjectType != null) { if ("java/lang/annotation/RetentionPolicy".equals(typeMapper.mapType(classObjectType).getInternalName())) { return RetentionPolicy.valueOf(enumEntry.getName().asString()); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index dac28a7f51f..a6954c2eccf 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.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo; -import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.load.java.JavaVisibilities; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; @@ -52,7 +52,7 @@ import org.jetbrains.kotlin.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.jvm.BitEncoding; import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor; import org.jetbrains.kotlin.types.FlexibleTypesKt; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.KtType; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; @@ -432,7 +432,7 @@ public class AsmUtil { allFields.add(Pair.create(CAPTURED_THIS_FIELD, typeMapper.mapType(captureThis))); } - JetType captureReceiverType = closure.getCaptureReceiverType(); + KtType captureReceiverType = closure.getCaptureReceiverType(); if (captureReceiverType != null) { allFields.add(Pair.create(CAPTURED_RECEIVER_FIELD, typeMapper.mapType(captureReceiverType))); } @@ -558,7 +558,7 @@ public class AsmUtil { right.put(rightType, v); genAreEqualCall(v); - if (opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ) { + if (opToken == KtTokens.EXCLEQ || opToken == KtTokens.EXCLEQEQEQ) { genInvertBoolean(v); } return Unit.INSTANCE$; @@ -638,7 +638,7 @@ public class AsmUtil { @NotNull CallableDescriptor parameter, @NotNull String name ) { - JetType type = parameter.getReturnType(); + KtType type = parameter.getReturnType(); if (type == null || isNullableType(type)) return; int index = frameMap.getIndex(parameter); @@ -672,7 +672,7 @@ public class AsmUtil { if (!isDeclaredInJava(descriptor)) return false; - JetType type = descriptor.getReturnType(); + KtType type = descriptor.getReturnType(); if (type == null || isNullableType(FlexibleTypesKt.lowerIfFlexible(type))) return false; Type asmType = state.getTypeMapper().mapReturnType(descriptor); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt index 8eea7c615dd..f3cdd804779 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.codegen.pseudoInsns.fakeAlwaysFalseIfeq import org.jetbrains.kotlin.codegen.pseudoInsns.fakeAlwaysTrueIfeq -import org.jetbrains.kotlin.lexer.JetTokens +import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.org.objectweb.asm.Label import org.jetbrains.org.objectweb.asm.Opcodes.* import org.jetbrains.org.objectweb.asm.Type @@ -214,7 +214,7 @@ class NumberCompare( override fun patchOpcode(opcode: Int, v: InstructionAdapter): Int { when (operandType) { Type.FLOAT_TYPE, Type.DOUBLE_TYPE -> { - if (opToken == JetTokens.GT || opToken == JetTokens.GTEQ) { + if (opToken == KtTokens.GT || opToken == KtTokens.GTEQ) { v.cmpl(operandType) } else { @@ -234,12 +234,12 @@ class NumberCompare( companion object { fun getNumberCompareOpcode(opToken: IElementType): Int { return when (opToken) { - JetTokens.EQEQ, JetTokens.EQEQEQ -> IFNE - JetTokens.EXCLEQ, JetTokens.EXCLEQEQEQ -> IFEQ - JetTokens.GT -> IFLE - JetTokens.GTEQ -> IFLT - JetTokens.LT -> IFGE - JetTokens.LTEQ -> IFGT + KtTokens.EQEQ, KtTokens.EQEQEQ -> IFNE + KtTokens.EXCLEQ, KtTokens.EXCLEQEQEQ -> IFEQ + KtTokens.GT -> IFLE + KtTokens.GTEQ -> IFLT + KtTokens.LT -> IFGE + KtTokens.LTEQ -> IFGT else -> { throw UnsupportedOperationException("Don't know how to generate this condJump: " + opToken) } @@ -258,8 +258,8 @@ class ObjectCompare( companion object { fun getObjectCompareOpcode(opToken: IElementType): Int { return when (opToken) { - JetTokens.EQEQEQ -> IF_ACMPNE - JetTokens.EXCLEQEQEQ -> IF_ACMPEQ + KtTokens.EQEQEQ -> IF_ACMPNE + KtTokens.EXCLEQEQEQ -> IF_ACMPEQ else -> throw UnsupportedOperationException("don't know how to generate this condjump") } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java index a15ac23d66f..c81b2b73798 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.org.objectweb.asm.Type; @@ -68,7 +68,7 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator { Type type = valueParameterTypes.get(i); ValueArgument valueArgument = argument.getValueArgument(); assert valueArgument != null; - JetExpression argumentExpression = valueArgument.getArgumentExpression(); + KtExpression argumentExpression = valueArgument.getArgumentExpression(); assert argumentExpression != null : valueArgument.asElement().getText(); callGenerator.genValueAndPut(parameter, argumentExpression, type, i); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt index 9f3953fe0a1..c851844a523 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.psi.JetExpression +import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.org.objectweb.asm.Type @@ -57,7 +57,7 @@ abstract class CallGenerator { override fun genValueAndPut( valueParameterDescriptor: ValueParameterDescriptor, - argumentExpression: JetExpression, + argumentExpression: KtExpression, parameterType: Type, parameterIndex: Int) { val value = codegen.gen(argumentExpression) @@ -118,7 +118,7 @@ abstract class CallGenerator { abstract fun genValueAndPut( valueParameterDescriptor: ValueParameterDescriptor, - argumentExpression: JetExpression, + argumentExpression: KtExpression, parameterType: Type, parameterIndex: Int) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java index 940a1bd41d0..b3e69edd2f6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java @@ -31,13 +31,13 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.enumEntryNeedSubclass; -public abstract class ClassBodyCodegen extends MemberCodegen { - protected final JetClassOrObject myClass; +public abstract class ClassBodyCodegen extends MemberCodegen { + protected final KtClassOrObject myClass; protected final OwnerKind kind; protected final ClassDescriptor descriptor; protected ClassBodyCodegen( - @NotNull JetClassOrObject myClass, + @NotNull KtClassOrObject myClass, @NotNull ClassContext context, @NotNull ClassBuilder v, @NotNull GenerationState state, @@ -53,14 +53,14 @@ public abstract class ClassBodyCodegen extends MemberCodegen { protected void generateBody() { if (kind != OwnerKind.DEFAULT_IMPLS) { //generate nested classes first and only then generate class body. It necessary to access to nested CodegenContexts - for (JetDeclaration declaration : myClass.getDeclarations()) { + for (KtDeclaration declaration : myClass.getDeclarations()) { if (shouldProcessFirst(declaration)) { generateDeclaration(declaration); } } } - for (JetDeclaration declaration : myClass.getDeclarations()) { + for (KtDeclaration declaration : myClass.getDeclarations()) { if (!shouldProcessFirst(declaration)) { generateDeclaration(declaration); } @@ -92,26 +92,26 @@ public abstract class ClassBodyCodegen extends MemberCodegen { generatePrimaryConstructorProperties(); } - private static boolean shouldProcessFirst(JetDeclaration declaration) { - return !(declaration instanceof JetProperty || declaration instanceof JetNamedFunction); + private static boolean shouldProcessFirst(KtDeclaration declaration) { + return !(declaration instanceof KtProperty || declaration instanceof KtNamedFunction); } - protected void generateDeclaration(JetDeclaration declaration) { - if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) { + protected void generateDeclaration(KtDeclaration declaration) { + if (declaration instanceof KtProperty || declaration instanceof KtNamedFunction) { genFunctionOrProperty(declaration); } - else if (declaration instanceof JetClassOrObject) { - if (declaration instanceof JetEnumEntry && !enumEntryNeedSubclass(bindingContext, (JetEnumEntry) declaration)) { + else if (declaration instanceof KtClassOrObject) { + if (declaration instanceof KtEnumEntry && !enumEntryNeedSubclass(bindingContext, (KtEnumEntry) declaration)) { return; } - genClassOrObject((JetClassOrObject) declaration); + genClassOrObject((KtClassOrObject) declaration); } } private void generatePrimaryConstructorProperties() { boolean isAnnotation = descriptor.getKind() == ClassKind.ANNOTATION_CLASS; - for (JetParameter p : getPrimaryConstructorParameters()) { + for (KtParameter p : getPrimaryConstructorParameters()) { if (p.hasValOrVar()) { PropertyDescriptor propertyDescriptor = bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, p); if (propertyDescriptor != null) { @@ -127,9 +127,9 @@ public abstract class ClassBodyCodegen extends MemberCodegen { } @NotNull - protected List getPrimaryConstructorParameters() { - if (myClass instanceof JetClass) { - return ((JetClass) myClass).getPrimaryConstructorParameters(); + protected List getPrimaryConstructorParameters() { + if (myClass instanceof KtClass) { + return ((KtClass) myClass).getPrimaryConstructorParameters(); } return Collections.emptyList(); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index db7d9902069..796bf6531b2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.load.kotlin.PackageParts; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable; import org.jetbrains.org.objectweb.asm.Type; @@ -223,7 +223,7 @@ public class ClassFileFactory implements OutputFileCollection { } @NotNull - public PackageCodegen forPackage(@NotNull FqName fqName, @NotNull Collection files) { + public PackageCodegen forPackage(@NotNull FqName fqName, @NotNull Collection files) { assert !isDone : "Already done!"; PackageCodegen codegen = package2codegen.get(fqName); if (codegen == null) { @@ -235,7 +235,7 @@ public class ClassFileFactory implements OutputFileCollection { } @NotNull - public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection files) { + public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection files) { assert !isDone : "Already done!"; MultifileClassCodegen codegen = multifileClass2codegen.get(facadeFqName); if (codegen == null) { @@ -341,7 +341,7 @@ public class ClassFileFactory implements OutputFileCollection { } @TestOnly - public List getInputFiles() { + public List getInputFiles() { return state.getFiles(); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 755a5aa53cf..a2f8b3e8f06 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -35,15 +35,15 @@ import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; -import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.psi.KtElement; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; -import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.ProtoBuf; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.KtType; import org.jetbrains.kotlin.util.OperatorNameConventions; import org.jetbrains.kotlin.utils.FunctionsKt; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; @@ -66,12 +66,12 @@ import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; -public class ClosureCodegen extends MemberCodegen { +public class ClosureCodegen extends MemberCodegen { private final FunctionDescriptor funDescriptor; private final ClassDescriptor classDescriptor; private final SamType samType; - private final JetType superClassType; - private final List superInterfaceTypes; + private final KtType superClassType; + private final List superInterfaceTypes; private final FunctionDescriptor functionReferenceTarget; private final FunctionGenerationStrategy strategy; private final CalculatedClosure closure; @@ -83,7 +83,7 @@ public class ClosureCodegen extends MemberCodegen { public ClosureCodegen( @NotNull GenerationState state, - @NotNull JetElement element, + @NotNull KtElement element, @Nullable SamType samType, @NotNull ClosureContext context, @Nullable FunctionDescriptor functionReferenceTarget, @@ -100,10 +100,10 @@ public class ClosureCodegen extends MemberCodegen { this.strategy = strategy; if (samType == null) { - this.superInterfaceTypes = new ArrayList(); + this.superInterfaceTypes = new ArrayList(); - JetType superClassType = null; - for (JetType supertype : classDescriptor.getTypeConstructor().getSupertypes()) { + KtType superClassType = null; + for (KtType supertype : classDescriptor.getTypeConstructor().getSupertypes()) { ClassifierDescriptor classifier = supertype.getConstructor().getDeclarationDescriptor(); if (DescriptorUtils.isInterface(classifier)) { superInterfaceTypes.add(supertype); @@ -141,7 +141,7 @@ public class ClosureCodegen extends MemberCodegen { sw.writeSuperclassEnd(); String[] superInterfaceAsmTypes = new String[superInterfaceTypes.size()]; for (int i = 0; i < superInterfaceTypes.size(); i++) { - JetType superInterfaceType = superInterfaceTypes.get(i); + KtType superInterfaceType = superInterfaceTypes.get(i); sw.writeInterface(); superInterfaceAsmTypes[i] = typeMapper.mapSupertype(superInterfaceType, sw).getInternalName(); sw.writeInterfaceEnd(); @@ -428,7 +428,7 @@ public class ClosureCodegen extends MemberCodegen { Type type = typeMapper.mapType(captureThis); args.add(FieldInfo.createForHiddenField(ownerType, type, CAPTURED_THIS_FIELD)); } - JetType captureReceiverType = closure.getCaptureReceiverType(); + KtType captureReceiverType = closure.getCaptureReceiverType(); if (captureReceiverType != null) { args.add(FieldInfo.createForHiddenField(ownerType, typeMapper.mapType(captureReceiverType), CAPTURED_RECEIVER_FIELD)); } @@ -467,7 +467,7 @@ public class ClosureCodegen extends MemberCodegen { ClassDescriptor elementClass = elementDescriptor.getExtensionReceiverParameter() == null ? DescriptorUtilsKt.getBuiltIns(elementDescriptor).getFunction(arity) : DescriptorUtilsKt.getBuiltIns(elementDescriptor).getExtensionFunction(arity); - JetScope scope = elementClass.getDefaultType().getMemberScope(); + KtScope scope = elementClass.getDefaultType().getMemberScope(); return scope.getFunctions(OperatorNameConventions.INVOKE, NoLookupLocation.FROM_BACKEND).iterator().next(); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt index e0bc97fbcf1..4cc20975a20 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider -import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.psi.KtFile public class CodegenFileClassesProvider : JvmFileClassesProvider { - override public fun getFileClassInfo(file: JetFile): JvmFileClassInfo = + override public fun getFileClassInfo(file: KtFile): JvmFileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(file) } \ No newline at end of file diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java index f6a0be5626c..08dbacb4d9a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; -public class CodegenStatementVisitor extends JetVisitor { +public class CodegenStatementVisitor extends KtVisitor { private final ExpressionCodegen codegen; public CodegenStatementVisitor(ExpressionCodegen codegen) { @@ -27,38 +27,38 @@ public class CodegenStatementVisitor extends JetVisitor } @Override - public StackValue visitJetElement(@NotNull JetElement element, StackValue receiver) { + public StackValue visitJetElement(@NotNull KtElement element, StackValue receiver) { return element.accept(codegen, receiver); } @Override - public StackValue visitIfExpression(@NotNull JetIfExpression expression, StackValue receiver) { + public StackValue visitIfExpression(@NotNull KtIfExpression expression, StackValue receiver) { return codegen.generateIfExpression(expression, true); } @Override - public StackValue visitTryExpression(@NotNull JetTryExpression expression, StackValue data) { + public StackValue visitTryExpression(@NotNull KtTryExpression expression, StackValue data) { return codegen.generateTryExpression(expression, true); } @Override - public StackValue visitNamedFunction(@NotNull JetNamedFunction function, StackValue data) { + public StackValue visitNamedFunction(@NotNull KtNamedFunction function, StackValue data) { return codegen.visitNamedFunction(function, data, true); } @Override - public StackValue visitWhenExpression(@NotNull JetWhenExpression expression, StackValue data) { + public StackValue visitWhenExpression(@NotNull KtWhenExpression expression, StackValue data) { return codegen.generateWhenExpression(expression, true); } @Override - public StackValue visitBlockExpression(@NotNull JetBlockExpression expression, StackValue data) { + public StackValue visitBlockExpression(@NotNull KtBlockExpression expression, StackValue data) { return codegen.generateBlock(expression, true); } @Override - public StackValue visitLabeledExpression(@NotNull JetLabeledExpression expression, StackValue receiver) { - JetExpression baseExpression = expression.getBaseExpression(); + public StackValue visitLabeledExpression(@NotNull KtLabeledExpression expression, StackValue receiver) { + KtExpression baseExpression = expression.getBaseExpression(); assert baseExpression != null : "Label expression should have base one: " + expression.getText(); return baseExpression.accept(this, receiver); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 56cc9a1226f..645840b22a4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature import org.jetbrains.kotlin.types.* -import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.org.objectweb.asm.Opcodes.* import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import java.util.ArrayList @@ -187,7 +187,7 @@ class CollectionStubMethodGenerator( return ourSuperCollectionClasses.filter { klass -> klass.readOnlyClass !in redundantClasses } } - private fun Collection.classes(): Collection = + private fun Collection.classes(): Collection = this.map { it.getConstructor().getDeclarationDescriptor() as ClassDescriptor } private fun findFakeOverridesForMethodsFromMutableCollection( @@ -213,13 +213,13 @@ class CollectionStubMethodGenerator( return result } - private fun Collection.findMostSpecificTypeForClass(klass: ClassDescriptor): JetType { + private fun Collection.findMostSpecificTypeForClass(klass: ClassDescriptor): KtType { val types = this.filter { it.getConstructor().getDeclarationDescriptor() == klass } if (types.isEmpty()) error("No supertype of $klass in $this") if (types.size() == 1) return types.first() // Find the first type in the list such that it's a subtype of every other type in that list return types.first { type -> - types.all { other -> JetTypeChecker.DEFAULT.isSubtypeOf(type, other) } + types.all { other -> KotlinTypeChecker.DEFAULT.isSubtypeOf(type, other) } } } @@ -239,8 +239,8 @@ class CollectionStubMethodGenerator( return this.getOverriddenDescriptors().firstOrNull { it.getContainingDeclaration() == classDescriptor } } - private fun newType(classDescriptor: ClassDescriptor, typeArguments: List): JetType { - return JetTypeImpl.create(Annotations.EMPTY, classDescriptor, false, typeArguments) + private fun newType(classDescriptor: ClassDescriptor, typeArguments: List): KtType { + return KtTypeImpl.create(Annotations.EMPTY, classDescriptor, false, typeArguments) } private fun FunctionDescriptor.signature(): JvmMethodSignature = typeMapper.mapSignature(this) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java index 1d398ecb68e..db4d853780e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.KtParameter; import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; @@ -31,7 +31,7 @@ public interface DefaultParameterValueLoader { ValueParameterDescriptor descriptor, ExpressionCodegen codegen ) { - JetParameter jetParameter = (JetParameter) descriptorToDeclaration(descriptor); + KtParameter jetParameter = (KtParameter) descriptorToDeclaration(descriptor); assert jetParameter != null; return codegen.gen(jetParameter.getDefaultValue()); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt index 1f8c079a177..05380c8a32d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.codegen.binding.CodegenBinding import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.psi.JetClass -import org.jetbrains.kotlin.psi.JetClassOrObject -import org.jetbrains.kotlin.psi.JetElement +import org.jetbrains.kotlin.psi.KtClass +import org.jetbrains.kotlin.psi.KtClassOrObject +import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmOverloadsAnnotation @@ -42,7 +42,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) { constructorDescriptor: ConstructorDescriptor, classBuilder: ClassBuilder, contextKind: OwnerKind, - classOrObject: JetClassOrObject + classOrObject: KtClassOrObject ) { if (generateOverloadsIfNeeded(classOrObject, constructorDescriptor, constructorDescriptor, contextKind, classBuilder)) { return @@ -70,7 +70,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) { * @return true if the overloads annotation was found on the element, false otherwise */ fun generateOverloadsIfNeeded( - methodElement: JetElement?, + methodElement: KtElement?, functionDescriptor: FunctionDescriptor, delegateFunctionDescriptor: FunctionDescriptor, contextKind: OwnerKind, @@ -109,7 +109,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) { functionDescriptor: FunctionDescriptor, delegateFunctionDescriptor: FunctionDescriptor, classBuilder: ClassBuilder, - methodElement: JetElement?, + methodElement: KtElement?, contextKind: OwnerKind, substituteCount: Int ) { @@ -208,7 +208,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) { return functionDescriptor.getValueParameters().filter { !it.declaresDefaultValue() || --remainingCount >= 0 } } - private fun isEmptyConstructorNeeded(constructorDescriptor: ConstructorDescriptor, classOrObject: JetClassOrObject): Boolean { + private fun isEmptyConstructorNeeded(constructorDescriptor: ConstructorDescriptor, classOrObject: KtClassOrObject): Boolean { val classDescriptor = constructorDescriptor.getContainingDeclaration() if (classDescriptor.getKind() != ClassKind.CLASS) return false @@ -220,12 +220,12 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) { return false if (constructorDescriptor.getValueParameters().isEmpty()) return false - if (classOrObject is JetClass && hasSecondaryConstructorsWithNoParameters(classOrObject)) return false + if (classOrObject is KtClass && hasSecondaryConstructorsWithNoParameters(classOrObject)) return false return constructorDescriptor.getValueParameters().all { it.declaresDefaultValue() } } - private fun hasSecondaryConstructorsWithNoParameters(klass: JetClass) = + private fun hasSecondaryConstructorsWithNoParameters(klass: KtClass) = klass.getSecondaryConstructors().any { it.getValueParameters().isEmpty() } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index b1a8bfdb756..6fab26b15f3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -54,7 +54,7 @@ import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo; import org.jetbrains.kotlin.jvm.bindingContextSlices.BindingContextSlicesKt; -import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; @@ -80,10 +80,10 @@ import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.resolve.scopes.receivers.*; import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.KtType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.TypeUtils; -import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; @@ -104,7 +104,7 @@ import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt.hasJvmFieldAnnotation; import static org.jetbrains.org.objectweb.asm.Opcodes.*; -public class ExpressionCodegen extends JetVisitor implements LocalLookup { +public class ExpressionCodegen extends KtVisitor implements LocalLookup { private final GenerationState state; final JetTypeMapper typeMapper; private final BindingContext bindingContext; @@ -125,7 +125,7 @@ public class ExpressionCodegen extends JetVisitor implem * When we create a temporary variable to hold some value not to compute it many times * we put it into this map to emit access to that variable instead of evaluating the whole expression */ - public final Map tempVariables = Maps.newHashMap(); + public final Map tempVariables = Maps.newHashMap(); private int myLastLineNumber = -1; private boolean shouldMarkLineNumbers = true; @@ -156,9 +156,9 @@ public class ExpressionCodegen extends JetVisitor implem static class LoopBlockStackElement extends BlockStackElement { final Label continueLabel; final Label breakLabel; - public final JetSimpleNameExpression targetLabel; + public final KtSimpleNameExpression targetLabel; - LoopBlockStackElement(Label breakLabel, Label continueLabel, JetSimpleNameExpression targetLabel) { + LoopBlockStackElement(Label breakLabel, Label continueLabel, KtSimpleNameExpression targetLabel) { this.breakLabel = breakLabel; this.continueLabel = continueLabel; this.targetLabel = targetLabel; @@ -168,9 +168,9 @@ public class ExpressionCodegen extends JetVisitor implem static class FinallyBlockStackElement extends BlockStackElement { List