Fix "Koltin" typos throughout codebase (#3383)
* Fix "Koltin" typos throughout codebase * Update K2MetadataKlibSerializer.kt
This commit is contained in:
@@ -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()
|
||||
)
|
||||
)
|
||||
|
||||
+2
-2
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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<KotlinLibrary>,
|
||||
metadata: SerializedMetadata,
|
||||
ir: SerializedIrModule?,
|
||||
@@ -117,7 +117,7 @@ fun buildKoltinLibrary(
|
||||
nativeTargets: List<String> = 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 }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -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,
|
||||
|
||||
@@ -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<Unit> 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.
|
||||
However, we wanted to clarify the compiler choice in the cases when it might be unclear.
|
||||
|
||||
Reference in New Issue
Block a user