From 4f77b02a58883974cef7c3470f1e9651a68003e4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 14 Mar 2016 20:40:30 +0300 Subject: [PATCH] Rename 'ins' -> 'Ins' in BuiltinsPackageFragment and related classes --- .../kotlin/codegen/inline/InlineCodegen.java | 4 +-- .../codegen/state/KotlinTypeMapper.java | 4 +-- .../builtins/BuiltInsSerializer.kt | 8 ++--- .../resolve/jvm/platform/JvmPlatform.kt | 2 +- .../kotlin/analyzer/AnalyzerFacade.kt | 8 ++--- .../resolve/lazy/lazyResolveTestUtils.kt | 10 +++--- .../kotlin/types/TypeUnifierTest.java | 6 ++-- ...Fragment.kt => BuiltInsPackageFragment.kt} | 4 +-- .../kotlin/builtins/KotlinBuiltIns.java | 34 +++++++++---------- .../builtInsPackageFragmentProvider.kt | 2 +- .../idea/completion/AllClassesCompletion.kt | 2 +- 11 files changed, 42 insertions(+), 42 deletions(-) rename core/descriptors/src/org/jetbrains/kotlin/builtins/{BuiltinsPackageFragment.kt => BuiltInsPackageFragment.kt} (97%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index ed40818cbb7..eb96aa489f3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.backend.common.CodegenUtil; -import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment; +import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicArrayConstructorsKt; @@ -272,7 +272,7 @@ public class InlineCodegen extends CallGenerator { if (functionDescriptor instanceof FictitiousArrayConstructor) return true; String name = functionDescriptor.getName().asString(); return (name.equals("arrayOf") || name.equals("emptyArray")) && - functionDescriptor.getContainingDeclaration() instanceof BuiltinsPackageFragment; + functionDescriptor.getContainingDeclaration() instanceof BuiltInsPackageFragment; } private InlineResult inlineCall(SMAPAndMethodNode nodeAndSmap) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java index 706ea9ac8bb..c0a0744eff7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java @@ -22,7 +22,7 @@ import kotlin.Pair; import kotlin.collections.CollectionsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment; +import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor; @@ -279,7 +279,7 @@ public class KotlinTypeMapper { : "Package member expected, got " + descriptor + " in " + containingDeclaration; PackageFragmentDescriptor packageFragmentDescriptor = (PackageFragmentDescriptor) containingDeclaration; - if (packageFragmentDescriptor instanceof BuiltinsPackageFragment) { + if (packageFragmentDescriptor instanceof BuiltInsPackageFragment) { return new ContainingClassesInfo(FAKE_CLASS_ID_FOR_BUILTINS, FAKE_CLASS_ID_FOR_BUILTINS); } diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt index 0b269b350c2..60ca2bf75f0 100644 --- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt @@ -67,11 +67,11 @@ class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) { } } - private inner class BuiltinsSourcesModule : ModuleInfo { + private inner class BuiltInsSourcesModule : ModuleInfo { override val name = Name.special("") override fun dependencies() = listOf(this) - override fun dependencyOnBuiltins(): ModuleInfo.DependencyOnBuiltins = - if (dependOnOldBuiltIns) ModuleInfo.DependenciesOnBuiltins.LAST else ModuleInfo.DependenciesOnBuiltins.NONE + override fun dependencyOnBuiltIns(): ModuleInfo.DependencyOnBuiltIns = + if (dependOnOldBuiltIns) ModuleInfo.DependenciesOnBuiltIns.LAST else ModuleInfo.DependenciesOnBuiltIns.NONE } private fun serialize(disposable: Disposable, destDir: File, srcDirs: List, extraClassPath: List) { @@ -85,7 +85,7 @@ class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) { val files = environment.getSourceFiles() - val builtInModule = BuiltinsSourcesModule() + val builtInModule = BuiltInsSourcesModule() val resolver = JvmAnalyzerFacade.setupResolverForProject( "builtIns source", ProjectContext(environment.project), listOf(builtInModule), diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt index eb2623d0103..06ae4784de9 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt @@ -61,7 +61,7 @@ private val DEFAULT_IMPORTS_FOR_JVM: List = ArrayList(). } val builtIns = JvmPlatform.builtIns - for (builtinPackageFragment in builtIns.builtinsPackageFragments) { + for (builtinPackageFragment in builtIns.builtInsPackageFragments) { addAllClassifiersFromScope(builtinPackageFragment.getMemberScope()) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index 6194adecd5d..2bbea854ece 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -115,16 +115,16 @@ interface ModuleInfo { val name: Name fun dependencies(): List fun modulesWhoseInternalsAreVisible(): Collection = listOf() - fun dependencyOnBuiltins(): DependencyOnBuiltins = DependenciesOnBuiltins.LAST + fun dependencyOnBuiltIns(): DependencyOnBuiltIns = DependenciesOnBuiltIns.LAST val capabilities: Map, Any?> get() = emptyMap() //TODO: (module refactoring) provide dependency on builtins after runtime in IDEA - interface DependencyOnBuiltins { + interface DependencyOnBuiltIns { fun adjustDependencies(builtinsModule: ModuleDescriptorImpl, dependencies: MutableList) } - enum class DependenciesOnBuiltins : DependencyOnBuiltins { + enum class DependenciesOnBuiltIns : DependencyOnBuiltIns { NONE { override fun adjustDependencies(builtinsModule: ModuleDescriptorImpl, dependencies: MutableList) { @@ -174,7 +174,7 @@ abstract class AnalyzerFacade { } val builtinsModule = targetPlatform.builtIns.builtInsModule - module.dependencyOnBuiltins().adjustDependencies(builtinsModule, dependenciesDescriptors) + module.dependencyOnBuiltIns().adjustDependencies(builtinsModule, dependenciesDescriptors) return dependenciesDescriptors } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt index 7131cb5c36c..bbda8197727 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt @@ -45,12 +45,12 @@ fun createResolveSessionForFiles( return resolverForProject.resolverForModule(testModule).componentProvider.get() } -private class TestModule(val dependsOnBuiltins: Boolean) : ModuleInfo { +private class TestModule(val dependsOnBuiltIns: Boolean) : ModuleInfo { override val name: Name = Name.special("") override fun dependencies() = listOf(this) - override fun dependencyOnBuiltins() = - if (dependsOnBuiltins) - ModuleInfo.DependenciesOnBuiltins.LAST + override fun dependencyOnBuiltIns() = + if (dependsOnBuiltIns) + ModuleInfo.DependenciesOnBuiltIns.LAST else - ModuleInfo.DependenciesOnBuiltins.NONE + ModuleInfo.DependenciesOnBuiltIns.NONE } diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index fe876042985..f5131d93984 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -24,7 +24,7 @@ import kotlin.collections.CollectionsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment; +import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; @@ -68,9 +68,9 @@ public class TypeUnifierTest extends KotlinTestWithEnvironment { builtIns = module.getBuiltIns(); builtinsImportingScope = ScopeUtilsKt.chainImportingScopes( // builtIns.builtinsPackageFragments.map { it.memberScope.memberScopeAsImportingScope() } - CollectionsKt.map(builtIns.getBuiltinsPackageFragments(), new Function1() { + CollectionsKt.map(builtIns.getBuiltInsPackageFragments(), new Function1() { @Override - public ImportingScope invoke(BuiltinsPackageFragment packageFragment) { + public ImportingScope invoke(BuiltInsPackageFragment packageFragment) { return ScopeUtilsKt.memberScopeAsImportingScope(packageFragment.getMemberScope()); } }), null); diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt similarity index 97% rename from core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt rename to core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt index 99f1091fe2d..76086c412ee 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ import org.jetbrains.kotlin.storage.StorageManager import java.io.InputStream -class BuiltinsPackageFragment( +class BuiltInsPackageFragment( fqName: FqName, storageManager: StorageManager, module: ModuleDescriptor, diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index c06bb468d24..8c6c53011ba 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -61,17 +61,17 @@ public abstract class KotlinBuiltIns { ); protected final ModuleDescriptorImpl builtInsModule; - private final BuiltinsPackageFragment builtinsPackageFragment; - private final BuiltinsPackageFragment collectionsPackageFragment; - private final BuiltinsPackageFragment rangesPackageFragment; - private final BuiltinsPackageFragment annotationPackageFragment; + private final BuiltInsPackageFragment builtInsPackageFragment; + private final BuiltInsPackageFragment collectionsPackageFragment; + private final BuiltInsPackageFragment rangesPackageFragment; + private final BuiltInsPackageFragment annotationPackageFragment; - private final Set builtinsPackageFragments; + private final Set builtInsPackageFragments; private final Map primitiveTypeToArrayKotlinType; private final Map primitiveKotlinTypeToKotlinArrayType; private final Map kotlinArrayTypeToPrimitiveKotlinType; - private final Map packageNameToPackageFragment; + private final Map packageNameToPackageFragment; public static final FqNames FQ_NAMES = new FqNames(); @@ -96,14 +96,14 @@ public abstract class KotlinBuiltIns { builtInsModule.initialize(packageFragmentProvider); builtInsModule.setDependencies(builtInsModule); - packageNameToPackageFragment = new LinkedHashMap(); + packageNameToPackageFragment = new LinkedHashMap(); - builtinsPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, BUILT_INS_PACKAGE_FQ_NAME); + builtInsPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, BUILT_INS_PACKAGE_FQ_NAME); collectionsPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, COLLECTIONS_PACKAGE_FQ_NAME); rangesPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, RANGES_PACKAGE_FQ_NAME); annotationPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, ANNOTATION_PACKAGE_FQ_NAME); - builtinsPackageFragments = new LinkedHashSet(packageNameToPackageFragment.values()); + builtInsPackageFragments = new LinkedHashSet(packageNameToPackageFragment.values()); primitiveTypeToArrayKotlinType = new EnumMap(PrimitiveType.class); primitiveKotlinTypeToKotlinArrayType = new HashMap(); @@ -129,12 +129,12 @@ public abstract class KotlinBuiltIns { @NotNull - private static BuiltinsPackageFragment createPackage( + private static BuiltInsPackageFragment createPackage( @NotNull PackageFragmentProvider fragmentProvider, - @NotNull Map packageNameToPackageFragment, + @NotNull Map packageNameToPackageFragment, @NotNull FqName packageFqName ) { - BuiltinsPackageFragment packageFragment = (BuiltinsPackageFragment) single(fragmentProvider.getPackageFragments(packageFqName)); + BuiltInsPackageFragment packageFragment = (BuiltInsPackageFragment) single(fragmentProvider.getPackageFragments(packageFqName)); packageNameToPackageFragment.put(packageFqName, packageFragment); return packageFragment; } @@ -246,13 +246,13 @@ public abstract class KotlinBuiltIns { } @NotNull - public Set getBuiltinsPackageFragments() { - return builtinsPackageFragments; + public Set getBuiltInsPackageFragments() { + return builtInsPackageFragments; } @NotNull public PackageFragmentDescriptor getBuiltInsPackageFragment() { - return builtinsPackageFragment; + return builtInsPackageFragment; } public boolean isBuiltInPackageFragment(@Nullable PackageFragmentDescriptor packageFragment) { @@ -261,7 +261,7 @@ public abstract class KotlinBuiltIns { @NotNull public MemberScope getBuiltInsPackageScope() { - return builtinsPackageFragment.getMemberScope(); + return builtInsPackageFragment.getMemberScope(); } @NotNull @@ -290,7 +290,7 @@ public abstract class KotlinBuiltIns { public ClassDescriptor getBuiltInClassByFqNameNullable(@NotNull FqName fqName) { if (!fqName.isRoot()) { FqName parent = fqName.parent(); - BuiltinsPackageFragment packageFragment = packageNameToPackageFragment.get(parent); + BuiltInsPackageFragment packageFragment = packageNameToPackageFragment.get(parent); if (packageFragment != null) { return getBuiltInClassByNameNullable(fqName.shortName(), packageFragment); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt index 92467800714..82641f3d8e2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt @@ -34,7 +34,7 @@ fun createBuiltInPackageFragmentProvider( loadResource: (String) -> InputStream? ): PackageFragmentProvider { val packageFragments = packageFqNames.map { fqName -> - BuiltinsPackageFragment(fqName, storageManager, module, loadResource) + BuiltInsPackageFragment(fqName, storageManager, module, loadResource) } val provider = PackageFragmentProviderImpl(packageFragments) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt index 34a3b1e591e..af2d24b219c 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt @@ -44,7 +44,7 @@ class AllClassesCompletion(private val parameters: CompletionParameters, //TODO: this is a temporary solution until we have built-ins in indices // we need only nested classes because top-level built-ins are all added through default imports - for (builtinPackage in resolutionFacade.moduleDescriptor.builtIns.builtinsPackageFragments) { + for (builtinPackage in resolutionFacade.moduleDescriptor.builtIns.builtInsPackageFragments) { collectClassesFromScope(builtinPackage.getMemberScope()) { if (it.containingDeclaration is ClassDescriptor) { classDescriptorCollector(it)