From e64a270d1a131dcfc0cb79b2f798bca217d72ff1 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 9 Nov 2015 19:06:50 +0100 Subject: [PATCH] more renames to get rid of "Jet" in class and method names --- .../codegen/CodegenStatementVisitor.java | 2 +- .../kotlin/codegen/ExpressionCodegen.java | 2 +- .../codegen/ImplementationBodyCodegen.java | 2 +- .../kotlin/codegen/MemberCodegen.java | 2 +- .../jetbrains/kotlin/codegen/SourceInfo.kt | 2 +- .../binding/CodegenAnnotatingVisitor.java | 8 +-- .../codegen/binding/PsiCodegenPredictor.java | 2 +- .../when/MappingsClassesForWhenByEnum.java | 2 +- .../kotlin/cli/common/moduleVisibilityImpl.kt | 4 +- .../jvm/compiler/CompileEnvironmentUtil.java | 2 +- .../cli/jvm/compiler/KotlinCoreEnvironment.kt | 14 ++-- .../compiler/KotlinToJVMBytecodeCompiler.java | 10 +-- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 8 +-- ...rorMarker.java => KtJavaMirrorMarker.java} | 2 +- .../kotlin/fileClasses/JvmFileClassUtil.kt | 2 +- .../java/structure/impl/JavaClassImpl.java | 4 +- .../src/org/jetbrains/kotlin/KtNodeTypes.java | 2 +- .../kotlin/cfg/JetControlFlowProcessor.java | 12 ++-- .../cfg/JetFlowInformationProvider.java | 2 +- .../config/CommonConfigurationKeys.java | 4 +- .../incremental/KotlinLookupLocation.kt | 2 +- ...arsing.java => AbstractKotlinParsing.java} | 8 +-- ...sing.java => KotlinExpressionParsing.java} | 26 +++---- .../{JetParser.java => KotlinParser.java} | 18 ++--- ...ition.java => KotlinParserDefinition.java} | 10 +-- .../{JetParsing.java => KotlinParsing.java} | 32 ++++----- ...ition.java => KotlinScriptDefinition.java} | 6 +- ...va => KotlinScriptDefinitionProvider.java} | 23 +++--- .../org/jetbrains/kotlin/psi/DebugTextUtil.kt | 4 +- .../kotlin/psi/KtAnnotatedExpression.java | 4 +- .../kotlin/psi/KtBlockCodeFragmentType.java | 4 +- .../jetbrains/kotlin/psi/KtClassOrObject.kt | 2 +- .../src/org/jetbrains/kotlin/psi/KtElement.kt | 2 +- .../jetbrains/kotlin/psi/KtElementImpl.java | 4 +- .../kotlin/psi/KtElementImplStub.java | 4 +- .../psi/KtExpressionCodeFragmentType.java | 4 +- .../src/org/jetbrains/kotlin/psi/KtFile.java | 4 +- .../kotlin/psi/KtFileAnnotationList.java | 4 +- .../jetbrains/kotlin/psi/KtModifierList.java | 4 +- .../psi/KtOperationReferenceExpression.kt | 4 +- .../kotlin/psi/KtPackageDirective.java | 4 +- .../org/jetbrains/kotlin/psi/KtPsiUtil.java | 24 +++---- .../jetbrains/kotlin/psi/KtTreeVisitor.java | 6 +- .../kotlin/psi/KtTypeCodeFragmentType.java | 4 +- .../org/jetbrains/kotlin/psi/KtVisitor.java | 70 +++++++++---------- .../jetbrains/kotlin/psi/KtVisitorVoid.java | 16 ++--- .../psi/KtVisitorVoidWithParameter.java | 8 +-- .../psiUtil/{jetPsiUtil.kt => ktPsiUtil.kt} | 4 +- .../stubs/elements/KtClassElementType.java | 4 +- .../psi/stubs/elements/KtFileElementType.java | 4 +- .../stubs/elements/KtObjectElementType.java | 4 +- .../kotlin/resolve/BodyResolver.java | 2 +- .../kotlin/resolve/DescriptorResolver.java | 2 +- .../kotlin/resolve/LazyTopDownAnalyzer.kt | 4 +- .../LazyTopDownAnalyzerForTopLevel.java | 2 +- .../resolve/QualifiedExpressionResolver.kt | 4 +- .../kotlin/resolve/ScriptNameUtil.java | 8 +-- .../jetbrains/kotlin/resolve/TypeBinding.kt | 38 +++++----- .../jetbrains/kotlin/resolve/TypeResolver.kt | 2 +- .../kotlin/resolve/VarianceChecker.kt | 6 +- .../evaluate/ConstantExpressionEvaluator.kt | 2 +- .../inline/InlineAnalyzerExtension.java | 4 +- .../resolve/lazy/LazyDeclarationResolver.java | 2 +- .../descriptors/LazyPackageMemberScope.kt | 2 +- .../lazy/descriptors/LazyScriptDescriptor.kt | 10 +-- .../BasicExpressionTypingVisitor.java | 2 +- .../ExpressionTypingVisitorDispatcher.java | 2 +- .../ExpressionTypingVisitorForStatements.java | 2 +- .../PatternMatchingTypingVisitor.java | 2 +- .../FakeLightClassForFileOfPackage.java | 2 +- .../asJava/KotlinJavaFileStubProvider.java | 4 +- .../KtLightClassForExplicitDeclaration.kt | 6 +- .../kotlin/asJava/KtLightClassForFacade.kt | 2 +- .../kotlin/asJava/KtLightParameter.java | 4 +- .../kotlin/cfg/AbstractPseudoValueTest.kt | 4 +- .../kotlin/codegen/CodegenTestFiles.java | 8 +-- .../kotlin/codegen/ScriptGenTest.java | 13 ++-- .../kotlin/parsing/AbstractParsingTest.java | 6 +- .../AbstractDescriptorRendererTest.kt | 4 +- .../kotlin/resolve/MutableDiagnosticsTest.kt | 2 +- .../jetbrains/kotlin/scripts/ScriptTest.java | 14 ++-- .../kotlin/types/AbstractTypeBindingTest.kt | 2 +- .../types/DefaultModalityModifiersTest.java | 2 +- .../java/lazy/types/LazyJavaTypeResolver.kt | 4 +- .../kotlin/builtins/KotlinBuiltIns.java | 46 ++++++------ .../deserialization/AnnotationDeserializer.kt | 2 +- .../resolve/lazy/PartialBodyResolveFilter.kt | 2 +- .../resolve/IDELightClassGenerationSupport.kt | 6 +- .../idea/caches/resolve/KotlinCacheService.kt | 4 +- .../idea/caches/resolve/KotlinResolveCache.kt | 8 +-- .../caches/resolve/ProjectResolutionFacade.kt | 2 +- .../navigation/SourceNavigationHelper.java | 10 +-- .../TypeKindHighlightingVisitor.java | 4 +- .../jetbrains/kotlin/idea/project/Platform.kt | 2 +- .../idea/project/ResolveElementCache.kt | 12 ++-- .../references/BuiltInsReferenceResolver.kt | 4 +- .../KotlinReferencesSearcher.kt | 4 +- .../kotlin/idea/util/PsiPrecedences.kt | 8 +-- .../kotlin/idea/util/ShortenReferences.kt | 2 +- .../kotlin/idea/core/KotlinIndicesHelper.kt | 2 +- idea/src/META-INF/plugin.xml | 6 +- .../idea/actions/KotlinAddImportAction.kt | 6 +- .../internal/CheckPartialBodyResolveAction.kt | 2 +- .../internal/FindImplicitNothingAction.kt | 2 +- .../KotlinFrameExtraVariablesProvider.kt | 4 +- .../breakpoints/KotlinFieldBreakpoint.kt | 2 +- .../breakpoints/KotlinFieldBreakpointType.kt | 2 +- .../kotlin/idea/debugger/debuggerUtil.kt | 2 +- .../evaluate/KotlinEvaluationBuilder.kt | 10 +-- .../idea/editor/KotlinBackspaceHandler.java | 2 +- .../idea/editor/KotlinSmartEnterHandler.kt | 22 ++---- .../idea/editor/KotlinTypedHandler.java | 14 ++-- .../kotlin/idea/editor/LtGtTypingUtils.java | 6 +- .../dialogs/KotlinFindClassUsagesDialog.java | 4 +- .../handlers/KotlinFindClassUsagesHandler.kt | 2 +- .../calls/CalleeReferenceVisitorBase.java | 4 +- .../KotlinCallerMethodsTreeStructure.java | 4 +- ...KotlinHighlightExitPointsHandlerFactory.kt | 2 +- .../idea/imports/KotlinImportOptimizer.kt | 4 +- .../DeprecatedUsageOfStaticField.kt | 2 +- .../UnusedReceiverParameterInspection.kt | 2 +- ...precatedCallableAddReplaceWithIntention.kt | 6 +- .../ObjectLiteralToLambdaIntention.kt | 2 +- .../ConvertMemberToExtensionIntention.kt | 2 +- .../internal/KotlinBytecodeToolWindow.java | 8 +-- .../kotlin/idea/internal/Location.java | 16 ++--- .../projectView/KtClassOrObjectTreeNode.java | 2 +- .../ChangeFunctionLiteralReturnTypeFix.java | 2 +- .../callableBuilder/CallableBuilder.kt | 5 +- ...assFromReferenceExpressionActionFactory.kt | 4 +- .../CreateParameterFromUsageFix.kt | 2 +- .../CallableUsageReplacementStrategy.kt | 2 +- .../idea/refactoring/JetRefactoringUtil.java | 4 +- .../usages/JetCallableDefinitionUsage.java | 4 +- .../inline/KotlinInlineValHandler.java | 10 +-- .../extractableAnalysisUtil.kt | 4 +- .../extractionEngine/extractorUtil.kt | 2 +- .../KotlinIntroduceParameterHandler.kt | 6 +- .../KotlinIntroduceVariableHandler.java | 4 +- .../changePackage/ChangePackageIntention.kt | 2 +- .../ChangePackageToMatchDirectoryIntention.kt | 4 +- ...FileToPackageMatchingDirectoryIntention.kt | 4 +- .../MoveDeclarationToSeparateFileIntention.kt | 4 +- ...MoveKotlinTopLevelDeclarationsProcessor.kt | 4 +- .../MoveKotlinTopLevelDeclarationsDialog.java | 4 +- .../refactoring/pullUp/KotlinPullUpHelper.kt | 4 +- .../pullUp/KotlinPullUpHelperFactory.kt | 2 +- .../rename/RenameKotlinClassProcessor.kt | 10 ++- .../KotlinAnnotatedElementsSearcher.kt | 8 +-- .../kotlin/idea/util/DebuggerUtils.java | 2 +- .../psi/patternMatching/KotlinPsiRange.kt | 4 +- .../translate/general/TranslatorVisitor.java | 2 +- 152 files changed, 465 insertions(+), 474 deletions(-) rename compiler/frontend.java/src/org/jetbrains/kotlin/asJava/{JetJavaMirrorMarker.java => KtJavaMirrorMarker.java} (94%) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{AbstractJetParsing.java => AbstractKotlinParsing.java} (97%) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{JetExpressionParsing.java => KotlinExpressionParsing.java} (98%) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{JetParser.java => KotlinParser.java} (71%) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{JetParserDefinition.java => KotlinParserDefinition.java} (92%) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{JetParsing.java => KotlinParsing.java} (98%) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{JetScriptDefinition.java => KotlinScriptDefinition.java} (87%) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{JetScriptDefinitionProvider.java => KotlinScriptDefinitionProvider.java} (65%) rename compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/{jetPsiUtil.kt => ktPsiUtil.kt} (99%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java index 08dbacb4d9a..5a7d9e3afc1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java @@ -27,7 +27,7 @@ public class CodegenStatementVisitor extends KtVisitor { } @Override - public StackValue visitJetElement(@NotNull KtElement element, StackValue receiver) { + public StackValue visitKtElement(@NotNull KtElement element, StackValue receiver) { return element.accept(codegen, receiver); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index a48aaa08d37..f7cbfc5acac 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -2324,7 +2324,7 @@ public class ExpressionCodegen extends KtVisitor impleme } final Type asmType = - state.getSamWrapperClasses().getSamWrapperClass(samType, expression.getContainingJetFile(), getParentCodegen()); + state.getSamWrapperClasses().getSamWrapperClass(samType, expression.getContainingKtFile(), getParentCodegen()); return StackValue.operation(asmType, new Function1() { @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index b9a5f71f1e7..187afd7e2d8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -1191,7 +1191,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { KtVisitorVoid visitor = new KtVisitorVoid() { @Override - public void visitJetElement(@NotNull KtElement e) { + public void visitKtElement(@NotNull KtElement e) { e.acceptChildren(this); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 92b8c97e76c..d4ca04e442c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -317,7 +317,7 @@ public abstract class MemberCodegen(1)); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java index 4f89f38c3cc..58747e56a1c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java @@ -71,7 +71,7 @@ public final class PsiCodegenPredictor { } } else { - KtFile containingFile = declaration.getContainingJetFile(); + KtFile containingFile = declaration.getContainingKtFile(); if (declaration instanceof KtNamedFunction) { Name name = ((KtNamedFunction) declaration).getNameAsName(); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java index 857a21322e9..5ed81927b6a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java @@ -51,7 +51,7 @@ public class MappingsClassesForWhenByEnum { Type mappingsClassType = Type.getObjectType(mapping.getMappingsClassInternalName()); - mappingsCodegen.generate(mappings, mappingsClassType, expression.getContainingJetFile()); + mappingsCodegen.generate(mappings, mappingsClassType, expression.getContainingKtFile()); generatedMappingClasses.add(mapping.getMappingsClassInternalName()); } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt index 7b9f68cef34..bf1b6a0d9b6 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt @@ -50,8 +50,8 @@ class ModuleVisibilityHelperImpl : ModuleVisibilityHelper { val whatSource = getSourceElement(what) if (whatSource is KotlinSourceElement) { if (moduleVisibilityManager.chunk.size > 1 && fromSource is KotlinSourceElement) { - val fromSourceKotlinFile = fromSource.psi.getContainingJetFile() - val whatSourceKotlinFile = whatSource.psi.getContainingJetFile() + val fromSourceKotlinFile = fromSource.psi.getContainingKtFile() + val whatSourceKotlinFile = whatSource.psi.getContainingKtFile() return findModule(whatSourceKotlinFile) === findModule(fromSourceKotlinFile) } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index 50bbdfe8429..ec1781ae3d1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -137,7 +137,7 @@ public class CompileEnvironmentUtil { } @NotNull - public static List getJetFiles( + public static List getKtFiles( @NotNull final Project project, @NotNull Collection sourceRoots, @NotNull Function1 reportError diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 30b474fbe55..b5c842e309b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -75,8 +75,8 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager -import org.jetbrains.kotlin.parsing.JetParserDefinition -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider +import org.jetbrains.kotlin.parsing.KotlinParserDefinition +import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade @@ -119,7 +119,7 @@ public class KotlinCoreEnvironment private constructor( val index = JvmDependenciesIndex(javaRoots) (fileManager as KotlinCliJavaFileManagerImpl).initIndex(index) - sourceFiles.addAll(CompileEnvironmentUtil.getJetFiles(project, getSourceRootsCheckingForDuplicates(), { + sourceFiles.addAll(CompileEnvironmentUtil.getKtFiles(project, getSourceRootsCheckingForDuplicates(), { message -> report(ERROR, message) })) @@ -129,7 +129,7 @@ public class KotlinCoreEnvironment private constructor( } }) - JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions(configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY)) + KotlinScriptDefinitionProvider.getInstance(project).addScriptDefinitions(configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY)) project.registerService(javaClass(), JvmCliVirtualFileFinderFactory(index)) @@ -356,8 +356,8 @@ public class KotlinCoreEnvironment private constructor( public fun registerApplicationServices(applicationEnvironment: JavaCoreApplicationEnvironment) { with(applicationEnvironment) { registerFileType(KotlinFileType.INSTANCE, "kt") - registerFileType(KotlinFileType.INSTANCE, JetParserDefinition.STD_SCRIPT_SUFFIX) - registerParserDefinition(JetParserDefinition()) + registerFileType(KotlinFileType.INSTANCE, KotlinParserDefinition.STD_SCRIPT_SUFFIX) + registerParserDefinition(KotlinParserDefinition()) getApplication().registerService(javaClass(), KotlinBinaryClassCache()) getApplication().registerService(javaClass(), javaClass()) } @@ -372,7 +372,7 @@ public class KotlinCoreEnvironment private constructor( @JvmStatic public fun registerProjectServices(projectEnvironment: JavaCoreProjectEnvironment) { with (projectEnvironment.getProject()) { - registerService(javaClass(), JetScriptDefinitionProvider()) + registerService(javaClass(), KotlinScriptDefinitionProvider()) registerService(javaClass(), KotlinJavaPsiFacade(this)) registerService(javaClass(), KtLightClassForFacade.FacadeStubCache(this)) } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 173c2b98bcb..8168d06dcb9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -53,8 +53,8 @@ import org.jetbrains.kotlin.modules.Module; import org.jetbrains.kotlin.modules.TargetId; import org.jetbrains.kotlin.modules.TargetIdKt; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; @@ -148,7 +148,7 @@ public class KotlinToJVMBytecodeCompiler { for (Module module : chunk) { ProgressIndicatorAndCompilationCanceledStatus.checkCanceled(); - List jetFiles = CompileEnvironmentUtil.getJetFiles( + List jetFiles = CompileEnvironmentUtil.getKtFiles( environment.getProject(), getAbsolutePaths(directory, module), new Function1() { @Override public Unit invoke(String s) { @@ -276,8 +276,8 @@ public class KotlinToJVMBytecodeCompiler { ) { List scriptParameters = environment.getConfiguration().getList(JVMConfigurationKeys.SCRIPT_PARAMETERS); if (!scriptParameters.isEmpty()) { - JetScriptDefinitionProvider.getInstance(environment.getProject()).addScriptDefinition( - new JetScriptDefinition(".kts", scriptParameters) + KotlinScriptDefinitionProvider.getInstance(environment.getProject()).addScriptDefinition( + new KotlinScriptDefinition(".kts", scriptParameters) ); } GenerationState state = analyzeAndGenerate(environment); diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index 4d4b10a2942..43f6467b7f4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -57,7 +57,7 @@ import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.parsing.JetParserDefinition; +import org.jetbrains.kotlin.parsing.KotlinParserDefinition; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtScript; import org.jetbrains.kotlin.resolve.*; @@ -270,7 +270,7 @@ public class ReplInterpreter { } fullText.append(line); - LightVirtualFile virtualFile = new LightVirtualFile("line" + lineNumber + JetParserDefinition.STD_SCRIPT_EXT, KotlinLanguage.INSTANCE, fullText.toString()); + LightVirtualFile virtualFile = new LightVirtualFile("line" + lineNumber + KotlinParserDefinition.STD_SCRIPT_EXT, KotlinLanguage.INSTANCE, fullText.toString()); virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET); KtFile psiFile = (KtFile) psiFileFactory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false); assert psiFile != null : "Script file not analyzed at line " + lineNumber + ": " + fullText; @@ -459,8 +459,8 @@ public class ReplInterpreter { state.beforeCompile(); KotlinCodegenFacade.generatePackage( state, - script.getContainingJetFile().getPackageFqName(), - Collections.singleton(script.getContainingJetFile()), + script.getContainingKtFile().getPackageFqName(), + Collections.singleton(script.getContainingKtFile()), errorHandler ); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/JetJavaMirrorMarker.java b/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/KtJavaMirrorMarker.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/kotlin/asJava/JetJavaMirrorMarker.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/asJava/KtJavaMirrorMarker.java index 7bb397f6a7c..e9b6cdef1b9 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/JetJavaMirrorMarker.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/KtJavaMirrorMarker.java @@ -16,5 +16,5 @@ package org.jetbrains.kotlin.asJava; -public interface JetJavaMirrorMarker { +public interface KtJavaMirrorMarker { } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt index a3adc3e2957..3db8cb05e88 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt @@ -129,6 +129,6 @@ public val KtFile.javaFileFacadeFqName: FqName } public fun KtDeclaration.isInsideJvmMultifileClassFile() = JvmFileClassUtil.findAnnotationEntryOnFileNoResolve( - getContainingJetFile(), + getContainingKtFile(), JvmFileClassUtil.JVM_MULTIFILE_CLASS_SHORT ) != null diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java index 9013427633b..a19ea01773f 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java @@ -22,7 +22,7 @@ import kotlin.ArraysKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.asJava.JetJavaMirrorMarker; +import org.jetbrains.kotlin.asJava.KtJavaMirrorMarker; import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.FqName; @@ -163,7 +163,7 @@ public class JavaClassImpl extends JavaClassifierImpl implements JavaC @NotNull public OriginKind getOriginKind() { PsiClass psiClass = getPsi(); - if (psiClass instanceof JetJavaMirrorMarker) { + if (psiClass instanceof KtJavaMirrorMarker) { return OriginKind.KOTLIN_LIGHT_CLASS; } else if (psiClass instanceof PsiCompiledElement) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java index d197df71c1b..9abffb18a76 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; public interface KtNodeTypes { - IFileElementType JET_FILE = new IFileElementType(KotlinLanguage.INSTANCE); + IFileElementType KT_FILE = new IFileElementType(KotlinLanguage.INSTANCE); IElementType CLASS = KtStubElementTypes.CLASS; IElementType FUN = KtStubElementTypes.FUNCTION; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index b29bb9d75dd..1efc24011b2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.lexer.KtToken; import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.BindingTrace; @@ -169,7 +169,7 @@ public class JetControlFlowProcessor { } @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { throw new UnsupportedOperationException("[JetControlFlowProcessor] " + element.toString()); } }; @@ -467,7 +467,7 @@ public class JetControlFlowProcessor { Map receiverValues = SmartFMap.emptyMap(); AccessTarget accessTarget = AccessTarget.BlackBox.INSTANCE$; if (left instanceof KtSimpleNameExpression || left instanceof KtQualifiedExpression) { - accessTarget = getResolvedCallAccessTarget(JetPsiUtilKt.getQualifiedElementSelector(left)); + accessTarget = getResolvedCallAccessTarget(KtPsiUtilKt.getQualifiedElementSelector(left)); if (accessTarget instanceof AccessTarget.Call) { receiverValues = getReceiverValues(((AccessTarget.Call) accessTarget).getResolvedCall()); } @@ -1210,7 +1210,7 @@ public class JetControlFlowProcessor { } } else { - visitJetElement(expression); + visitKtElement(expression); createNonSyntheticValue(expression, MagicKind.UNSUPPORTED_ELEMENT, left); } } @@ -1451,7 +1451,7 @@ public class JetControlFlowProcessor { } @Override - public void visitJetFile(@NotNull KtFile file) { + public void visitKtFile(@NotNull KtFile file) { for (KtDeclaration declaration : file.getDeclarations()) { if (declaration instanceof KtProperty) { generateInstructions(declaration); @@ -1466,7 +1466,7 @@ public class JetControlFlowProcessor { } @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { createNonSyntheticValue(element, MagicKind.UNSUPPORTED_ELEMENT); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 59de928aac3..e546f747d1c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -240,7 +240,7 @@ public class JetFlowInformationProvider { } @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { if (!(element instanceof KtExpression || element instanceof KtWhenCondition)) return; if (blockBody && !noExpectedType(expectedReturnType) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java index 5107d6a1410..8d6eec899ee 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.config; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; import java.util.List; @@ -27,5 +27,5 @@ public class CommonConfigurationKeys { // roots, including dependencies and own source public static final CompilerConfigurationKey> CONTENT_ROOTS = CompilerConfigurationKey.create("content roots"); - public static final CompilerConfigurationKey> SCRIPT_DEFINITIONS_KEY = CompilerConfigurationKey.create("script definitions"); + public static final CompilerConfigurationKey> SCRIPT_DEFINITIONS_KEY = CompilerConfigurationKey.create("script definitions"); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/incremental/KotlinLookupLocation.kt b/compiler/frontend/src/org/jetbrains/kotlin/incremental/KotlinLookupLocation.kt index 15d30a931b6..90b2e8ab761 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/incremental/KotlinLookupLocation.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/incremental/KotlinLookupLocation.kt @@ -27,7 +27,7 @@ class KotlinLookupLocation(val element: KtElement) : LookupLocation { override val location: LocationInfo? get() { - val containingJetFile = element.getContainingJetFile() + val containingJetFile = element.getContainingKtFile() if (containingJetFile.doNotAnalyze != null) return null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java index b936873c2dc..1bbf30ec3ba 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java @@ -32,7 +32,7 @@ import java.util.Map; import static org.jetbrains.kotlin.lexer.KtTokens.*; -/*package*/ abstract class AbstractJetParsing { +/*package*/ abstract class AbstractKotlinParsing { private static final Map SOFT_KEYWORD_TEXTS = new HashMap(); static { @@ -52,7 +52,7 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*; protected final SemanticWhitespaceAwarePsiBuilder myBuilder; - public AbstractJetParsing(SemanticWhitespaceAwarePsiBuilder builder) { + public AbstractKotlinParsing(SemanticWhitespaceAwarePsiBuilder builder) { this.myBuilder = builder; } @@ -362,9 +362,9 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*; TrailingCommentsBinder.INSTANCE$); } - protected abstract JetParsing create(SemanticWhitespaceAwarePsiBuilder builder); + protected abstract KotlinParsing create(SemanticWhitespaceAwarePsiBuilder builder); - protected JetParsing createTruncatedBuilder(int eofPosition) { + protected KotlinParsing createTruncatedBuilder(int eofPosition) { return create(new TruncatedSemanticWhitespaceAwarePsiBuilder(myBuilder, eofPosition)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java index 4ee92dcf1ca..ffd17253398 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.KtNodeType; import org.jetbrains.kotlin.KtNodeTypes; import org.jetbrains.kotlin.lexer.KtToken; import org.jetbrains.kotlin.lexer.KtTokens; -import org.jetbrains.kotlin.parsing.JetParsing.NameParsingMode; +import org.jetbrains.kotlin.parsing.KotlinParsing.NameParsingMode; import java.util.Arrays; import java.util.HashSet; @@ -33,9 +33,9 @@ import java.util.Set; import static org.jetbrains.kotlin.KtNodeTypes.*; import static org.jetbrains.kotlin.lexer.KtTokens.*; -import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.DEFAULT; +import static org.jetbrains.kotlin.parsing.KotlinParsing.AnnotationParsingMode.DEFAULT; -public class JetExpressionParsing extends AbstractJetParsing { +public class KotlinExpressionParsing extends AbstractKotlinParsing { private static final TokenSet WHEN_CONDITION_RECOVERY_SET = TokenSet.create(RBRACE, IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS, ELSE_KEYWORD); private static final TokenSet WHEN_CONDITION_RECOVERY_SET_WITH_ARROW = TokenSet.create(RBRACE, IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS, ELSE_KEYWORD, ARROW, DOT); @@ -140,20 +140,20 @@ public class JetExpressionParsing extends AbstractJetParsing { PREFIX(MINUS, PLUS, MINUSMINUS, PLUSPLUS, EXCL) { // annotations @Override - public void parseHigherPrecedence(JetExpressionParsing parser) { + public void parseHigherPrecedence(KotlinExpressionParsing parser) { throw new IllegalStateException("Don't call this method"); } }, AS(AS_KEYWORD, AS_SAFE) { @Override - public KtNodeType parseRightHandSide(IElementType operation, JetExpressionParsing parser) { + public KtNodeType parseRightHandSide(IElementType operation, KotlinExpressionParsing parser) { parser.myJetParsing.parseTypeRef(); return BINARY_WITH_TYPE; } @Override - public void parseHigherPrecedence(JetExpressionParsing parser) { + public void parseHigherPrecedence(KotlinExpressionParsing parser) { parser.parsePrefixExpression(); } }, @@ -165,7 +165,7 @@ public class JetExpressionParsing extends AbstractJetParsing { ELVIS(KtTokens.ELVIS), IN_OR_IS(IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS) { @Override - public KtNodeType parseRightHandSide(IElementType operation, JetExpressionParsing parser) { + public KtNodeType parseRightHandSide(IElementType operation, KotlinExpressionParsing parser) { if (operation == IS_KEYWORD || operation == NOT_IS) { parser.myJetParsing.parseTypeRef(); return IS_EXPRESSION; @@ -197,7 +197,7 @@ public class JetExpressionParsing extends AbstractJetParsing { this.operations = TokenSet.create(operations); } - public void parseHigherPrecedence(JetExpressionParsing parser) { + public void parseHigherPrecedence(KotlinExpressionParsing parser) { assert higher != null; parser.parseBinaryExpression(higher); } @@ -208,7 +208,7 @@ public class JetExpressionParsing extends AbstractJetParsing { * @param parser the parser object * @return node type of the result */ - public KtNodeType parseRightHandSide(IElementType operation, JetExpressionParsing parser) { + public KtNodeType parseRightHandSide(IElementType operation, KotlinExpressionParsing parser) { parseHigherPrecedence(parser); return BINARY_EXPRESSION; } @@ -257,9 +257,9 @@ public class JetExpressionParsing extends AbstractJetParsing { } - private final JetParsing myJetParsing; + private final KotlinParsing myJetParsing; - public JetExpressionParsing(SemanticWhitespaceAwarePsiBuilder builder, JetParsing jetParsing) { + public KotlinExpressionParsing(SemanticWhitespaceAwarePsiBuilder builder, KotlinParsing jetParsing) { super(builder); myJetParsing = jetParsing; } @@ -1023,7 +1023,7 @@ public class JetExpressionParsing extends AbstractJetParsing { */ private boolean parseLocalDeclaration() { PsiBuilder.Marker decl = mark(); - JetParsing.ModifierDetector detector = new JetParsing.ModifierDetector(); + KotlinParsing.ModifierDetector detector = new KotlinParsing.ModifierDetector(); myJetParsing.parseModifierList(detector, DEFAULT, TokenSet.EMPTY); IElementType declType = parseLocalDeclarationRest(detector.isEnumDetected()); @@ -1767,7 +1767,7 @@ public class JetExpressionParsing extends AbstractJetParsing { } @Override - protected JetParsing create(SemanticWhitespaceAwarePsiBuilder builder) { + protected KotlinParsing create(SemanticWhitespaceAwarePsiBuilder builder) { return myJetParsing.create(builder); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParser.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParser.java similarity index 71% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParser.java rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParser.java index 18315eed435..9f8e5f0ee29 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParser.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParser.java @@ -24,12 +24,12 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; -public class JetParser implements PsiParser { +public class KotlinParser implements PsiParser { - private final JetScriptDefinitionProvider scriptDefinitionProvider; + private final KotlinScriptDefinitionProvider scriptDefinitionProvider; - public JetParser(Project project) { - scriptDefinitionProvider = JetScriptDefinitionProvider.getInstance(project); + public KotlinParser(Project project) { + scriptDefinitionProvider = KotlinScriptDefinitionProvider.getInstance(project); } @Override @@ -41,9 +41,9 @@ public class JetParser implements PsiParser { // we need this method because we need psiFile @NotNull public ASTNode parse(IElementType iElementType, PsiBuilder psiBuilder, PsiFile psiFile) { - JetParsing jetParsing = JetParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); + KotlinParsing jetParsing = KotlinParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); if (scriptDefinitionProvider != null && scriptDefinitionProvider.isScript(psiFile) - || psiFile.getName().endsWith(JetParserDefinition.STD_SCRIPT_EXT)) { + || psiFile.getName().endsWith(KotlinParserDefinition.STD_SCRIPT_EXT)) { jetParsing.parseScript(); } else { @@ -54,21 +54,21 @@ public class JetParser implements PsiParser { @NotNull public static ASTNode parseTypeCodeFragment(PsiBuilder psiBuilder) { - JetParsing jetParsing = JetParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); + KotlinParsing jetParsing = KotlinParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); jetParsing.parseTypeCodeFragment(); return psiBuilder.getTreeBuilt(); } @NotNull public static ASTNode parseExpressionCodeFragment(PsiBuilder psiBuilder) { - JetParsing jetParsing = JetParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); + KotlinParsing jetParsing = KotlinParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); jetParsing.parseExpressionCodeFragment(); return psiBuilder.getTreeBuilt(); } @NotNull public static ASTNode parseBlockCodeFragment(PsiBuilder psiBuilder) { - JetParsing jetParsing = JetParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); + KotlinParsing jetParsing = KotlinParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)); jetParsing.parseBlockCodeFragment(); return psiBuilder.getTreeBuilt(); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParserDefinition.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParserDefinition.java index ef2a7bbb93b..8a18c7b7549 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParserDefinition.java @@ -42,11 +42,11 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementType; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; -public class JetParserDefinition implements ParserDefinition { +public class KotlinParserDefinition implements ParserDefinition { public static final String STD_SCRIPT_SUFFIX = "kts"; public static final String STD_SCRIPT_EXT = "." + STD_SCRIPT_SUFFIX; - public JetParserDefinition() { + public KotlinParserDefinition() { //todo: ApplicationManager.getApplication() is null during JetParsingTest setting up /*if (!ApplicationManager.getApplication().isCommandLine()) { @@ -54,8 +54,8 @@ public class JetParserDefinition implements ParserDefinition { } @NotNull - public static JetParserDefinition getInstance() { - return (JetParserDefinition)LanguageParserDefinitions.INSTANCE.forLanguage(KotlinLanguage.INSTANCE); + public static KotlinParserDefinition getInstance() { + return (KotlinParserDefinition)LanguageParserDefinitions.INSTANCE.forLanguage(KotlinLanguage.INSTANCE); } @Override @@ -66,7 +66,7 @@ public class JetParserDefinition implements ParserDefinition { @Override public PsiParser createParser(Project project) { - return new JetParser(project); + return new KotlinParser(project); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java index 4c41f37ea25..1ba880d3026 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java @@ -31,10 +31,10 @@ import java.util.Map; import static org.jetbrains.kotlin.KtNodeTypes.*; import static org.jetbrains.kotlin.lexer.KtTokens.*; -import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.*; +import static org.jetbrains.kotlin.parsing.KotlinParsing.AnnotationParsingMode.*; -public class JetParsing extends AbstractJetParsing { - private static final Logger LOG = Logger.getInstance(JetParsing.class); +public class KotlinParsing extends AbstractKotlinParsing { + private static final Logger LOG = Logger.getInstance(KotlinParsing.class); // TODO: token sets to constants, including derived methods public static final Map MODIFIER_KEYWORD_MAP = new HashMap(); @@ -66,16 +66,16 @@ public class JetParsing extends AbstractJetParsing { private static final TokenSet ANNOTATION_TARGETS = TokenSet.create( FILE_KEYWORD, FIELD_KEYWORD, GET_KEYWORD, SET_KEYWORD, PROPERTY_KEYWORD, RECEIVER_KEYWORD, PARAM_KEYWORD, SETPARAM_KEYWORD); - static JetParsing createForTopLevel(SemanticWhitespaceAwarePsiBuilder builder) { - JetParsing jetParsing = new JetParsing(builder); - jetParsing.myExpressionParsing = new JetExpressionParsing(builder, jetParsing); + static KotlinParsing createForTopLevel(SemanticWhitespaceAwarePsiBuilder builder) { + KotlinParsing jetParsing = new KotlinParsing(builder); + jetParsing.myExpressionParsing = new KotlinExpressionParsing(builder, jetParsing); return jetParsing; } - private static JetParsing createForByClause(SemanticWhitespaceAwarePsiBuilder builder) { + private static KotlinParsing createForByClause(SemanticWhitespaceAwarePsiBuilder builder) { final SemanticWhitespaceAwarePsiBuilderForByClause builderForByClause = new SemanticWhitespaceAwarePsiBuilderForByClause(builder); - JetParsing jetParsing = new JetParsing(builderForByClause); - jetParsing.myExpressionParsing = new JetExpressionParsing(builderForByClause, jetParsing) { + KotlinParsing jetParsing = new KotlinParsing(builderForByClause); + jetParsing.myExpressionParsing = new KotlinExpressionParsing(builderForByClause, jetParsing) { @Override protected boolean parseCallWithClosure() { if (builderForByClause.getStackSize() > 0) { @@ -85,16 +85,16 @@ public class JetParsing extends AbstractJetParsing { } @Override - protected JetParsing create(SemanticWhitespaceAwarePsiBuilder builder) { + protected KotlinParsing create(SemanticWhitespaceAwarePsiBuilder builder) { return createForByClause(builder); } }; return jetParsing; } - private JetExpressionParsing myExpressionParsing; + private KotlinExpressionParsing myExpressionParsing; - private JetParsing(SemanticWhitespaceAwarePsiBuilder builder) { + private KotlinParsing(SemanticWhitespaceAwarePsiBuilder builder) { super(builder); } @@ -112,7 +112,7 @@ public class JetParsing extends AbstractJetParsing { parseTopLevelDeclaration(); } - fileMarker.done(JET_FILE); + fileMarker.done(KT_FILE); } void parseTypeCodeFragment() { @@ -166,7 +166,7 @@ public class JetParsing extends AbstractJetParsing { blockMarker.done(BLOCK); scriptMarker.done(SCRIPT); - fileMarker.done(JET_FILE); + fileMarker.done(KT_FILE); } private void checkForUnexpectedSymbols() { @@ -1946,7 +1946,7 @@ public class JetParsing extends AbstractJetParsing { recoverOnParenthesizedWordForPlatformTypes(0, "Mutable", true); if (expect(IDENTIFIER, "Expecting type name", - TokenSet.orSet(JetExpressionParsing.EXPRESSION_FIRST, JetExpressionParsing.EXPRESSION_FOLLOW, DECLARATION_FIRST))) { + TokenSet.orSet(KotlinExpressionParsing.EXPRESSION_FIRST, KotlinExpressionParsing.EXPRESSION_FOLLOW, DECLARATION_FIRST))) { reference.done(REFERENCE_EXPRESSION); } else { @@ -2240,7 +2240,7 @@ public class JetParsing extends AbstractJetParsing { } @Override - protected JetParsing create(SemanticWhitespaceAwarePsiBuilder builder) { + protected KotlinParsing create(SemanticWhitespaceAwarePsiBuilder builder) { return createForTopLevel(builder); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinition.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinition.java index e4032dde452..4cfc04d81a3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinition.java @@ -24,11 +24,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -public class JetScriptDefinition { +public class KotlinScriptDefinition { private final String extension; private final List parameters; - public JetScriptDefinition(String extension, List scriptParameters) { + public KotlinScriptDefinition(String extension, List scriptParameters) { this.extension = extension; parameters = scriptParameters == null ? Collections.emptyList() : scriptParameters; } @@ -41,7 +41,7 @@ public class JetScriptDefinition { return paths; } - public JetScriptDefinition(String extension, AnalyzerScriptParameter... scriptParameters) { + public KotlinScriptDefinition(String extension, AnalyzerScriptParameter... scriptParameters) { this(extension, Arrays.asList(scriptParameters)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinitionProvider.java similarity index 65% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinitionProvider.java index d10dfc2b6d4..22c5818b508 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinitionProvider.java @@ -25,17 +25,18 @@ import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import java.util.*; -public class JetScriptDefinitionProvider { - private final Map scripts = new HashMap(); +public class KotlinScriptDefinitionProvider { + private final Map scripts = new HashMap(); private final Set scriptsFiles = new HashSet(); - private static final JetScriptDefinition standardScript = new JetScriptDefinition(JetParserDefinition.STD_SCRIPT_EXT, Collections.emptyList()); + private static final KotlinScriptDefinition + standardScript = new KotlinScriptDefinition(KotlinParserDefinition.STD_SCRIPT_EXT, Collections.emptyList()); - public static JetScriptDefinitionProvider getInstance(Project project) { - return ServiceManager.getService(project, JetScriptDefinitionProvider.class); + public static KotlinScriptDefinitionProvider getInstance(Project project) { + return ServiceManager.getService(project, KotlinScriptDefinitionProvider.class); } - public JetScriptDefinitionProvider() { + public KotlinScriptDefinitionProvider() { // .kts will take analyzer parameters explicitly specified on compilation addScriptDefinition(standardScript); } @@ -44,11 +45,11 @@ public class JetScriptDefinitionProvider { scriptsFiles.add(file); } - public JetScriptDefinition findScriptDefinition(PsiFile psiFile) { + public KotlinScriptDefinition findScriptDefinition(PsiFile psiFile) { boolean force = scriptsFiles.contains(psiFile); String name = psiFile.getName(); - for (Map.Entry e : scripts.entrySet()) { + for (Map.Entry e : scripts.entrySet()) { if (name.endsWith(e.getKey())) { return e.getValue(); } @@ -63,12 +64,12 @@ public class JetScriptDefinitionProvider { return findScriptDefinition(psiFile) != null; } - public void addScriptDefinition(@NotNull JetScriptDefinition scriptDefinition) { + public void addScriptDefinition(@NotNull KotlinScriptDefinition scriptDefinition) { scripts.put(scriptDefinition.getExtension(), scriptDefinition); } - public void addScriptDefinitions(List definitions) { - for (JetScriptDefinition definition : definitions) { + public void addScriptDefinitions(List definitions) { + for (KotlinScriptDefinition definition : definitions) { addScriptDefinition(definition); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt index 8beef14a90f..e816c7ba65f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt @@ -42,11 +42,11 @@ private object DebugTextBuildingVisitor : KtVisitor() { private val LOG = Logger.getInstance(this.javaClass) - override fun visitJetFile(file: KtFile, data: Unit?): String? { + override fun visitKtFile(file: KtFile, data: Unit?): String? { return "STUB file: ${file.getName()}" } - override fun visitJetElement(element: KtElement, data: Unit?): String? { + override fun visitKtElement(element: KtElement, data: Unit?): String? { if (element is KtElementImplStub<*>) { LOG.error("getDebugText() is not defined for ${element.javaClass}") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotatedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotatedExpression.java index dea9213c860..e99562edee4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotatedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotatedExpression.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.KtNodeTypes; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import java.util.List; @@ -48,6 +48,6 @@ public class KtAnnotatedExpression extends KtExpressionImpl implements KtAnnotat @Override @NotNull public List getAnnotationEntries() { - return JetPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); + return KtPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragmentType.java index 1ef1eefb08c..fe57dbba5c3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragmentType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragmentType.java @@ -23,7 +23,7 @@ import com.intellij.lang.PsiBuilderFactory; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.parsing.JetParser; +import org.jetbrains.kotlin.parsing.KotlinParser; import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType; public class KtBlockCodeFragmentType extends KtFileElementType { @@ -44,7 +44,7 @@ public class KtBlockCodeFragmentType extends KtFileElementType { Project project = psi.getProject(); Language languageForParser = getLanguageForParser(psi); PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars()); - return JetParser.parseBlockCodeFragment(builder).getFirstChildNode(); + return KotlinParser.parseBlockCodeFragment(builder).getFirstChildNode(); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt index 09b7601c894..b4165e21e03 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt @@ -109,7 +109,7 @@ abstract public class KtClassOrObject : public override fun delete() { CheckUtil.checkWritable(this); - val file = getContainingJetFile(); + val file = getContainingKtFile(); if (!isTopLevel() || file.getDeclarations().size() > 1) { CodeEditUtil.removeChild(getParent().getNode(), getNode()); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElement.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElement.kt index f3a263b14c1..13586e96202 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElement.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElement.kt @@ -20,7 +20,7 @@ import com.intellij.psi.NavigatablePsiElement import com.intellij.psi.PsiReference public interface KtElement : NavigatablePsiElement { - public fun getContainingJetFile(): KtFile + public fun getContainingKtFile(): KtFile public fun acceptChildren(visitor: KtVisitor, data: D) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java index 9508aba36a3..63242bf636e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java @@ -55,7 +55,7 @@ public class KtElementImpl extends ASTWrapperPsiElement implements KtElement { @NotNull @Override - public KtFile getContainingJetFile() { + public KtFile getContainingKtFile() { PsiFile file = getContainingFile(); assert file instanceof KtFile : "JetElement not inside JetFile: " + file + " " + file.getText(); return (KtFile) file; @@ -68,7 +68,7 @@ public class KtElementImpl extends ASTWrapperPsiElement implements KtElement { @Override public R accept(@NotNull KtVisitor visitor, D data) { - return visitor.visitJetElement(this, data); + return visitor.visitKtElement(this, data); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImplStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImplStub.java index b826d3775aa..97234ee2d3e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImplStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImplStub.java @@ -63,7 +63,7 @@ public class KtElementImplStub> extends StubBasedPsiEle @NotNull @Override - public KtFile getContainingJetFile() { + public KtFile getContainingKtFile() { PsiFile file = getContainingFile(); assert file instanceof KtFile : "JetElement not inside JetFile: " + file + " " + file.getText(); return (KtFile) file; @@ -82,7 +82,7 @@ public class KtElementImplStub> extends StubBasedPsiEle @Override public R accept(@NotNull KtVisitor visitor, D data) { - return visitor.visitJetElement(this, data); + return visitor.visitKtElement(this, data); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragmentType.java index 0a7cbd1bb5d..b562e239110 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragmentType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragmentType.java @@ -23,7 +23,7 @@ import com.intellij.lang.PsiBuilderFactory; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.parsing.JetParser; +import org.jetbrains.kotlin.parsing.KotlinParser; import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType; public class KtExpressionCodeFragmentType extends KtFileElementType { @@ -44,6 +44,6 @@ public class KtExpressionCodeFragmentType extends KtFileElementType { Project project = psi.getProject(); Language languageForParser = getLanguageForParser(psi); PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars()); - return JetParser.parseExpressionCodeFragment(builder).getFirstChildNode(); + return KotlinParser.parseExpressionCodeFragment(builder).getFirstChildNode(); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java index f98e3038352..b9485f91726 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java @@ -207,7 +207,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn @NotNull @Override - public KtFile getContainingJetFile() { + public KtFile getContainingKtFile() { return this; } @@ -218,7 +218,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn @Override public R accept(@NotNull KtVisitor visitor, D data) { - return visitor.visitJetFile(this, data); + return visitor.visitKtFile(this, data); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFileAnnotationList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFileAnnotationList.java index f962bcbfb95..39a38eadbce 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFileAnnotationList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFileAnnotationList.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; @@ -47,6 +47,6 @@ public class KtFileAnnotationList extends KtElementImplStub getAnnotationEntries() { - return JetPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); + return KtPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtModifierList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtModifierList.java index 5e4aa141482..c5271219829 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtModifierList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtModifierList.java @@ -22,7 +22,7 @@ import com.intellij.psi.stubs.IStubElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.KtModifierKeywordToken; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; @@ -50,7 +50,7 @@ public abstract class KtModifierList extends KtElementImplStub getAnnotationEntries() { - return JetPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); + return KtPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); } public boolean hasModifier(@NotNull KtModifierKeywordToken tokenType) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtOperationReferenceExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtOperationReferenceExpression.kt index 8777e88fa7c..a81d70bc9b4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtOperationReferenceExpression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtOperationReferenceExpression.kt @@ -22,11 +22,11 @@ import com.intellij.psi.impl.source.tree.TreeElement import org.jetbrains.kotlin.lexer.KtSingleValueToken import org.jetbrains.kotlin.lexer.KtToken import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.parsing.JetExpressionParsing +import org.jetbrains.kotlin.parsing.KotlinExpressionParsing import org.jetbrains.kotlin.types.expressions.OperatorConventions public class KtOperationReferenceExpression(node: ASTNode) : KtSimpleNameExpressionImpl(node) { - override fun getReferencedNameElement() = findChildByType(JetExpressionParsing.ALL_OPERATIONS) ?: this + override fun getReferencedNameElement() = findChildByType(KotlinExpressionParsing.ALL_OPERATIONS) ?: this fun getNameForConventionalOperation(unaryOperations: Boolean = true, binaryOperations: Boolean = true): Name? { val operator = (firstChild as? TreeElement)?.elementType as? KtToken ?: return null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPackageDirective.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPackageDirective.java index 3e1337815b9..a16d35cc9bf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPackageDirective.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPackageDirective.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; @@ -80,7 +80,7 @@ public class KtPackageDirective extends KtModifierListOwnerStub shadowedElements = new HashSet(); KtVisitorVoid shadowAllChildren = new KtVisitorVoid() { @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { if (shadowedElements.add(element)) { element.acceptChildren(this); } @@ -263,12 +263,12 @@ public class KtPsiUtil { @Nullable public static KtSimpleNameExpression getLastReference(@NotNull KtExpression importedReference) { - KtElement selector = JetPsiUtilKt.getQualifiedElementSelector(importedReference); + KtElement selector = KtPsiUtilKt.getQualifiedElementSelector(importedReference); return selector instanceof KtSimpleNameExpression ? (KtSimpleNameExpression) selector : null; } public static boolean isSelectorInQualified(@NotNull KtSimpleNameExpression nameExpression) { - KtElement qualifiedElement = JetPsiUtilKt.getQualifiedElement(nameExpression); + KtElement qualifiedElement = KtPsiUtilKt.getQualifiedElement(nameExpression); return qualifiedElement instanceof KtQualifiedExpression || ((qualifiedElement instanceof KtUserType) && ((KtUserType) qualifiedElement).getQualifier() != null); } @@ -426,7 +426,7 @@ public class KtPsiUtil { private static int getPriority(@NotNull KtExpression expression) { - int maxPriority = JetExpressionParsing.Precedence.values().length + 1; + int maxPriority = KotlinExpressionParsing.Precedence.values().length + 1; // same as postfix operations if (expression instanceof KtPostfixExpression || @@ -439,7 +439,7 @@ public class KtPsiUtil { if (expression instanceof KtPrefixExpression || expression instanceof KtLabeledExpression) return maxPriority - 2; if (expression instanceof KtIfExpression) { - return JetExpressionParsing.Precedence.ASSIGNMENT.ordinal(); + return KotlinExpressionParsing.Precedence.ASSIGNMENT.ordinal(); } if (expression instanceof KtSuperExpression) { @@ -451,8 +451,8 @@ public class KtPsiUtil { } IElementType operation = getOperation(expression); - for (JetExpressionParsing.Precedence precedence : JetExpressionParsing.Precedence.values()) { - if (precedence != JetExpressionParsing.Precedence.PREFIX && precedence != JetExpressionParsing.Precedence.POSTFIX && + for (KotlinExpressionParsing.Precedence precedence : KotlinExpressionParsing.Precedence.values()) { + if (precedence != KotlinExpressionParsing.Precedence.PREFIX && precedence != KotlinExpressionParsing.Precedence.POSTFIX && precedence.getOperations().contains(operation)) { return maxPriority - precedence.ordinal() - 1; } @@ -498,7 +498,7 @@ public class KtPsiUtil { if (parentExpression instanceof KtCallExpression && currentInner == ((KtCallExpression) parentExpression).getCalleeExpression()) { if (innerExpression instanceof KtSimpleNameExpression) return false; - if (JetPsiUtilKt.getQualifiedExpressionForSelector(parentExpression) != null) return true; + if (KtPsiUtilKt.getQualifiedExpressionForSelector(parentExpression) != null) return true; return !(innerExpression instanceof KtThisExpression || innerExpression instanceof KtArrayAccessExpression || innerExpression instanceof KtConstantExpression @@ -649,7 +649,7 @@ public class KtPsiUtil { root.accept( new KtVisitorVoid() { @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { if (predicate.apply(element)) { //noinspection unchecked results.add(element); @@ -709,7 +709,7 @@ public class KtPsiUtil { @Nullable public static String getPackageName(@NotNull KtElement element) { - KtFile file = element.getContainingJetFile(); + KtFile file = element.getContainingKtFile(); KtPackageDirective header = PsiTreeUtil.findChildOfType(file, KtPackageDirective.class); return header != null ? header.getQualifiedName() : null; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTreeVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTreeVisitor.java index 5094da0fb7e..49f88fed7ca 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTreeVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTreeVisitor.java @@ -20,14 +20,14 @@ import org.jetbrains.annotations.NotNull; public class KtTreeVisitor extends KtVisitor { @Override - public Void visitJetElement(@NotNull KtElement element, D data) { + public Void visitKtElement(@NotNull KtElement element, D data) { element.acceptChildren(this, data); return null; } @Override - public Void visitJetFile(@NotNull KtFile file, D data) { - super.visitJetFile(file, data); + public Void visitKtFile(@NotNull KtFile file, D data) { + super.visitKtFile(file, data); file.acceptChildren(this, data); return null; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeCodeFragmentType.java index c2fee791ddc..8a450760088 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeCodeFragmentType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeCodeFragmentType.java @@ -23,7 +23,7 @@ import com.intellij.lang.PsiBuilderFactory; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.parsing.JetParser; +import org.jetbrains.kotlin.parsing.KotlinParser; import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType; public class KtTypeCodeFragmentType extends KtFileElementType { @@ -44,6 +44,6 @@ public class KtTypeCodeFragmentType extends KtFileElementType { Project project = psi.getProject(); Language languageForParser = getLanguageForParser(psi); PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars()); - return JetParser.parseTypeCodeFragment(builder).getFirstChildNode(); + return KotlinParser.parseTypeCodeFragment(builder).getFirstChildNode(); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java index 5f9def0902f..a831205e8f1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElementVisitor; import org.jetbrains.annotations.NotNull; public class KtVisitor extends PsiElementVisitor { - public R visitJetElement(@NotNull KtElement element, D data) { + public R visitKtElement(@NotNull KtElement element, D data) { visitElement(element); return null; } @@ -69,7 +69,7 @@ public class KtVisitor extends PsiElementVisitor { return visitNamedDeclaration(typedef, data); } - public R visitJetFile(@NotNull KtFile file, D data) { + public R visitKtFile(@NotNull KtFile file, D data) { visitFile(file); return null; } @@ -79,43 +79,43 @@ public class KtVisitor extends PsiElementVisitor { } public R visitImportDirective(@NotNull KtImportDirective importDirective, D data) { - return visitJetElement(importDirective, data); + return visitKtElement(importDirective, data); } public R visitImportList(@NotNull KtImportList importList, D data) { - return visitJetElement(importList, data); + return visitKtElement(importList, data); } public R visitFileAnnotationList(@NotNull KtFileAnnotationList fileAnnotationList, D data) { - return visitJetElement(fileAnnotationList, data); + return visitKtElement(fileAnnotationList, data); } public R visitClassBody(@NotNull KtClassBody classBody, D data) { - return visitJetElement(classBody, data); + return visitKtElement(classBody, data); } public R visitModifierList(@NotNull KtModifierList list, D data) { - return visitJetElement(list, data); + return visitKtElement(list, data); } public R visitAnnotation(@NotNull KtAnnotation annotation, D data) { - return visitJetElement(annotation, data); + return visitKtElement(annotation, data); } public R visitAnnotationEntry(@NotNull KtAnnotationEntry annotationEntry, D data) { - return visitJetElement(annotationEntry, data); + return visitKtElement(annotationEntry, data); } public R visitAnnotationUseSiteTarget(@NotNull KtAnnotationUseSiteTarget annotationTarget, D data) { - return visitJetElement(annotationTarget, data); + return visitKtElement(annotationTarget, data); } public R visitConstructorCalleeExpression(@NotNull KtConstructorCalleeExpression constructorCalleeExpression, D data) { - return visitJetElement(constructorCalleeExpression, data); + return visitKtElement(constructorCalleeExpression, data); } public R visitTypeParameterList(@NotNull KtTypeParameterList list, D data) { - return visitJetElement(list, data); + return visitKtElement(list, data); } public R visitTypeParameter(@NotNull KtTypeParameter parameter, D data) { @@ -127,7 +127,7 @@ public class KtVisitor extends PsiElementVisitor { } public R visitParameterList(@NotNull KtParameterList list, D data) { - return visitJetElement(list, data); + return visitKtElement(list, data); } public R visitParameter(@NotNull KtParameter parameter, D data) { @@ -135,11 +135,11 @@ public class KtVisitor extends PsiElementVisitor { } public R visitDelegationSpecifierList(@NotNull KtDelegationSpecifierList list, D data) { - return visitJetElement(list, data); + return visitKtElement(list, data); } public R visitDelegationSpecifier(@NotNull KtDelegationSpecifier specifier, D data) { - return visitJetElement(specifier, data); + return visitKtElement(specifier, data); } public R visitDelegationByExpressionSpecifier(@NotNull KtDelegatorByExpressionSpecifier specifier, D data) { @@ -155,27 +155,27 @@ public class KtVisitor extends PsiElementVisitor { } public R visitConstructorDelegationCall(@NotNull KtConstructorDelegationCall call, D data) { - return visitJetElement(call, data); + return visitKtElement(call, data); } public R visitPropertyDelegate(@NotNull KtPropertyDelegate delegate, D data) { - return visitJetElement(delegate, data); + return visitKtElement(delegate, data); } public R visitTypeReference(@NotNull KtTypeReference typeReference, D data) { - return visitJetElement(typeReference, data); + return visitKtElement(typeReference, data); } public R visitValueArgumentList(@NotNull KtValueArgumentList list, D data) { - return visitJetElement(list, data); + return visitKtElement(list, data); } public R visitArgument(@NotNull KtValueArgument argument, D data) { - return visitJetElement(argument, data); + return visitKtElement(argument, data); } public R visitExpression(@NotNull KtExpression expression, D data) { - return visitJetElement(expression, data); + return visitKtElement(expression, data); } public R visitLoopExpression(@NotNull KtLoopExpression loopExpression, D data) { @@ -311,15 +311,15 @@ public class KtVisitor extends PsiElementVisitor { } public R visitCatchSection(@NotNull KtCatchClause catchClause, D data) { - return visitJetElement(catchClause, data); + return visitKtElement(catchClause, data); } public R visitFinallySection(@NotNull KtFinallySection finallySection, D data) { - return visitJetElement(finallySection, data); + return visitKtElement(finallySection, data); } public R visitTypeArgumentList(@NotNull KtTypeArgumentList typeArgumentList, D data) { - return visitJetElement(typeArgumentList, data); + return visitKtElement(typeArgumentList, data); } public R visitThisExpression(@NotNull KtThisExpression expression, D data) { @@ -335,7 +335,7 @@ public class KtVisitor extends PsiElementVisitor { } public R visitInitializerList(@NotNull KtInitializerList list, D data) { - return visitJetElement(list, data); + return visitKtElement(list, data); } public R visitAnonymousInitializer(@NotNull KtClassInitializer initializer, D data) { @@ -347,15 +347,15 @@ public class KtVisitor extends PsiElementVisitor { } public R visitTypeConstraintList(@NotNull KtTypeConstraintList list, D data) { - return visitJetElement(list, data); + return visitKtElement(list, data); } public R visitTypeConstraint(@NotNull KtTypeConstraint constraint, D data) { - return visitJetElement(constraint, data); + return visitKtElement(constraint, data); } private R visitTypeElement(@NotNull KtTypeElement type, D data) { - return visitJetElement(type, data); + return visitKtElement(type, data); } public R visitUserType(@NotNull KtUserType type, D data) { @@ -391,11 +391,11 @@ public class KtVisitor extends PsiElementVisitor { } public R visitTypeProjection(@NotNull KtTypeProjection typeProjection, D data) { - return visitJetElement(typeProjection, data); + return visitKtElement(typeProjection, data); } public R visitWhenEntry(@NotNull KtWhenEntry jetWhenEntry, D data) { - return visitJetElement(jetWhenEntry, data); + return visitKtElement(jetWhenEntry, data); } public R visitIsExpression(@NotNull KtIsExpression expression, D data) { @@ -403,19 +403,19 @@ public class KtVisitor extends PsiElementVisitor { } public R visitWhenConditionIsPattern(@NotNull KtWhenConditionIsPattern condition, D data) { - return visitJetElement(condition, data); + return visitKtElement(condition, data); } public R visitWhenConditionInRange(@NotNull KtWhenConditionInRange condition, D data) { - return visitJetElement(condition, data); + return visitKtElement(condition, data); } public R visitWhenConditionWithExpression(@NotNull KtWhenConditionWithExpression condition, D data) { - return visitJetElement(condition, data); + return visitKtElement(condition, data); } public R visitStringTemplateEntry(@NotNull KtStringTemplateEntry entry, D data) { - return visitJetElement(entry, data); + return visitKtElement(entry, data); } public R visitStringTemplateEntryWithExpression(@NotNull KtStringTemplateEntryWithExpression entry, D data) { @@ -439,6 +439,6 @@ public class KtVisitor extends PsiElementVisitor { } public R visitPackageDirective(@NotNull KtPackageDirective directive, D data) { - return visitJetElement(directive, data); + return visitKtElement(directive, data); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java index 921204a52c5..af55eeeec9d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull; public class KtVisitorVoid extends KtVisitor { // methods with void return - public void visitJetElement(@NotNull KtElement element) { - super.visitJetElement(element, null); + public void visitKtElement(@NotNull KtElement element) { + super.visitKtElement(element, null); } public void visitDeclaration(@NotNull KtDeclaration dcl) { @@ -65,8 +65,8 @@ public class KtVisitorVoid extends KtVisitor { super.visitTypedef(typedef, null); } - public void visitJetFile(@NotNull KtFile file) { - super.visitJetFile(file, null); + public void visitKtFile(@NotNull KtFile file) { + super.visitKtFile(file, null); } public void visitScript(@NotNull KtScript script) { @@ -431,8 +431,8 @@ public class KtVisitorVoid extends KtVisitor { // hidden methods @Override - public final Void visitJetElement(@NotNull KtElement element, Void data) { - visitJetElement(element); + public final Void visitKtElement(@NotNull KtElement element, Void data) { + visitKtElement(element); return null; } @@ -497,8 +497,8 @@ public class KtVisitorVoid extends KtVisitor { } @Override - public final Void visitJetFile(@NotNull KtFile file, Void data) { - visitJetFile(file); + public final Void visitKtFile(@NotNull KtFile file, Void data) { + visitKtFile(file); return null; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java index 438b6b01de0..29bd2c594e0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java @@ -23,7 +23,7 @@ public class KtVisitorVoidWithParameter

extends KtVisitor { // methods with parameter public void visitJetElementVoid(@NotNull KtElement element, P data) { - super.visitJetElement(element, data); + super.visitKtElement(element, data); } public void visitDeclarationVoid(@NotNull KtDeclaration dcl, P data) { @@ -63,7 +63,7 @@ public class KtVisitorVoidWithParameter

extends KtVisitor { } public void visitJetFileVoid(@NotNull KtFile file, P data) { - super.visitJetFile(file, data); + super.visitKtFile(file, data); } public void visitScriptVoid(@NotNull KtScript script, P data) { @@ -424,7 +424,7 @@ public class KtVisitorVoidWithParameter

extends KtVisitor { // hidden methods @Override - public final Void visitJetElement(@NotNull KtElement element, P data) { + public final Void visitKtElement(@NotNull KtElement element, P data) { visitJetElementVoid(element, data); return null; } @@ -478,7 +478,7 @@ public class KtVisitorVoidWithParameter

extends KtVisitor { } @Override - public final Void visitJetFile(@NotNull KtFile file, P data) { + public final Void visitKtFile(@NotNull KtFile file, P data) { visitJetFileVoid(file, data); return null; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt similarity index 99% rename from compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt index d34734a5f25..8ce8c2e38b8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt @@ -294,8 +294,8 @@ private fun KtAnnotationsContainer.collectAnnotationEntriesFromPsi(): List forEachDescendantOfTypeVisitor(noinline block: (T) -> Unit): KtVisitorVoid { return object : KtTreeVisitorVoid() { - override fun visitJetElement(element: KtElement) { - super.visitJetElement(element) + override fun visitKtElement(element: KtElement) { + super.visitKtElement(element) if (element is T) { block(element) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java index 2a6c21f3680..4b76beeffbf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtEnumEntry; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.Utils; @@ -57,7 +57,7 @@ public class KtClassElementType extends KtStubElementType superNames = JetPsiUtilKt.getSuperNames(psi); + List superNames = KtPsiUtilKt.getSuperNames(psi); return new KotlinClassStubImpl( getStubType(isEnumEntry), parentStub, StringRef.fromString(fqName != null ? fqName.asString() : null), StringRef.fromString(psi.getName()), Utils.INSTANCE.wrapStrings(superNames), psi.isInterface(), isEnumEntry, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java index 63370f8ea5d..2f22d8bcf1f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java @@ -28,7 +28,7 @@ import com.intellij.psi.tree.IStubFileElementType; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinLanguage; -import org.jetbrains.kotlin.parsing.JetParser; +import org.jetbrains.kotlin.parsing.KotlinParser; import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; import java.io.IOException; @@ -79,7 +79,7 @@ public class KtFileElementType extends IStubFileElementType { Project project = psi.getProject(); Language languageForParser = getLanguageForParser(psi); PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars()); - JetParser parser = (JetParser) LanguageParserDefinitions.INSTANCE.forLanguage(languageForParser).createParser(project); + KotlinParser parser = (KotlinParser) LanguageParserDefinitions.INSTANCE.forLanguage(languageForParser).createParser(project); return parser.parse(this, builder, psi.getContainingFile()).getFirstChildNode(); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java index 6e8e6e920f7..eba7cccab8c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtObjectDeclaration; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.Utils; @@ -43,7 +43,7 @@ public class KtObjectElementType extends KtStubElementType superNames = JetPsiUtilKt.getSuperNames(psi); + List superNames = KtPsiUtilKt.getSuperNames(psi); return new KotlinObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE.wrapStrings(superNames), psi.isTopLevel(), psi.isCompanion(), psi.isLocal(), psi.isObjectLiteral()); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index c549364e2fb..d11828d0556 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -361,7 +361,7 @@ public class BodyResolver { } @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { throw new UnsupportedOperationException(element.getText() + " : " + element); } }; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 38edba88a01..ee3ad9051d8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -383,7 +383,7 @@ public class DescriptorResolver { @NotNull private KotlinType getVarargParameterType(@NotNull KotlinType elementType) { - KotlinType primitiveArrayType = builtIns.getPrimitiveArrayJetTypeByPrimitiveJetType(elementType); + KotlinType primitiveArrayType = builtIns.getPrimitiveArrayKotlinTypeByPrimitiveKotlinType(elementType); if (primitiveArrayType != null) { return primitiveArrayType; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt index 01311e601a4..0d6876e4cd7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt @@ -69,7 +69,7 @@ public class LazyTopDownAnalyzer( throw IllegalArgumentException("Unsupported declaration: " + dcl + " " + dcl.getText()) } - override fun visitJetFile(file: KtFile) { + override fun visitKtFile(file: KtFile) { if (file.isScript()) { val script = file.getScript() ?: throw AssertionError("getScript() is null for file: $file") @@ -97,7 +97,7 @@ public class LazyTopDownAnalyzer( } override fun visitImportDirective(importDirective: KtImportDirective) { - val importResolver = fileScopeProvider.getImportResolver(importDirective.getContainingJetFile()) + val importResolver = fileScopeProvider.getImportResolver(importDirective.getContainingKtFile()) importResolver.forceResolveImport(importDirective) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzerForTopLevel.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzerForTopLevel.java index e8082952201..293a3a0f484 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzerForTopLevel.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzerForTopLevel.java @@ -84,7 +84,7 @@ public class LazyTopDownAnalyzerForTopLevel { } for (KtScript script : c.getScripts().keySet()) { - resolveAndCheckImports(script.getContainingJetFile(), resolveSession); + resolveAndCheckImports(script.getContainingKtFile(), resolveSession); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt index ae1d0dea8b3..5a082c7e3b0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt @@ -126,7 +126,7 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa val lastPart = path.lastOrNull() ?: return null val packageFragmentForCheck = if (packageFragmentForVisibilityCheck is DeclarationDescriptorWithSource && packageFragmentForVisibilityCheck.source == SourceElement.NO_SOURCE) { - PackageFragmentWithCustomSource(packageFragmentForVisibilityCheck, KotlinSourceElement(importDirective.getContainingJetFile())) + PackageFragmentWithCustomSource(packageFragmentForVisibilityCheck, KotlinSourceElement(importDirective.getContainingKtFile())) } else { @@ -411,7 +411,7 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa if (descriptor is DeclarationDescriptorWithVisibility) { val fromToCheck = if (shouldBeVisibleFrom is PackageFragmentDescriptor && shouldBeVisibleFrom.source == SourceElement.NO_SOURCE) { - PackageFragmentWithCustomSource(shouldBeVisibleFrom, KotlinSourceElement(referenceExpression.getContainingJetFile())) + PackageFragmentWithCustomSource(shouldBeVisibleFrom, KotlinSourceElement(referenceExpression.getContainingKtFile())) } else { shouldBeVisibleFrom diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java index 835f5f3c026..3cb378b04c4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtPackageDirective; import org.jetbrains.kotlin.psi.KtScript; @@ -30,8 +30,8 @@ public class ScriptNameUtil { @NotNull public static FqName classNameForScript(KtScript script) { - KtFile file = script.getContainingJetFile(); - JetScriptDefinition scriptDefinition = JetScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file); + KtFile file = script.getContainingKtFile(); + KotlinScriptDefinition scriptDefinition = KotlinScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file); String name = file.getName(); int index = name.lastIndexOf('/'); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt index cd023f0e570..0ea5a6a6677 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt @@ -16,21 +16,21 @@ package org.jetbrains.kotlin.resolve.typeBinding -import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.psi.KtTypeElement -import org.jetbrains.kotlin.psi.KtCallableDeclaration -import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.psi.KtTypeReference -import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.psi.KtCallableDeclaration +import org.jetbrains.kotlin.psi.KtTypeElement +import org.jetbrains.kotlin.psi.KtTypeReference +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.types.KotlinType +import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.types.TypeProjectionImpl interface TypeBinding { val psiElement: P - val jetType: KotlinType + val kotlinType: KotlinType fun getArgumentBindings(): List?> } @@ -70,15 +70,15 @@ private class TypeArgumentBindingImpl( private class ExplicitTypeBinding( private val trace: BindingContext, override val psiElement: KtTypeElement, - override val jetType: KotlinType + override val kotlinType: KotlinType ) : TypeBinding { override fun getArgumentBindings(): List?> { val psiTypeArguments = psiElement.getTypeArgumentsAsTypes() val isErrorBinding = run { - val sizeIsEqual = psiTypeArguments.size() == jetType.getArguments().size() - && psiTypeArguments.size() == jetType.getConstructor().getParameters().size() - jetType.isError() || !sizeIsEqual + val sizeIsEqual = psiTypeArguments.size() == kotlinType.getArguments().size() + && psiTypeArguments.size() == kotlinType.getConstructor().getParameters().size() + kotlinType.isError() || !sizeIsEqual } return psiTypeArguments.indices.map { index: Int -> @@ -98,10 +98,10 @@ private class ExplicitTypeBinding( ) } - val typeProjection = jetType.getArguments()[index] + val typeProjection = kotlinType.getArguments()[index] return@map TypeArgumentBindingImpl( typeProjection, - jetType.getConstructor().getParameters()[index], + kotlinType.getConstructor().getParameters()[index], ExplicitTypeBinding(trace, jetTypeElement, typeProjection.getType()) ) } @@ -111,16 +111,16 @@ private class ExplicitTypeBinding( private class NoTypeElementBinding( private val trace: BindingContext, override val psiElement: P, - override val jetType: KotlinType + override val kotlinType: KotlinType ): TypeBinding

{ override fun getArgumentBindings(): List?> { - val isErrorBinding = jetType.isError() || jetType.getConstructor().getParameters().size() != jetType.getArguments().size() - return jetType.getArguments().indices.map { - val typeProjection = jetType.getArguments()[it] + val isErrorBinding = kotlinType.isError() || kotlinType.getConstructor().getParameters().size() != kotlinType.getArguments().size() + return kotlinType.getArguments().indices.map { + val typeProjection = kotlinType.getArguments()[it] TypeArgumentBindingImpl( typeProjection, - if (isErrorBinding) null else jetType.getConstructor().getParameters()[it], + if (isErrorBinding) null else kotlinType.getConstructor().getParameters()[it], NoTypeElementBinding(trace, psiElement, typeProjection.getType()) ) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 32ced81b333..2aebf75a447 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -287,7 +287,7 @@ public class TypeResolver( c.trace.report(UNSUPPORTED.on(type, "Self-types are not supported")) } - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { c.trace.report(UNSUPPORTED.on(element, "Self-types are not supported yet")) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index 7005adfaa44..4667f615b83 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -156,14 +156,14 @@ class VarianceChecker(private val trace: BindingTrace) { = createTypeBinding(trace)?.checkTypePosition(position, diagnosticSink) private fun TypeBinding.checkTypePosition(position: Variance, diagnosticSink: DiagnosticSink) - = checkTypePosition(jetType, position, diagnosticSink) + = checkTypePosition(kotlinType, position, diagnosticSink) private fun TypeBinding.checkTypePosition(containingType: KotlinType, position: Variance, diagnosticSink: DiagnosticSink): Boolean { - val classifierDescriptor = jetType.getConstructor().getDeclarationDescriptor() + val classifierDescriptor = kotlinType.getConstructor().getDeclarationDescriptor() if (classifierDescriptor is TypeParameterDescriptor) { val declarationVariance = classifierDescriptor.getVariance() if (!declarationVariance.allowsPosition(position) - && !jetType.annotations.hasAnnotation(KotlinBuiltIns.FQ_NAMES.unsafeVariance)) { + && !kotlinType.annotations.hasAnnotation(KotlinBuiltIns.FQ_NAMES.unsafeVariance)) { diagnosticSink.report( Errors.TYPE_VARIANCE_CONFLICT.on( psiElement, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index b736cdd719c..b98b44740d1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -635,7 +635,7 @@ private class ConstantExpressionEvaluatorVisitor( return constants } - override fun visitJetElement(element: KtElement, expectedType: KotlinType?): CompileTimeConstant<*>? { + override fun visitKtElement(element: KtElement, expectedType: KotlinType?): CompileTimeConstant<*>? { return null } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java index 46de5a3bfa4..9247041ce61 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java @@ -48,8 +48,8 @@ public class InlineAnalyzerExtension implements FunctionAnalyzerExtension.Analyz KtVisitorVoid visitor = new KtVisitorVoid() { @Override - public void visitJetElement(@NotNull KtElement element) { - super.visitJetElement(element); + public void visitKtElement(@NotNull KtElement element) { + super.visitKtElement(element); element.acceptChildren(this); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java index 2f9b91d8753..602e23da30a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java @@ -214,7 +214,7 @@ public class LazyDeclarationResolver { } @Override - public DeclarationDescriptor visitJetElement(@NotNull KtElement element, Void data) { + public DeclarationDescriptor visitKtElement(@NotNull KtElement element, Void data) { throw new IllegalArgumentException("Unsupported declaration type: " + element + " " + PsiUtilsKt.getElementTextWithContext(element)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt index cf23a844591..b71dd860673 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt @@ -37,7 +37,7 @@ public class LazyPackageMemberScope( override fun getPackage(name: Name): PackageViewDescriptor? = null override fun getScopeForMemberDeclarationResolution(declaration: KtDeclaration) - = resolveSession.getFileScopeProvider().getFileResolutionScope(declaration.getContainingJetFile()) + = resolveSession.getFileScopeProvider().getFileResolutionScope(declaration.getContainingKtFile()) override fun getNonDeclaredFunctions(name: Name, result: MutableSet) { // No extra functions diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt index a889b4e8709..cc4db5a9692 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorNonRootImpl import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ScriptCodeDescriptor import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider +import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.psi.KtScript import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.ScriptBodyResolver @@ -45,7 +45,7 @@ public class LazyScriptDescriptor( private val jetScript: KtScript, private val priority: Int ) : ScriptDescriptor, LazyEntity, DeclarationDescriptorNonRootImpl( - jetScript.getContainingJetFile().getPackageFqName().let { + jetScript.getContainingKtFile().getPackageFqName().let { fqName -> resolveSession.getPackageFragment(fqName).sure { "Package not found $fqName" } }, @@ -70,8 +70,8 @@ public class LazyScriptDescriptor( private val scriptCodeDescriptor = resolveSession.storageManager.createLazyValue { val result = ScriptCodeDescriptor(this) - val file = jetScript.getContainingJetFile() - val scriptDefinition = JetScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file) + val file = jetScript.getContainingKtFile() + val scriptDefinition = KotlinScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file) result.initialize( implicitReceiver, @@ -86,7 +86,7 @@ public class LazyScriptDescriptor( }, DeferredType.create(resolveSession.storageManager, resolveSession.trace) { val scope = LexicalScopeImpl( - resolveSession.fileScopeProvider.getFileResolutionScope(jetScript.getContainingJetFile()), + resolveSession.fileScopeProvider.getFileResolutionScope(jetScript.getContainingKtFile()), this, false, implicitReceiver, "Scope for body resolution for $this" ) { for (valueParameterDescriptor in result.valueParameters) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 3c821532588..e7f148d0d9e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -1465,7 +1465,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } @Override - public KotlinTypeInfo visitJetElement(@NotNull KtElement element, ExpressionTypingContext context) { + public KotlinTypeInfo visitKtElement(@NotNull KtElement element, ExpressionTypingContext context) { context.trace.report(UNSUPPORTED.on(element, getClass().getCanonicalName())); return TypeInfoFactoryKt.noTypeInfo(context); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java index 790ffb77722..1b8b4c5a379 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -399,7 +399,7 @@ public abstract class ExpressionTypingVisitorDispatcher extends KtVisitor * See {@link LineBreakpoint#findClassCandidatesInSourceContent} for the primary usage this was introduced */ -public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KtLightClass, JetJavaMirrorMarker { +public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KtLightClass, KtJavaMirrorMarker { private final KtLightClassForFacade delegate; private final KtFile file; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index 57d2c6925e5..ee2f9d083f3 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -165,7 +165,7 @@ public class KotlinJavaFileStubProvider() { private KtFile getFile() { - return classOrObject.getContainingJetFile(); + return classOrObject.getContainingKtFile(); } @NotNull @@ -292,7 +292,7 @@ public class KotlinJavaFileStubProvider files) { PackageCodegen packageCodegen = state.getFactory().forPackage(getPackageFqName(), files); - KtFile file = classOrObject.getContainingJetFile(); + KtFile file = classOrObject.getContainingKtFile(); Type packagePartType = FileClasses.getFileClassType(state.getFileClassesProvider(), file); PackageContext context = state.getRootContext().intoPackagePart(packageCodegen.getPackageFragment(), packagePartType, file); packageCodegen.generateClassOrObject(classOrObject, context); diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt index b638ec9f59c..38fd366c234 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt @@ -51,7 +51,7 @@ public open class KtLightClassForExplicitDeclaration( manager: PsiManager, protected val classFqName: FqName, // FqName of (possibly inner) class protected val classOrObject: KtClassOrObject) -: KtWrappingLightClass(manager), JetJavaMirrorMarker, StubBasedPsiElement> { +: KtWrappingLightClass(manager), KtJavaMirrorMarker, StubBasedPsiElement> { private var delegate: PsiClass? = null private fun getLocalClassParent(): PsiElement? { @@ -179,7 +179,7 @@ public open class KtLightClassForExplicitDeclaration( val virtualFile = classOrObject.containingFile.virtualFile assert(virtualFile != null) { "No virtual file for " + classOrObject.text } - object : FakeFileForLightClass(classOrObject.getContainingJetFile().packageFqName, virtualFile, myManager, this, { getJavaFileStub() }) { + object : FakeFileForLightClass(classOrObject.getContainingKtFile().packageFqName, virtualFile, myManager, this, { getJavaFileStub() }) { override fun processDeclarations( processor: PsiScopeProcessor, state: ResolveState, @@ -391,7 +391,7 @@ public open class KtLightClassForExplicitDeclaration( classOrObject: KtClassOrObject, psiClass: PsiClass? = null ): KtLightClassForExplicitDeclaration? { - if (LightClassUtil.belongsToKotlinBuiltIns(classOrObject.getContainingJetFile())) { + if (LightClassUtil.belongsToKotlinBuiltIns(classOrObject.getContainingKtFile())) { return null } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt index 0d046da3be4..954701294ee 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt @@ -42,7 +42,7 @@ public class KtLightClassForFacade private constructor( private val lightClassDataCache: CachedValue, files: Collection, private val deprecated: Boolean -) : KtWrappingLightClass(manager), JetJavaMirrorMarker { +) : KtWrappingLightClass(manager), KtJavaMirrorMarker { private data class StubCacheKey(val fqName: FqName, val searchScope: GlobalSearchScope) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java index d05681eb32e..93b7d4d145c 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import java.util.List; @@ -75,7 +75,7 @@ public class KtLightParameter extends LightParameter implements KtLightElement { val elementToValues = LinkedHashMap() pseudocode.getCorrespondingElement().accept(object : KtTreeVisitorVoid() { - override fun visitJetElement(element: KtElement) { - super.visitJetElement(element) + override fun visitKtElement(element: KtElement) { + super.visitKtElement(element) val value = pseudocode.getElementValue(element) if (value != null) { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 8e858f5c719..975ec17588a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.checkers.CheckerTestUtil; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.AnalyzingUtils; @@ -156,8 +156,8 @@ public class CodegenTestFiles { scriptParameterValues.add(value); } - JetScriptDefinitionProvider.getInstance(project).addScriptDefinition( - new JetScriptDefinition( + KotlinScriptDefinitionProvider.getInstance(project).addScriptDefinition( + new KotlinScriptDefinition( ".kts", scriptParameterTypes ) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index 76c10ef440d..5f55b9defa5 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -16,10 +16,9 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.test.ConfigurationKind; @@ -30,15 +29,15 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; public class ScriptGenTest extends CodegenTestCase { - private static final JetScriptDefinition FIB_SCRIPT_DEFINITION = - new JetScriptDefinition(".lang.kt", - new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType())); + private static final KotlinScriptDefinition FIB_SCRIPT_DEFINITION = + new KotlinScriptDefinition(".lang.kt", + new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType())); @Override protected void setUp() throws Exception { super.setUp(); createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - JetScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION); + KotlinScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION); } public void testLanguage() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java index e5b857f337a..04e4f20ebbd 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java @@ -47,7 +47,7 @@ public abstract class AbstractParsingTest extends ParsingTestCase { } public AbstractParsingTest() { - super(".", "kt", new JetParserDefinition()); + super(".", "kt", new KotlinParserDefinition()); } private static void checkPsiGetters(KtElement elem) throws Throwable { @@ -83,7 +83,7 @@ public abstract class AbstractParsingTest extends ParsingTestCase { } protected void doParsingTest(@NotNull String filePath) throws Exception { - doBaseTest(filePath, KtNodeTypes.JET_FILE); + doBaseTest(filePath, KtNodeTypes.KT_FILE); } protected void doExpressionCodeFragmentParsingTest(@NotNull String filePath) throws Exception { @@ -100,7 +100,7 @@ public abstract class AbstractParsingTest extends ParsingTestCase { myFile.acceptChildren(new KtVisitorVoid() { @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { element.acceptChildren(this); try { checkPsiGetters(element); diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index a55a3d45dc0..3310c786bfa 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -72,7 +72,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment val descriptors = ArrayList() psiFile.accept(object : KtVisitorVoid() { - override fun visitJetFile(file: KtFile) { + override fun visitKtFile(file: KtFile) { val fqName = file.getPackageFqName() if (!fqName.isRoot()) { val packageDescriptor = context.module.getPackage(fqName) @@ -126,7 +126,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment element.acceptChildren(this) } - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { element.acceptChildren(this) } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt index 87911a11ccb..18667977291 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt @@ -133,7 +133,7 @@ class MutableDiagnosticsTest : KotlinTestWithEnvironment() { val dummyElement = KtPsiFactory(getEnvironment().project).createType("Int") init { - dummyElement.getContainingJetFile().doNotAnalyze = null + dummyElement.getContainingKtFile().doNotAnalyze = null } override fun getFactory() = unimplemented() diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java index c09112912fa..0766bca77bc 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; +import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.test.ConfigurationKind; @@ -49,14 +49,14 @@ import java.util.List; public class ScriptTest { @Test public void testScript() throws Exception { - Class aClass = compileScript("fib.kts", numIntParam(), Collections.emptyList()); + Class aClass = compileScript("fib.kts", numIntParam(), Collections.emptyList()); Assert.assertNotNull(aClass); aClass.getConstructor(int.class).newInstance(4); } @Test public void testScriptWithPackage() throws Exception { - Class aClass = compileScript("fib.pkg.kts", numIntParam(), Collections.emptyList()); + Class aClass = compileScript("fib.pkg.kts", numIntParam(), Collections.emptyList()); Assert.assertNotNull(aClass); aClass.getConstructor(int.class).newInstance(4); } @@ -64,7 +64,7 @@ public class ScriptTest { @Test public void testScriptWithScriptDefinition() throws Exception { Class aClass = compileScript("fib.fib.kt", null, - Collections.singletonList(new JetScriptDefinition(".fib.kt", numIntParam()))); + Collections.singletonList(new KotlinScriptDefinition(".fib.kt", numIntParam()))); Assert.assertNotNull(aClass); aClass.getConstructor(int.class).newInstance(4); } @@ -73,7 +73,7 @@ public class ScriptTest { private static Class compileScript( @NotNull String scriptPath, @Nullable List scriptParameters, - @NotNull List scriptDefinitions + @NotNull List scriptDefinitions ) { KotlinPaths paths = PathUtil.getKotlinPathsForDistDirectory(); MessageCollector messageCollector = PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR; @@ -91,7 +91,7 @@ public class ScriptTest { KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); try { - JetScriptDefinitionProvider.getInstance(environment.getProject()).markFileAsScript(environment.getSourceFiles().get(0)); + KotlinScriptDefinitionProvider.getInstance(environment.getProject()).markFileAsScript(environment.getSourceFiles().get(0)); return KotlinToJVMBytecodeCompiler.compileScript(configuration, paths, environment); } catch (CompilationException e) { diff --git a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt index 184fafb0331..941e0ef4b19 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt @@ -97,7 +97,7 @@ abstract class AbstractTypeBindingTest : KotlinLiteFixture() { } println("psi: ${binding.psiElement.getText()}") - println("type: ${binding.jetType.render()}") + println("type: ${binding.kotlinType.render()}") printCollection(binding.getArgumentBindings()) { print(it) diff --git a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java index 8fbea815ea8..78a365dd137 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java @@ -111,7 +111,7 @@ public class DefaultModalityModifiersTest extends KotlinLiteFixture { ResolveSession resolveSession = createLazyResolveSession( moduleContext, new FileBasedDeclarationProviderFactory(moduleContext.getStorageManager(), - Collections.singleton(aClass.getContainingJetFile())), + Collections.singleton(aClass.getContainingKtFile())), new BindingTraceContext(), TargetPlatform.Default.INSTANCE$ ); diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt index 7837b464ad1..57c48db362d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt @@ -50,7 +50,7 @@ class LazyJavaTypeResolver( return when (javaType) { is JavaPrimitiveType -> { val primitiveType = javaType.getType() - if (primitiveType != null) c.module.builtIns.getPrimitiveJetType(primitiveType) + if (primitiveType != null) c.module.builtIns.getPrimitiveKotlinType(primitiveType) else c.module.builtIns.getUnitType() } is JavaClassifierType -> @@ -70,7 +70,7 @@ class LazyJavaTypeResolver( val javaComponentType = arrayType.getComponentType() val primitiveType = (javaComponentType as? JavaPrimitiveType)?.getType() if (primitiveType != null) { - val jetType = c.module.builtIns.getPrimitiveArrayJetType(primitiveType) + val jetType = c.module.builtIns.getPrimitiveArrayKotlinType(primitiveType) return@run if (PLATFORM_TYPES && attr.allowFlexible) FlexibleJavaClassifierTypeCapabilities.create(jetType, TypeUtils.makeNullable(jetType)) else TypeUtils.makeNullableAsSpecified(jetType, !attr.isMarkedNotNull) diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index b06b221dae4..354dc274c2a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -61,9 +61,9 @@ public abstract class KotlinBuiltIns { private final BuiltinsPackageFragment builtinsPackageFragment; private final BuiltinsPackageFragment annotationPackageFragment; - private final Map primitiveTypeToArrayJetType; - private final Map primitiveJetTypeToJetArrayType; - private final Map jetArrayTypeToPrimitiveJetType; + private final Map primitiveTypeToArrayKotlinType; + private final Map primitiveKotlinTypeToKotlinArrayType; + private final Map kotlinArrayTypeToPrimitiveKotlinType; public static final FqNames FQ_NAMES = new FqNames(); @@ -91,9 +91,9 @@ public abstract class KotlinBuiltIns { builtinsPackageFragment = (BuiltinsPackageFragment) single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME)); annotationPackageFragment = (BuiltinsPackageFragment) single(packageFragmentProvider.getPackageFragments(ANNOTATION_PACKAGE_FQ_NAME)); - primitiveTypeToArrayJetType = new EnumMap(PrimitiveType.class); - primitiveJetTypeToJetArrayType = new HashMap(); - jetArrayTypeToPrimitiveJetType = new HashMap(); + primitiveTypeToArrayKotlinType = new EnumMap(PrimitiveType.class); + primitiveKotlinTypeToKotlinArrayType = new HashMap(); + kotlinArrayTypeToPrimitiveKotlinType = new HashMap(); for (PrimitiveType primitive : PrimitiveType.values()) { makePrimitive(primitive); } @@ -108,9 +108,9 @@ public abstract class KotlinBuiltIns { KotlinType type = getBuiltInTypeByClassName(primitiveType.getTypeName().asString()); KotlinType arrayType = getBuiltInTypeByClassName(primitiveType.getArrayTypeName().asString()); - primitiveTypeToArrayJetType.put(primitiveType, arrayType); - primitiveJetTypeToJetArrayType.put(type, arrayType); - jetArrayTypeToPrimitiveJetType.put(arrayType, type); + primitiveTypeToArrayKotlinType.put(primitiveType, arrayType); + primitiveKotlinTypeToKotlinArrayType.put(type, arrayType); + kotlinArrayTypeToPrimitiveKotlinType.put(arrayType, type); } public static class FqNames { @@ -569,48 +569,48 @@ public abstract class KotlinBuiltIns { // Primitive @NotNull - public KotlinType getPrimitiveJetType(@NotNull PrimitiveType type) { + public KotlinType getPrimitiveKotlinType(@NotNull PrimitiveType type) { return getPrimitiveClassDescriptor(type).getDefaultType(); } @NotNull public KotlinType getByteType() { - return getPrimitiveJetType(BYTE); + return getPrimitiveKotlinType(BYTE); } @NotNull public KotlinType getShortType() { - return getPrimitiveJetType(SHORT); + return getPrimitiveKotlinType(SHORT); } @NotNull public KotlinType getIntType() { - return getPrimitiveJetType(INT); + return getPrimitiveKotlinType(INT); } @NotNull public KotlinType getLongType() { - return getPrimitiveJetType(LONG); + return getPrimitiveKotlinType(LONG); } @NotNull public KotlinType getFloatType() { - return getPrimitiveJetType(FLOAT); + return getPrimitiveKotlinType(FLOAT); } @NotNull public KotlinType getDoubleType() { - return getPrimitiveJetType(DOUBLE); + return getPrimitiveKotlinType(DOUBLE); } @NotNull public KotlinType getCharType() { - return getPrimitiveJetType(CHAR); + return getPrimitiveKotlinType(CHAR); } @NotNull public KotlinType getBooleanType() { - return getPrimitiveJetType(BOOLEAN); + return getPrimitiveKotlinType(BOOLEAN); } // Recognized @@ -633,7 +633,7 @@ public abstract class KotlinBuiltIns { } return arrayType.getArguments().get(0).getType(); } - KotlinType primitiveType = jetArrayTypeToPrimitiveJetType.get(TypeUtils.makeNotNullable(arrayType)); + KotlinType primitiveType = kotlinArrayTypeToPrimitiveKotlinType.get(TypeUtils.makeNotNullable(arrayType)); if (primitiveType == null) { throw new IllegalStateException("not array: " + arrayType); } @@ -641,16 +641,16 @@ public abstract class KotlinBuiltIns { } @NotNull - public KotlinType getPrimitiveArrayJetType(@NotNull PrimitiveType primitiveType) { - return primitiveTypeToArrayJetType.get(primitiveType); + public KotlinType getPrimitiveArrayKotlinType(@NotNull PrimitiveType primitiveType) { + return primitiveTypeToArrayKotlinType.get(primitiveType); } /** * @return {@code null} if not primitive */ @Nullable - public KotlinType getPrimitiveArrayJetTypeByPrimitiveJetType(@NotNull KotlinType jetType) { - return primitiveJetTypeToJetArrayType.get(jetType); + public KotlinType getPrimitiveArrayKotlinTypeByPrimitiveKotlinType(@NotNull KotlinType kotlinType) { + return primitiveKotlinTypeToKotlinArrayType.get(kotlinType); } public static boolean isPrimitiveArray(@NotNull FqNameUnsafe arrayFqName) { diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt index d5f92ba28dc..0179d8f1a73 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt @@ -100,7 +100,7 @@ public class AnnotationDeserializer(private val module: ModuleDescriptor) { val actualArrayType = if (arrayElements.isNotEmpty()) { val actualElementType = resolveArrayElementType(arrayElements.first(), nameResolver) - builtIns.getPrimitiveArrayJetTypeByPrimitiveJetType(actualElementType) ?: + builtIns.getPrimitiveArrayKotlinTypeByPrimitiveKotlinType(actualElementType) ?: builtIns.getArrayType(Variance.INVARIANT, actualElementType) } else { diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt index 93d59d9ffa9..de357285f7a 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt @@ -430,7 +430,7 @@ class PartialBodyResolveFilter( * Recursively visits code but does not enter constructs that may not affect smart casts/control flow */ private abstract class ControlFlowVisitor : KtVisitorVoid() { - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { if (element.noControlFlowInside()) return element.acceptChildren(this) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt index 42c71761f33..3e5614cdedd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt @@ -267,7 +267,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh if (decompiledClassOrObject is KtEnumEntry) { return null } - val containingJetFile = decompiledClassOrObject.getContainingJetFile() + val containingJetFile = decompiledClassOrObject.getContainingKtFile() if (!containingJetFile.isCompiled) { return null } @@ -282,12 +282,12 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh val relativeFqName = getClassRelativeName(decompiledClassOrObject) val iterator = relativeFqName.pathSegments().iterator() val base = iterator.next() - assert(rootLightClassForDecompiledFile.name == base.asString()) { "Light class for file:\n" + decompiledClassOrObject.getContainingJetFile().virtualFile.canonicalPath + "\nwas expected to have name: " + base.asString() + "\n Actual: " + rootLightClassForDecompiledFile.name } + assert(rootLightClassForDecompiledFile.name == base.asString()) { "Light class for file:\n" + decompiledClassOrObject.getContainingKtFile().virtualFile.canonicalPath + "\nwas expected to have name: " + base.asString() + "\n Actual: " + rootLightClassForDecompiledFile.name } var current = rootLightClassForDecompiledFile while (iterator.hasNext()) { val name = iterator.next() val innerClass = current.findInnerClassByName(name.asString(), false).sure { - "Could not find corresponding inner/nested class " + relativeFqName + " in class " + decompiledClassOrObject.fqName + "\n" + "File: " + decompiledClassOrObject.getContainingJetFile().virtualFile.name + "Could not find corresponding inner/nested class " + relativeFqName + " in class " + decompiledClassOrObject.fqName + "\n" + "File: " + decompiledClassOrObject.getContainingKtFile().virtualFile.name } current = innerClass } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt index fb184ae0dd8..aca85152dd7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt @@ -47,7 +47,7 @@ public class KotlinCacheService(val project: Project) { } public fun getResolutionFacade(elements: List): ResolutionFacade { - return getFacadeToAnalyzeFiles(elements.map { it.getContainingJetFile() }) + return getFacadeToAnalyzeFiles(elements.map { it.getContainingKtFile() }) } private val globalFacadesPerPlatform = listOf(JvmPlatform, JsPlatform).keysToMap { platform -> GlobalFacade(platform) } @@ -185,7 +185,7 @@ public class KotlinCacheService(val project: Project) { private fun KtCodeFragment.getContextFile(): KtFile? { val contextElement = getContext() ?: return null - val contextFile = (contextElement as? KtElement)?.getContainingJetFile() + val contextFile = (contextElement as? KtElement)?.getContainingKtFile() ?: throw AssertionError("Analyzing kotlin code fragment of type $javaClass with java context of type ${contextElement.javaClass}") return if (contextFile is KtCodeFragment) contextFile.getContextFile() else contextFile } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt index b6209608bb0..d7a734274a5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt @@ -67,7 +67,7 @@ internal class PerFileAnalysisCache(val file: KtFile, val componentProvider: Com } fun getAnalysisResults(element: KtElement): AnalysisResult { - assert (element.getContainingJetFile() == file) { "Wrong file. Expected $file, but was ${element.getContainingJetFile()}" } + assert (element.getContainingKtFile() == file) { "Wrong file. Expected $file, but was ${element.getContainingKtFile()}" } val analyzableParent = KotlinResolveDataProvider.findAnalyzableParent(element) @@ -142,7 +142,7 @@ private object KotlinResolveDataProvider { // if none of the above worked, take the outermost declaration ?: PsiTreeUtil.getTopmostParentOfType(element, javaClass()) // if even that didn't work, take the whole file - ?: element.getContainingJetFile() + ?: element.getContainingKtFile() } fun analyze(project: Project, componentProvider: ComponentProvider, analyzableElement: KtElement): AnalysisResult { @@ -152,7 +152,7 @@ private object KotlinResolveDataProvider { return AnalysisResult.success(analyzeExpressionCodeFragment(componentProvider, analyzableElement), module) } - val file = analyzableElement.getContainingJetFile() + val file = analyzableElement.getContainingKtFile() if (LightClassUtil.belongsToKotlinBuiltIns(file) || file.getModuleInfo() is LibrarySourceInfo) { // Library sources: mark file to skip file.putUserData(LibrarySourceHacks.SKIP_TOP_LEVEL_MEMBERS, true) @@ -161,7 +161,7 @@ private object KotlinResolveDataProvider { val resolveSession = componentProvider.get() val trace = DelegatingBindingTrace(resolveSession.getBindingContext(), "Trace for resolution of " + analyzableElement) - val targetPlatform = TargetPlatformDetector.getPlatform(analyzableElement.getContainingJetFile()) + val targetPlatform = TargetPlatformDetector.getPlatform(analyzableElement.getContainingKtFile()) val lazyTopDownAnalyzer = createContainerForLazyBodyResolve( //TODO: should get ModuleContext diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt index 140b25361a5..8c4a6228f5c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt @@ -71,7 +71,7 @@ internal class ProjectResolutionFacade( } val results = elements.map { val perFileCache = synchronized(slruCache) { - slruCache[it.getContainingJetFile()] + slruCache[it.getContainingKtFile()] } perFileCache.getAnalysisResults(it) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java index 6d9ce56a636..42e767a7095 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java @@ -92,7 +92,7 @@ public class SourceNavigationHelper { @NotNull KtNamedDeclaration declaration, @NotNull NavigationKind navigationKind ) { - KtFile containingFile = declaration.getContainingJetFile(); + KtFile containingFile = declaration.getContainingKtFile(); VirtualFile libraryFile = containingFile.getVirtualFile(); if (libraryFile == null) return GlobalSearchScope.EMPTY_SCOPE; @@ -365,7 +365,7 @@ public class SourceNavigationHelper { @Nullable public static PsiClass getOriginalPsiClassOrCreateLightClass(@NotNull KtClassOrObject classOrObject) { - if (LightClassUtil.INSTANCE$.belongsToKotlinBuiltIns(classOrObject.getContainingJetFile())) { + if (LightClassUtil.INSTANCE$.belongsToKotlinBuiltIns(classOrObject.getContainingKtFile())) { FqName fqName = classOrObject.getFqName(); if (fqName != null) { ClassId javaClassId = JavaToKotlinClassMap.INSTANCE.mapKotlinToJava(fqName.toUnsafe()); @@ -389,7 +389,7 @@ public class SourceNavigationHelper { } String fqName = JvmClassName.byInternalName(internalName).getFqNameForClassNameWithoutDollars().asString(); - KtFile file = classOrObject.getContainingJetFile(); + KtFile file = classOrObject.getContainingKtFile(); VirtualFile vFile = file.getVirtualFile(); Project project = file.getProject(); @@ -444,10 +444,10 @@ public class SourceNavigationHelper { switch (navigationKind) { case CLASS_FILES_TO_SOURCES: - if (!from.getContainingJetFile().isCompiled()) return from; + if (!from.getContainingKtFile().isCompiled()) return from; break; case SOURCES_TO_CLASS_FILES: - if (from.getContainingJetFile().isCompiled()) return from; + if (from.getContainingKtFile().isCompiled()) return from; if (!ProjectRootsUtil.isInContent(from, false, true, false)) return from; if (KtPsiUtil.isLocal(from)) return from; break; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java index d7378a8c1fe..a4a5c706108 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject; import org.jetbrains.kotlin.psi.KtDynamicType; import org.jetbrains.kotlin.psi.KtSimpleNameExpression; import org.jetbrains.kotlin.psi.KtTypeParameter; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.resolve.BindingContext; class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor { @@ -58,7 +58,7 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor { } private void highlightAnnotation(@NotNull KtSimpleNameExpression expression) { - TextRange toHighlight = JetPsiUtilKt.getCalleeHighlightingRange(expression); + TextRange toHighlight = KtPsiUtilKt.getCalleeHighlightingRange(expression); NameHighlighter.highlightName(holder, toHighlight, KotlinHighlightingColors.ANNOTATION); } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt index 7fe8f556ba1..f9370f30435 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt @@ -20,4 +20,4 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.resolve.TargetPlatform val KtElement.platform: TargetPlatform - get() = TargetPlatformDetector.getPlatform(getContainingJetFile()) \ No newline at end of file + get() = TargetPlatformDetector.getPlatform(getContainingKtFile()) \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt index ed1bce07c00..aaf264233ad 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt @@ -114,7 +114,7 @@ public class ResolveElementCache( = getElementAdditionalResolve(function, function, BodyResolveMode.FULL) public fun resolvePrimaryConstructorParametersDefaultValues(ktClass: KtClass): BindingContext { - return constructorAdditionalResolve(resolveSession, ktClass, ktClass.getContainingJetFile()).bindingContext + return constructorAdditionalResolve(resolveSession, ktClass, ktClass.getContainingKtFile()).bindingContext } fun getElementAdditionalResolve(resolveElement: KtElement, contextElement: KtElement, bodyResolveMode: BodyResolveMode): BindingContext { @@ -142,7 +142,7 @@ public class ResolveElementCache( return getElementAdditionalResolve(resolveElement, contextElement, BodyResolveMode.FULL) } - val file = resolveElement.getContainingJetFile() + val file = resolveElement.getContainingKtFile() val statementToResolve = PartialBodyResolveFilter.findStatementToResolve(contextElement, resolveElement) val partialResolveMap = partialBodyResolveCache.value partialResolveMap[statementToResolve ?: resolveElement] @@ -243,7 +243,7 @@ public class ResolveElementCache( } private fun performElementAdditionalResolve(resolveElement: KtElement, contextElement: KtElement, bodyResolveMode: BodyResolveMode): Pair { - val file = resolveElement.getContainingJetFile() + val file = resolveElement.getContainingKtFile() var statementFilterUsed = StatementFilter.NONE @@ -273,7 +273,7 @@ public class ResolveElementCache( is KtInitializerList -> delegationSpecifierAdditionalResolve(resolveSession, resolveElement, resolveElement.getParent() as KtEnumEntry, file) is KtImportList -> { - val resolver = resolveSession.fileScopeProvider.getImportResolver(resolveElement.getContainingJetFile()) + val resolver = resolveSession.fileScopeProvider.getImportResolver(resolveElement.getContainingKtFile()) resolver.forceResolveAllImports() resolveSession.trace } @@ -355,10 +355,10 @@ public class ResolveElementCache( else { val fileAnnotationList = ktAnnotationEntry.getParentOfType(true) if (fileAnnotationList != null) { - doResolveAnnotations(resolveSession.getFileAnnotations(fileAnnotationList.getContainingJetFile())) + doResolveAnnotations(resolveSession.getFileAnnotations(fileAnnotationList.getContainingKtFile())) } if (modifierList != null && modifierList.getParent() is KtFile) { - doResolveAnnotations(resolveSession.getDanglingAnnotations(modifierList.getContainingJetFile())) + doResolveAnnotations(resolveSession.getDanglingAnnotations(modifierList.getContainingKtFile())) } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt index c2bbd9a386e..33c30d94848 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt @@ -61,7 +61,7 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager: private fun initialize() { assert(moduleDescriptor == null) { "Attempt to initialize twice" } - val jetBuiltInsFiles = getJetBuiltInsFiles() + val jetBuiltInsFiles = getBuiltInsKtFiles() runReadAction { val newModuleContext = ContextForNewModule(project, Name.special(""), TargetPlatform.Default) @@ -85,7 +85,7 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager: } } - private fun getJetBuiltInsFiles(): Set { + private fun getBuiltInsKtFiles(): Set { return getBuiltInsDirUrls().flatMapTo(hashSetOf()) { getBuiltInSourceFiles(it) } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt index 4101aabf40f..a5d96ce662f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt @@ -171,7 +171,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase processJetClassOrObject(element, queryParameters) + is KtClassOrObject -> processKtClassOrObject(element, queryParameters) is KtNamedFunction, is KtSecondaryConstructor -> { val function = element as KtFunction val name = runReadAction { function.getName() } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt index 8127e73be7d..746a11eb933 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.idea.util import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.tree.IElementType -import org.jetbrains.kotlin.parsing.JetExpressionParsing -import org.jetbrains.kotlin.parsing.JetExpressionParsing.Precedence.POSTFIX -import org.jetbrains.kotlin.parsing.JetExpressionParsing.Precedence.PREFIX +import org.jetbrains.kotlin.parsing.KotlinExpressionParsing +import org.jetbrains.kotlin.parsing.KotlinExpressionParsing.Precedence.POSTFIX +import org.jetbrains.kotlin.parsing.KotlinExpressionParsing.Precedence.PREFIX import org.jetbrains.kotlin.psi.* import java.util.* @@ -31,7 +31,7 @@ public object PsiPrecedences { private val precedence: Map init { val builder = HashMap() - for ((i, record) in JetExpressionParsing.Precedence.values().withIndex()) { + for ((i, record) in KotlinExpressionParsing.Precedence.values().withIndex()) { for (elementType in record.getOperations().getTypes()) { builder[elementType] = i } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt index 23498446041..f960417ef2f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt @@ -127,7 +127,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D @JvmOverloads public fun process(elements: Iterable, elementFilter: (PsiElement) -> FilterResult = { FilterResult.PROCESS }): Collection { - return elements.groupBy { element -> element.getContainingJetFile() } + return elements.groupBy { element -> element.getContainingKtFile() } .flatMap { shortenReferencesInFile(it.key, it.value, elementFilter) } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt index 2c6381254d7..f5d3f3f5b7a 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt @@ -297,7 +297,7 @@ public class KotlinIndicesHelper( } private fun KtCallableDeclaration.resolveToDescriptorsWithHack(): Collection { - if (getContainingJetFile().isCompiled()) { //TODO: it's temporary while resolveToDescriptor does not work for compiled declarations + if (getContainingKtFile().isCompiled()) { //TODO: it's temporary while resolveToDescriptor does not work for compiled declarations return resolutionFacade.resolveImportReference(moduleDescriptor, fqName!!).filterIsInstance() } else { diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 636ad58a9fb..b0181eb638c 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -224,8 +224,8 @@ - + @@ -298,7 +298,7 @@ - + diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt index bcc2f50cb4a..19e1ae2ed3b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt @@ -56,7 +56,7 @@ internal fun createSingleImportAction(project: Project, editor: Editor, element: KtElement, descriptors: Collection): KotlinAddImportAction { - val prioritizer = Prioritizer(element.getContainingJetFile()) + val prioritizer = Prioritizer(element.getContainingKtFile()) val variants = descriptors .groupBy { it.importableFqName!! } .map { @@ -75,7 +75,7 @@ internal fun createGroupedImportsAction(project: Project, element: KtElement, autoImportDescription: String, descriptors: Collection): KotlinAddImportAction { - val prioritizer = DescriptorGroupPrioritizer(element.getContainingJetFile()) + val prioritizer = DescriptorGroupPrioritizer(element.getContainingKtFile()) val variants = descriptors .groupBy { it.importableFqName!!.parentOrNull() ?: FqName.ROOT } @@ -170,7 +170,7 @@ class KotlinAddImportAction internal constructor( project.executeWriteCommand(QuickFixBundle.message("add.import")) { if (!element.isValid) return@executeWriteCommand - val file = element.getContainingJetFile() + val file = element.getContainingKtFile() variant.declarationToImport(project)?.let { val location = ProximityLocation(element, ModuleUtilCore.findModuleForPsiElement(element)) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt index bb06c8290ce..695a0727b58 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt @@ -109,7 +109,7 @@ public class CheckPartialBodyResolveAction : AnAction() { val resolutionFacade = file.getResolutionFacade() val document = FileDocumentManager.getInstance().getDocument(file.getVirtualFile())!! file.acceptChildren(object : KtVisitorVoid(){ - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { ProgressManager.checkCanceled() element.acceptChildren(this) } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt index 1c9232f1121..6fe12bbe4c2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt @@ -67,7 +67,7 @@ public class FindImplicitNothingAction : AnAction() { val resolutionFacade = file.getResolutionFacade() file.acceptChildren(object : KtVisitorVoid() { - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { ProgressManager.checkCanceled() element.acceptChildren(this) } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt index e0a15e0df67..43dd7248078 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt @@ -134,9 +134,9 @@ private class VariablesCollector( private val myExpressions: MutableSet ) : KtTreeVisitorVoid() { - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { if (element.isInRange()) { - super.visitJetElement(element) + super.visitKtElement(element) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt index 47a3cb8b815..f9698366ab1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt @@ -103,7 +103,7 @@ class KotlinFieldBreakpoint( setFieldName(property.getName()!!) if (property is KtProperty && property.isTopLevel()) { - getProperties().myClassName = JvmFileClassUtil.getFileClassInfoNoResolve(property.getContainingJetFile()).fileClassFqName.asString() + getProperties().myClassName = JvmFileClassUtil.getFileClassInfoNoResolve(property.getContainingKtFile()).fileClassFqName.asString() } else { val ktClass: KtClassOrObject? = PsiTreeUtil.getParentOfType(property, javaClass()) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt index 652eab06e71..b4e307ae017 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt @@ -95,7 +95,7 @@ public class KotlinFieldBreakpointType : JavaBreakpointType { val jetClass = psiClass.getOrigin() - createBreakpointIfPropertyExists(jetClass, jetClass.getContainingJetFile(), className, fieldName) + createBreakpointIfPropertyExists(jetClass, jetClass.getContainingKtFile(), className, fieldName) } else -> null } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt index 447a4ce5a07..894410563bb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt @@ -33,7 +33,7 @@ fun isInsideInlineArgument(inlineArgument: KtFunction, location: Location, debug } private fun lambdaOrdinalIndex(elementAt: KtFunction): Int { - val typeMapper = KotlinPositionManager.createTypeMapper(elementAt.getContainingJetFile()) + val typeMapper = KotlinPositionManager.createTypeMapper(elementAt.getContainingKtFile()) val type = CodegenBinding.asmTypeForAnonymousClass(typeMapper.bindingContext, elementAt) return type.className.substringAfterLast("$").toInt() diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt index 68484ca8e74..f831ff1e996 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -345,7 +345,7 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour val generateClassFilter = object : GenerationState.GenerateClassFilter() { override fun shouldGeneratePackagePart(jetFile: KtFile) = jetFile == jetFile override fun shouldAnnotateClass(classOrObject: KtClassOrObject) = true - override fun shouldGenerateClass(classOrObject: KtClassOrObject) = classOrObject.getContainingJetFile() == jetFile + override fun shouldGenerateClass(classOrObject: KtClassOrObject) = classOrObject.getContainingKtFile() == jetFile override fun shouldGenerateScript(script: KtScript) = false } @@ -456,7 +456,7 @@ package packageForDebugger private fun createFileForDebugger(codeFragment: KtCodeFragment, extractedFunction: KtNamedFunction ): KtFile { - val containingContextFile = (codeFragment.context as? KtElement)?.getContainingJetFile() + val containingContextFile = (codeFragment.context as? KtElement)?.getContainingKtFile() val importsFromContextFile = containingContextFile?.importList?.let { it.text + "\n" } ?: "" val packageFromContextFile = containingContextFile?.packageName?.let { if (it.isNotBlank()) "import $it.*\n" else null @@ -473,7 +473,7 @@ private fun createFileForDebugger(codeFragment: KtCodeFragment, assert(extractedFunctionText != null) { "Text of extracted function shouldn't be null" } fileText = fileText.replace("!FUNCTION!", extractedFunction.text!!) - val jetFile = codeFragment.createJetFile("debugFile.kt", fileText) + val jetFile = codeFragment.createKtFile("debugFile.kt", fileText) jetFile.suppressDiagnosticsInDebugMode = true val list = jetFile.declarations @@ -491,7 +491,7 @@ private fun createFileForDebugger(codeFragment: KtCodeFragment, } private fun PsiElement.createFlexibleTypesFile(): KtFile { - return createJetFile( + return createKtFile( "FLEXIBLE_TYPES.kt", """ package ${Flexibility.FLEXIBLE_TYPE_CLASSIFIER.packageFqName} @@ -500,7 +500,7 @@ private fun PsiElement.createFlexibleTypesFile(): KtFile { ) } -private fun PsiElement.createJetFile(fileName: String, fileText: String): KtFile { +private fun PsiElement.createKtFile(fileName: String, fileText: String): KtFile { // Not using KtPsiFactory because we need a virtual file attached to the JetFile val virtualFile = LightVirtualFile(fileName, KotlinLanguage.INSTANCE, fileText) virtualFile.charset = CharsetToolkit.UTF8_CHARSET diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java index 37d86e06a49..7aadd2b90a2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java @@ -39,7 +39,7 @@ public class KotlinBackspaceHandler extends BackspaceHandlerDelegate { char c1 = chars.charAt(offset); if (c == '<' && deleteGt) { if (c1 == '>') { - LtGtTypingUtils.handleJetLTDeletion(editor, offset); + LtGtTypingUtils.handleKotlinLTDeletion(editor, offset); } return true; } diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt index a3ba08bc936..b2b40d2eedf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt @@ -16,26 +16,18 @@ package org.jetbrains.kotlin.idea.editor -import org.jetbrains.kotlin.idea.editor.fixers.* import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.openapi.editor.Editor -import com.intellij.psi.PsiFile -import com.intellij.util.text.CharArrayUtil -import com.intellij.psi.codeStyle.CodeStyleSettingsManager import com.intellij.psi.PsiElement +import com.intellij.psi.PsiFile import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.KtBlockExpression -import org.jetbrains.kotlin.psi.KtExpression -import org.jetbrains.kotlin.psi.KtDeclarationWithBody -import org.jetbrains.kotlin.psi.KtIfExpression -import org.jetbrains.kotlin.psi.KtForExpression -import org.jetbrains.kotlin.psi.KtParameter -import org.jetbrains.kotlin.psi.KtFunctionLiteral +import com.intellij.psi.codeStyle.CodeStyleSettingsManager import com.intellij.psi.tree.TokenSet +import com.intellij.util.text.CharArrayUtil import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.psi.KtLoopExpression +import org.jetbrains.kotlin.idea.editor.fixers.* import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() { @@ -67,7 +59,7 @@ public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() { while (atCaret != null) { when { - atCaret.isJetStatement() == true -> return atCaret + atCaret.isKotlinStatement() == true -> return atCaret atCaret.getParent() is KtFunctionLiteral -> return atCaret atCaret is KtDeclaration -> { val declaration = atCaret @@ -121,7 +113,7 @@ public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() { } } - private fun PsiElement.isJetStatement() = when { + private fun PsiElement.isKotlinStatement() = when { getParent() is KtBlockExpression && getNode()?.getElementType() !in BRACES -> true getParent()?.getNode()?.getElementType() in BRANCH_CONTAINERS && this !is KtBlockExpression -> true else -> false diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java index 30d94bb16e3..1a3846f6caf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java @@ -54,7 +54,7 @@ public class KotlinTypedHandler extends TypedHandlerDelegate { KtNodeTypes.FOR, KtNodeTypes.WHILE); - private boolean jetLTTyped; + private boolean kotlinLTTyped; @Override public Result beforeCharTyped(char c, Project project, Editor editor, PsiFile file, FileType fileType) { @@ -64,13 +64,13 @@ public class KotlinTypedHandler extends TypedHandlerDelegate { switch (c) { case '<': - jetLTTyped = CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET && - LtGtTypingUtils.shouldAutoCloseAngleBracket(editor.getCaretModel().getOffset(), editor); + kotlinLTTyped = CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET && + LtGtTypingUtils.shouldAutoCloseAngleBracket(editor.getCaretModel().getOffset(), editor); return Result.CONTINUE; case '>': if (CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET) { - if (LtGtTypingUtils.handleJetGTInsert(editor)) { + if (LtGtTypingUtils.handleKotlinGTInsert(editor)) { return Result.STOP; } } @@ -207,9 +207,9 @@ public class KotlinTypedHandler extends TypedHandlerDelegate { return Result.CONTINUE; } - if (jetLTTyped) { - jetLTTyped = false; - LtGtTypingUtils.handleJetAutoCloseLT(editor); + if (kotlinLTTyped) { + kotlinLTTyped = false; + LtGtTypingUtils.handleKotlinAutoCloseLT(editor); return Result.STOP; } diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/LtGtTypingUtils.java b/idea/src/org/jetbrains/kotlin/idea/editor/LtGtTypingUtils.java index 93ad0d1ddc0..0df4cd0acbb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/LtGtTypingUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/LtGtTypingUtils.java @@ -30,15 +30,15 @@ final class LtGtTypingUtils { private LtGtTypingUtils() { } - static void handleJetAutoCloseLT(Editor editor) { + static void handleKotlinAutoCloseLT(Editor editor) { JavaTypedHandler.handleAfterJavaLT(editor, KtTokens.LT, KtTokens.GT, INVALID_INSIDE_REFERENCE); } - static boolean handleJetGTInsert(Editor editor) { + static boolean handleKotlinGTInsert(Editor editor) { return JavaTypedHandler.handleJavaGT(editor, KtTokens.LT, KtTokens.GT, INVALID_INSIDE_REFERENCE); } - static void handleJetLTDeletion(Editor editor, int offset) { + static void handleKotlinLTDeletion(Editor editor, int offset) { JavaBackspaceHandler.handleLTDeletion(editor, offset, KtTokens.LT, KtTokens.GT, INVALID_INSIDE_REFERENCE); } diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java index 49a342f4eb3..4c6eb82bc7f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtClassOrObject; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import javax.swing.*; @@ -90,7 +90,7 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog { //noinspection ConstantConditions javaClass.getModifierList().setModifierProperty( PsiModifier.FINAL, - !(classOrObject instanceof KtClass && JetPsiUtilKt.isInheritable((KtClass) classOrObject)) + !(classOrObject instanceof KtClass && KtPsiUtilKt.isInheritable((KtClass) classOrObject)) ); javaClass.putUserData(ORIGINAL_CLASS, classOrObject); diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt index 56637c61c19..653cc4fbf66 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -156,7 +156,7 @@ public class KotlinFindClassUsagesHandler( val klass = companionObject.getStrictParentOfType() ?: return@runReadAction val companionObjectDescriptor = companionObject.descriptor klass.acceptChildren(object : KtVisitorVoid() { - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { if (element == companionObject) return // skip companion object itself if (stop) return element.acceptChildren(this) diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/CalleeReferenceVisitorBase.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/CalleeReferenceVisitorBase.java index 79fb926cfee..8c84085cb84 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/CalleeReferenceVisitorBase.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/CalleeReferenceVisitorBase.java @@ -39,9 +39,9 @@ public abstract class CalleeReferenceVisitorBase extends KtTreeVisitorVoid { protected abstract void processDeclaration(KtSimpleNameExpression reference, PsiElement declaration); @Override - public void visitJetElement(@NotNull KtElement element) { + public void visitKtElement(@NotNull KtElement element) { if (deepTraversal || !(element instanceof KtClassOrObject || element instanceof KtNamedFunction)) { - super.visitJetElement(element); + super.visitKtElement(element); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index 3821164cba5..d6791bb1360 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -119,7 +119,7 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure { processPsiMethodCallers(Collections.singleton(lightMethod), descriptor, methodToDescriptorMap, searchScope, false); } else { - processJetClassOrObjectCallers((KtClassOrObject) element, descriptor, methodToDescriptorMap, searchScope); + processKtClassOrObjectCallers((KtClassOrObject) element, descriptor, methodToDescriptorMap, searchScope); } } @@ -164,7 +164,7 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure { ContainerUtil.process(references, defaultQueryProcessor(descriptor, methodToDescriptorMap, kotlinOnly)); } - private void processJetClassOrObjectCallers( + private void processKtClassOrObjectCallers( final KtClassOrObject classOrObject, HierarchyNodeDescriptor descriptor, Map methodToDescriptorMap, diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt index 0b943556e4b..175521ebaaa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt @@ -63,7 +63,7 @@ public class KotlinHighlightExitPointsHandlerFactory: HighlightUsagesHandlerFact override fun computeUsages(targets: MutableList?) { val relevantFunction = target.getRelevantFunction() relevantFunction?.accept(object : KtVisitorVoid() { - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { element.acceptChildren(this) } diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt index 9404ce44b5c..f75a3e6bbff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt @@ -84,7 +84,7 @@ public class KotlinImportOptimizer() : ImportOptimizer { override fun visitPackageDirective(directive: KtPackageDirective) { } - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { for (reference in element.references) { if (reference !is KtReference) continue @@ -112,7 +112,7 @@ public class KotlinImportOptimizer() : ImportOptimizer { } } - super.visitJetElement(element) + super.visitKtElement(element) } private fun isAccessibleAsMember(target: DeclarationDescriptor, place: KtElement, bindingContext: BindingContext): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt index 1ea2703cd3b..ea54a682ecc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt @@ -62,7 +62,7 @@ class DeprecatedUsageOfStaticFieldInspection : LocalInspectionTool(), CleanupLoc private fun createFixes(containingObject: KtObjectDeclaration, property: KtProperty?): List { - if (containingObject.getContainingJetFile().isCompiled) return listOf(ReplaceWithGetterInvocationFix()) + if (containingObject.getContainingKtFile().isCompiled) return listOf(ReplaceWithGetterInvocationFix()) // order matters here, 'cleanup' applies fixes in this order val fixes = ArrayList() diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt index acda9da2e7f..8a97b86d2cd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt @@ -53,7 +53,7 @@ public class UnusedReceiverParameterInspection : AbstractKotlinInspection() { var used = false callableDeclaration.acceptChildren(object : KtVisitorVoid() { - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { if (used) return element.acceptChildren(this) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt index 3473f315640..b53f1378236 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt @@ -160,7 +160,7 @@ public class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeInten } } - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { element.acceptChildren(this) } }) @@ -193,7 +193,7 @@ public class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeInten } private fun extractImports(expression: KtExpression): Collection { - val file = expression.getContainingJetFile() + val file = expression.getContainingKtFile() val currentPackageFqName = file.getPackageFqName() val importHelper = ImportInsertHelper.getInstance(expression.getProject()) @@ -213,7 +213,7 @@ public class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeInten } } - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { element.acceptChildren(this) } }) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt index 213fc641bdd..d523a74f8f6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt @@ -148,7 +148,7 @@ class ObjectLiteralToLambdaIntention : SelfTargetingRangeIntention>> 32)); result = 31 * result + startOffset; result = 31 * result + endOffset; diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.java index 5c8de6218c6..a869ed2ed87 100644 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.java +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.java @@ -61,7 +61,7 @@ public class KtClassOrObjectTreeNode extends AbstractPsiBasedNode( ) : CreateParameterFromUsageFix? { val receiverClassDescriptor: ClassDescriptor - val builder = CallableBuilderConfiguration(listOf(info), element, element.getContainingJetFile(), null, false).createBuilder() + val builder = CallableBuilderConfiguration(listOf(info), element, element.getContainingKtFile(), null, false).createBuilder() val receiverTypeCandidate = builder.computeTypeCandidates(info.receiverTypeInfo).firstOrNull() if (receiverTypeCandidate != null) { builder.placement = CallablePlacement.WithReceiver(receiverTypeCandidate) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/CallableUsageReplacementStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/CallableUsageReplacementStrategy.kt index d7a7b7ff70d..15ea9da2f9e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/CallableUsageReplacementStrategy.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/CallableUsageReplacementStrategy.kt @@ -153,7 +153,7 @@ private fun performCallReplacement( val wrappedExpression = callKindHandler.wrapGeneratedExpression(wrapper.expression) var result = elementToBeReplaced.replace(wrappedExpression) as KtElement - val file = result.getContainingJetFile() + val file = result.getContainingKtFile() replacement.fqNamesToImport .flatMap { file.resolveImportReference(it) } .forEach { ImportInsertHelper.getInstance(project).importDescriptor(file, it) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java index 49cfbdb5d7a..2b876b51aea 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.string.StringUtilKt; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; @@ -314,7 +314,7 @@ public class JetRefactoringUtil { } private static void addParameter(@NotNull PsiMethod method, @NotNull Set result, @NotNull PsiParameter parameter) { - int parameterIndex = JetPsiUtilKt.parameterIndex(LightClassUtilsKt.getUnwrapped(parameter)); + int parameterIndex = KtPsiUtilKt.parameterIndex(LightClassUtilsKt.getUnwrapped(parameter)); if (method instanceof KtLightMethod) { KtDeclaration declaration = ((KtLightMethod) method).getOrigin(); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java index c07efeec041..9942916456c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.ShortenReferences.Options; import org.jetbrains.kotlin.lexer.KtModifierKeywordToken; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersKt; import org.jetbrains.kotlin.resolve.BindingContext; @@ -184,7 +184,7 @@ public class JetCallableDefinitionUsage extends JetUsageIn changeReturnTypeIfNeeded(changeInfo, element); - KtParameterList parameterList = JetPsiUtilKt.getValueParameterList((KtNamedDeclaration) element); + KtParameterList parameterList = KtPsiUtilKt.getValueParameterList((KtNamedDeclaration) element); if (changeInfo.isParameterSetOrOrderChanged()) { processParameterListWithStructuralChanges(changeInfo, element, parameterList, psiFactory); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java index 35ed8396734..759dcac2443 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java @@ -59,7 +59,7 @@ import org.jetbrains.kotlin.idea.resolve.ResolutionFacade; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; @@ -90,7 +90,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { @Override public void inlineElement(final Project project, final Editor editor, PsiElement element) { final KtProperty val = (KtProperty) element; - final KtFile file = val.getContainingJetFile(); + final KtFile file = val.getContainingKtFile(); String name = val.getName(); KtExpression initializerInDeclaration = val.getInitializer(); @@ -101,7 +101,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { for (KtExpression expression : referenceExpressions) { PsiElement parent = expression.getParent(); - KtBinaryExpression assignment = JetPsiUtilKt.getAssignmentByLHS(expression); + KtBinaryExpression assignment = KtPsiUtilKt.getAssignmentByLHS(expression); if (assignment != null) { assignments.add(parent); } @@ -302,7 +302,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { } private static void addFunctionLiteralParameterTypes(@NotNull String parameters, @NotNull List inlinedExpressions) { - KtFile containingFile = inlinedExpressions.get(0).getContainingJetFile(); + KtFile containingFile = inlinedExpressions.get(0).getContainingKtFile(); List functionsToAddParameters = Lists.newArrayList(); ResolutionFacade resolutionFacade = ResolutionUtils.getResolutionFacade(containingFile); @@ -363,7 +363,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { } private static void addTypeArguments(@NotNull String typeArguments, @NotNull List inlinedExpressions) { - KtFile containingFile = inlinedExpressions.get(0).getContainingJetFile(); + KtFile containingFile = inlinedExpressions.get(0).getContainingKtFile(); List callsToAddArguments = Lists.newArrayList(); ResolutionFacade resolutionFacade = ResolutionUtils.getResolutionFacade(containingFile); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index 4e21b58b673..4ee4bd81290 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -1056,12 +1056,12 @@ fun ExtractableCodeDescriptor.validate(): ExtractableCodeDescriptorWithConflicts } } - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { if (element == body) { validateBody() return } - super.visitJetElement(element) + super.visitKtElement(element) } } ) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt index 7c506bed7d0..ed85336c7ea 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt @@ -630,7 +630,7 @@ fun ExtractionGeneratorConfiguration.generateDeclaration( val declaration = createDeclaration().let { if (shouldInsert) insertDeclaration(it, anchor) else it } adjustDeclarationBody(declaration) - if (declaration is KtNamedFunction && declaration.getContainingJetFile().suppressDiagnosticsInDebugMode) { + if (declaration is KtNamedFunction && declaration.getContainingKtFile().suppressDiagnosticsInDebugMode) { declaration.receiverTypeReference?.debugTypeInfo = descriptor.receiverParameter?.getParameterType(true) for ((i, param) in declaration.valueParameters.withIndex()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt index 9ca30e0f3e3..0b5e964b963 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt @@ -388,8 +388,8 @@ private fun findInternalUsagesOfParametersAndReceiver( } } - override fun visitJetElement(element: KtElement) { - super.visitJetElement(element) + override fun visitKtElement(element: KtElement) { + super.visitKtElement(element) val bindingContext = element.analyze() val resolvedCall = element.getResolvedCall(bindingContext) ?: return @@ -469,7 +469,7 @@ public open class KotlinIntroduceLambdaParameterHandler( is KtClass -> targetParent.getBody() else -> null } ?: throw AssertionError("Body element is not found: ${targetParent.getElementTextWithContext()}") - val extractionData = ExtractionData(expression.getContainingJetFile(), + val extractionData = ExtractionData(expression.getContainingKtFile(), expression.toRange(), targetParent, duplicateContainer, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 88c357a31e3..3b038556bfa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -58,7 +58,7 @@ import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRangeKt; import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiUnifier; import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.ObservableBindingTrace; @@ -469,7 +469,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { KtExpression replacement = psiFactory.createExpression(nameSuggestion); KtExpression result; - if (JetPsiUtilKt.isFunctionLiteralOutsideParentheses(replace)) { + if (KtPsiUtilKt.isFunctionLiteralOutsideParentheses(replace)) { KtFunctionLiteralArgument functionLiteralArgument = PsiTreeUtil.getParentOfType(replace, KtFunctionLiteralArgument.class); KtCallExpression newCallExpression = PsiModificationUtilsKt diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt index d5b79b4d4dd..b6b92d08c05 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt @@ -43,7 +43,7 @@ public class ChangePackageIntention: SelfTargetingOffsetIndependentIntention element.getClassOrInterfaceKeyword() @@ -59,7 +59,7 @@ public class MoveDeclarationToSeparateFileIntention : } override fun applyTo(element: KtClassOrObject, editor: Editor) { - val file = element.getContainingJetFile() + val file = element.getContainingKtFile() val project = file.project val originalOffset = editor.caretModel.offset - element.startOffset val directory = file.containingDirectory ?: return diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index d847ca7636c..29f2ff2bd95 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -98,7 +98,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor( private var nonCodeUsages: Array? = null private val elementsToMove = options.elementsToMove.filter { e -> e.getContainingFile() != options.moveTarget.getTargetPsiIfExists(e) } private val kotlinToLightElementsBySourceFile = elementsToMove - .groupBy { it.getContainingJetFile() } + .groupBy { it.getContainingKtFile() } .mapValues { it.value.keysToMap { it.toLightElements() } } private val conflicts = MultiMap() @@ -299,7 +299,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor( continue } - oldToNewElementsMapping[sourceFile] = newDeclaration.getContainingJetFile() + oldToNewElementsMapping[sourceFile] = newDeclaration.getContainingKtFile() getTransaction()!!.getElementListener(oldDeclaration).elementMoved(newDeclaration) for ((oldElement, newElement) in oldLightElements.asSequence() zip newDeclaration.toLightElements().asSequence()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index a2834c68300..f76f5a385e9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -150,7 +150,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { new Function1() { @Override public KtFile invoke(KtNamedDeclaration declaration) { - return declaration.getContainingJetFile(); + return declaration.getContainingKtFile(); } } ) @@ -395,7 +395,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { new Function1() { @Override public KtFile invoke(KtNamedDeclaration declaration) { - return declaration.getContainingJetFile(); + return declaration.getContainingKtFile(); } } ); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt index 45c86ffc123..493849bea08 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt @@ -62,11 +62,11 @@ class KotlinPullUpHelper( private fun KtExpression.isMovable(): Boolean { return accept( object: KtVisitor() { - override fun visitJetElement(element: KtElement, arg: Nothing?): Boolean { + override fun visitKtElement(element: KtElement, arg: Nothing?): Boolean { return element.allChildren.all { (it as? KtElement)?.accept(this, arg) ?: true } } - override fun visitJetFile(file: KtFile, data: Nothing?) = false + override fun visitKtFile(file: KtFile, data: Nothing?) = false override fun visitSimpleNameExpression(expression: KtSimpleNameExpression, arg: Nothing?): Boolean { val resolvedCall = expression.getResolvedCall(data.resolutionFacade.analyze(expression)) ?: return true diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelperFactory.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelperFactory.kt index 02f79158192..68786c4d17d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelperFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelperFactory.kt @@ -70,7 +70,7 @@ public class JavaToKotlinPullUpHelperFactory : PullUpHelperFactory { val targetClass = data.targetClass.unwrapped as? KtClass ?: return null val project = targetClass.project - val targetPackage = targetClass.getContainingJetFile().packageFqName.asString() + val targetPackage = targetClass.getContainingKtFile().packageFqName.asString() val dummyFile = PsiFileFactory.getInstance(project).createFileFromText( "dummy.java", JavaFileType.INSTANCE, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt index 77b3e70ed2e..eb0a58ed940 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt @@ -20,9 +20,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.listeners.RefactoringElementListener import com.intellij.refactoring.util.CommonRefactoringUtil -import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.KtLightClass import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration import org.jetbrains.kotlin.asJava.KtLightClassForFacade @@ -41,13 +39,13 @@ public class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() { } override fun substituteElementToRename(element: PsiElement, editor: Editor?): PsiElement? { - return getJetClassOrObject(element, true, editor) + return getKtClassOrObject(element, true, editor) } override fun prepareRenaming(element: PsiElement, newName: String, allRenames: MutableMap) { - val classOrObject = getJetClassOrObject(element, false, null) ?: return + val classOrObject = getKtClassOrObject(element, false, null) ?: return - val file = classOrObject.getContainingJetFile() + val file = classOrObject.getContainingKtFile() val virtualFile = file.virtualFile if (virtualFile != null) { @@ -73,7 +71,7 @@ public class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() { return bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, element] != null } - private fun getJetClassOrObject(element: PsiElement?, showErrors: Boolean, editor: Editor?): KtClassOrObject? = when (element) { + private fun getKtClassOrObject(element: PsiElement?, showErrors: Boolean, editor: Editor?): KtClassOrObject? = when (element) { is KtLightClass -> if (element is KtLightClassForExplicitDeclaration) { element.getOrigin() diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt index 0a214d93dee..86dd7ffe274 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt @@ -66,8 +66,8 @@ public class KotlinAnnotatedElementsSearcher : QueryExecutor() ?: return true @@ -91,7 +91,7 @@ public class KotlinAnnotatedElementsSearcher : QueryExecutor { + private fun getKotlinAnnotationCandidates(annClass: PsiClass, useScope: SearchScope): Collection { return runReadAction(fun(): Collection { if (useScope is GlobalSearchScope) { val name = annClass.getName() ?: return emptyList() @@ -102,7 +102,7 @@ public class KotlinAnnotatedElementsSearcher : QueryExecutor() scope.accept( object: KtTreeVisitorVoid() { - override fun visitJetElement(element: KtElement) { + override fun visitKtElement(element: KtElement) { val range = element .siblings() .filter(SIGNIFICANT_FILTER) @@ -81,7 +81,7 @@ public interface KotlinPsiRange { } else { val matchCountSoFar = matches.size() - super.visitJetElement(element) + super.visitKtElement(element) if (result is UnificationResult.WeaklyMatched && matches.size() == matchCountSoFar) { matches.add(Match(range, result)) } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java index cc32e0200f9..78a6a2243bf 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java @@ -32,7 +32,7 @@ public abstract class TranslatorVisitor extends KtVisitor