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.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,
|
||||||
|
|||||||
+1
-1
@@ -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
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -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,
|
||||||
|
|||||||
@@ -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() {
|
||||||
|
|||||||
Reference in New Issue
Block a user