From 4f26ac9a0454c6e696f7d146d07f627fcbc8048a Mon Sep 17 00:00:00 2001 From: Kevin Most Date: Wed, 20 May 2020 08:12:32 -0400 Subject: [PATCH] Fix "Koltin" typos throughout codebase (#3383) * Fix "Koltin" typos throughout codebase * Update K2MetadataKlibSerializer.kt --- .../kotlin/cli/metadata/K2MetadataKlibSerializer.kt | 6 +++--- .../testData/resolve/syntheticsVsNormalProperties.kt | 4 ++-- .../src/org/jetbrains/kotlin/ir/backend/js/klib.kt | 4 ++-- .../kotlin/library/impl/KotlinLibraryWriterImpl.kt | 8 ++++---- .../commonizer/konan/NativeDistributionCommonizer.kt | 4 ++-- spec-docs/NameResolution.adoc | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt index ce12279c0c8..dca69532cb1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.library.* import org.jetbrains.kotlin.library.impl.BuiltInsPlatform -import org.jetbrains.kotlin.library.impl.buildKoltinLibrary +import org.jetbrains.kotlin.library.impl.buildKotlinLibrary import org.jetbrains.kotlin.library.metadata.NativeTypeTransformer import org.jetbrains.kotlin.library.metadata.NullFlexibleTypeDeserializer import org.jetbrains.kotlin.library.metadata.parseModuleHeader @@ -83,7 +83,7 @@ internal class K2MetadataKlibSerializer(private val metadataVersion: BuiltInsBin irVersion = null ) - buildKoltinLibrary( + buildKotlinLibrary( emptyList(), serializedMetadata, null, @@ -244,4 +244,4 @@ private val MetadataFactories = { DefaultBuiltIns.Instance }, NullFlexibleTypeDeserializer, NativeTypeTransformer() - ) \ No newline at end of file + ) diff --git a/compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.kt b/compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.kt index 27fa05cbe70..7b5b6841805 100644 --- a/compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.kt +++ b/compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.kt @@ -1,5 +1,5 @@ /* - * If koltin property hides some getter from java superclass this property should win in resolve + * If kotlin property hides some getter from java superclass this property should win in resolve */ // FILE: A.java @@ -27,4 +27,4 @@ class B : A() { fun test(b: B) { // should be CommandExecutor b.executor -} \ No newline at end of file +} diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt index daedfb6659a..23ac7a798c0 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.konan.properties.propertyList import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.library.* import org.jetbrains.kotlin.library.impl.BuiltInsPlatform -import org.jetbrains.kotlin.library.impl.buildKoltinLibrary +import org.jetbrains.kotlin.library.impl.buildKotlinLibrary import org.jetbrains.kotlin.library.resolver.KotlinLibraryResolveResult import org.jetbrains.kotlin.library.resolver.TopologicalLibraryOrder import org.jetbrains.kotlin.metadata.ProtoBuf @@ -516,7 +516,7 @@ fun serializeModuleIntoKlib( irVersion = KlibIrVersion.INSTANCE.toString() ) - buildKoltinLibrary( + buildKotlinLibrary( linkDependencies = dependencies, ir = fullSerializedIr, metadata = serializedMetadata, diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt index 8a9f61fec7c..f31638a7d1b 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt @@ -85,7 +85,7 @@ open class BaseWriterImpl( /** * Requires non-null [target]. */ -class KoltinLibraryWriterImpl( +class KotlinLibraryWriterImpl( libDir: File, moduleName: String, versions: KotlinLibraryVersioning, @@ -103,7 +103,7 @@ class KoltinLibraryWriterImpl( ) : BaseWriter by base, MetadataWriter by metadata, IrWriter by ir, KotlinLibraryWriter -fun buildKoltinLibrary( +fun buildKotlinLibrary( linkDependencies: List, metadata: SerializedMetadata, ir: SerializedIrModule?, @@ -117,7 +117,7 @@ fun buildKoltinLibrary( nativeTargets: List = emptyList() ): KotlinLibraryLayout { - val library = KoltinLibraryWriterImpl(File(output), moduleName, versions, builtInsPlatform, nativeTargets, nopack) + val library = KotlinLibraryWriterImpl(File(output), moduleName, versions, builtInsPlatform, nativeTargets, nopack) library.addMetadata(metadata) @@ -139,4 +139,4 @@ enum class BuiltInsPlatform { companion object { fun parseFromString(name: String): BuiltInsPlatform? = values().firstOrNull { it.name == name } } -} \ No newline at end of file +} diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt index 12cc3d9d4bf..e682eddc6f9 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.library.SerializedMetadata import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy import org.jetbrains.kotlin.library.impl.BaseWriterImpl import org.jetbrains.kotlin.library.impl.BuiltInsPlatform -import org.jetbrains.kotlin.library.impl.KoltinLibraryWriterImpl +import org.jetbrains.kotlin.library.impl.KotlinLibraryWriterImpl import org.jetbrains.kotlin.library.resolveSingleFileKlib import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.konan.impl.KlibResolvedModuleDescriptorsFactoryImpl @@ -246,7 +246,7 @@ class NativeDistributionCommonizer( manifestData: NativeSensitiveManifestData, destination: File ) { - val library = KoltinLibraryWriterImpl( + val library = KotlinLibraryWriterImpl( libDir = KFile(destination.path), moduleName = manifestData.uniqueName, versions = manifestData.versions, diff --git a/spec-docs/NameResolution.adoc b/spec-docs/NameResolution.adoc index de796dc26ca..6d9df19b127 100644 --- a/spec-docs/NameResolution.adoc +++ b/spec-docs/NameResolution.adoc @@ -733,7 +733,7 @@ public class J { /* original method */ public int foo(Runnable r) { return 1; } - /* syntactic method generated by the Koltin compiler for name resolution */ + /* syntactic method generated by the Kotlin compiler for name resolution */ public int foo(final Function0 f) { return foo(new Runnable() { public void run() { @@ -830,4 +830,4 @@ Thus in Kotlin 1.1 the algorithm was slightly changed, and the syntactic methods We discussed how the Kotlin compiler chooses the function that should be called in each invocation. Generally we expect that you write code without confusing overloaded functions. -However, we wanted to clarify the compiler choice in the cases when it might be unclear. \ No newline at end of file +However, we wanted to clarify the compiler choice in the cases when it might be unclear.