Fix "Koltin" typos throughout codebase (#3383)

* Fix "Koltin" typos throughout codebase

* Update K2MetadataKlibSerializer.kt
This commit is contained in:
Kevin Most
2020-05-20 08:12:32 -04:00
committed by GitHub
parent 38fd9c3d1a
commit 4f26ac9a04
6 changed files with 15 additions and 15 deletions
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.konan.util.KlibMetadataFactories
import org.jetbrains.kotlin.library.* import org.jetbrains.kotlin.library.*
import org.jetbrains.kotlin.library.impl.BuiltInsPlatform 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.NativeTypeTransformer
import org.jetbrains.kotlin.library.metadata.NullFlexibleTypeDeserializer import org.jetbrains.kotlin.library.metadata.NullFlexibleTypeDeserializer
import org.jetbrains.kotlin.library.metadata.parseModuleHeader import org.jetbrains.kotlin.library.metadata.parseModuleHeader
@@ -83,7 +83,7 @@ internal class K2MetadataKlibSerializer(private val metadataVersion: BuiltInsBin
irVersion = null irVersion = null
) )
buildKoltinLibrary( buildKotlinLibrary(
emptyList(), emptyList(),
serializedMetadata, serializedMetadata,
null, null,
@@ -244,4 +244,4 @@ private val MetadataFactories =
{ DefaultBuiltIns.Instance }, { DefaultBuiltIns.Instance },
NullFlexibleTypeDeserializer, NullFlexibleTypeDeserializer,
NativeTypeTransformer() NativeTypeTransformer()
) )
@@ -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 // FILE: A.java
@@ -27,4 +27,4 @@ class B : A() {
fun test(b: B) { fun test(b: B) {
// should be CommandExecutor // should be CommandExecutor
b.executor b.executor
} }
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.konan.properties.propertyList
import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.konan.util.KlibMetadataFactories
import org.jetbrains.kotlin.library.* import org.jetbrains.kotlin.library.*
import org.jetbrains.kotlin.library.impl.BuiltInsPlatform 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.KotlinLibraryResolveResult
import org.jetbrains.kotlin.library.resolver.TopologicalLibraryOrder import org.jetbrains.kotlin.library.resolver.TopologicalLibraryOrder
import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.ProtoBuf
@@ -516,7 +516,7 @@ fun serializeModuleIntoKlib(
irVersion = KlibIrVersion.INSTANCE.toString() irVersion = KlibIrVersion.INSTANCE.toString()
) )
buildKoltinLibrary( buildKotlinLibrary(
linkDependencies = dependencies, linkDependencies = dependencies,
ir = fullSerializedIr, ir = fullSerializedIr,
metadata = serializedMetadata, metadata = serializedMetadata,
@@ -85,7 +85,7 @@ open class BaseWriterImpl(
/** /**
* Requires non-null [target]. * Requires non-null [target].
*/ */
class KoltinLibraryWriterImpl( class KotlinLibraryWriterImpl(
libDir: File, libDir: File,
moduleName: String, moduleName: String,
versions: KotlinLibraryVersioning, versions: KotlinLibraryVersioning,
@@ -103,7 +103,7 @@ class KoltinLibraryWriterImpl(
) : BaseWriter by base, MetadataWriter by metadata, IrWriter by ir, KotlinLibraryWriter ) : BaseWriter by base, MetadataWriter by metadata, IrWriter by ir, KotlinLibraryWriter
fun buildKoltinLibrary( fun buildKotlinLibrary(
linkDependencies: List<KotlinLibrary>, linkDependencies: List<KotlinLibrary>,
metadata: SerializedMetadata, metadata: SerializedMetadata,
ir: SerializedIrModule?, ir: SerializedIrModule?,
@@ -117,7 +117,7 @@ fun buildKoltinLibrary(
nativeTargets: List<String> = emptyList() nativeTargets: List<String> = emptyList()
): KotlinLibraryLayout { ): KotlinLibraryLayout {
val library = KoltinLibraryWriterImpl(File(output), moduleName, versions, builtInsPlatform, nativeTargets, nopack) val library = KotlinLibraryWriterImpl(File(output), moduleName, versions, builtInsPlatform, nativeTargets, nopack)
library.addMetadata(metadata) library.addMetadata(metadata)
@@ -139,4 +139,4 @@ enum class BuiltInsPlatform {
companion object { companion object {
fun parseFromString(name: String): BuiltInsPlatform? = values().firstOrNull { it.name == name } fun parseFromString(name: String): BuiltInsPlatform? = values().firstOrNull { it.name == name }
} }
} }
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.library.SerializedMetadata
import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy
import org.jetbrains.kotlin.library.impl.BaseWriterImpl import org.jetbrains.kotlin.library.impl.BaseWriterImpl
import org.jetbrains.kotlin.library.impl.BuiltInsPlatform 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.library.resolveSingleFileKlib
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.serialization.konan.impl.KlibResolvedModuleDescriptorsFactoryImpl import org.jetbrains.kotlin.serialization.konan.impl.KlibResolvedModuleDescriptorsFactoryImpl
@@ -246,7 +246,7 @@ class NativeDistributionCommonizer(
manifestData: NativeSensitiveManifestData, manifestData: NativeSensitiveManifestData,
destination: File destination: File
) { ) {
val library = KoltinLibraryWriterImpl( val library = KotlinLibraryWriterImpl(
libDir = KFile(destination.path), libDir = KFile(destination.path),
moduleName = manifestData.uniqueName, moduleName = manifestData.uniqueName,
versions = manifestData.versions, versions = manifestData.versions,
+2 -2
View File
@@ -733,7 +733,7 @@ public class J {
/* original method */ /* original method */
public int foo(Runnable r) { return 1; } 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<Unit> f) { public int foo(final Function0<Unit> f) {
return foo(new Runnable() { return foo(new Runnable() {
public void run() { 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. 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. 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. However, we wanted to clarify the compiler choice in the cases when it might be unclear.