azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Specify explicit property types

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-04-08 17:45:49 +07:00
parent 753ef971f9
commit 90398fd087
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/AbstractKlibLibraryInfo.kt
+3 -2
View File
@@ -10,19 +10,20 @@ import com.intellij.openapi.roots.libraries.Library
import org.jetbrains.kotlin.idea.caches.project.LibraryInfo import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
import org.jetbrains.kotlin.idea.util.IJLoggerAdapter import org.jetbrains.kotlin.idea.util.IJLoggerAdapter
import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy
import org.jetbrains.kotlin.library.resolveSingleFileKlib import org.jetbrains.kotlin.library.resolveSingleFileKlib
import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatform
abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val libraryRoot: String) : LibraryInfo(project, library) { abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val libraryRoot: String) : LibraryInfo(project, library) {
val resolvedKotlinLibrary = resolveSingleFileKlib( val resolvedKotlinLibrary: KotlinLibrary = resolveSingleFileKlib(
libraryFile = File(libraryRoot), libraryFile = File(libraryRoot),
logger = LOG, logger = LOG,
strategy = ToolingSingleFileKlibResolveStrategy strategy = ToolingSingleFileKlibResolveStrategy
) )
val compatibilityInfo by lazy { resolvedKotlinLibrary.getCompatibilityInfo() } val compatibilityInfo: KlibCompatibilityInfo by lazy { resolvedKotlinLibrary.getCompatibilityInfo() }
final override fun getLibraryRoots() = listOf(libraryRoot) final override fun getLibraryRoots() = listOf(libraryRoot)
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
+1 -1
View File
@@ -151,7 +151,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
class NativeKlibLibraryInfo(project: Project, library: Library, libraryRoot: String) : class NativeKlibLibraryInfo(project: Project, library: Library, libraryRoot: String) :
AbstractKlibLibraryInfo(project, library, libraryRoot) { AbstractKlibLibraryInfo(project, library, libraryRoot) {
val isStdlib get() = libraryRoot.endsWith(KONAN_STDLIB_NAME) val isStdlib: Boolean get() = libraryRoot.endsWith(KONAN_STDLIB_NAME)
override val capabilities: Map<ModuleDescriptor.Capability<*>, Any?> override val capabilities: Map<ModuleDescriptor.Capability<*>, Any?>
get() { get() {