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

[Commonizer] Minor. Improve error reporting

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-06-01 14:19:59 +07:00
parent be9e25a2e5
commit 3654da8a63
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
+3 -4
View File
@@ -52,7 +52,6 @@ internal fun List<CirTypeParameter>.buildDescriptorsAndTypeParameterResolver(
return ownTypeParameters to typeParameterResolver return ownTypeParameters to typeParameterResolver
} }
internal fun List<CirValueParameter>.buildDescriptors( internal fun List<CirValueParameter>.buildDescriptors(
targetComponents: TargetDeclarationsBuilderComponents, targetComponents: TargetDeclarationsBuilderComponents,
typeParameterResolver: TypeParameterResolver, typeParameterResolver: TypeParameterResolver,
@@ -111,7 +110,7 @@ internal fun CirSimpleType.buildType(
CirSimpleTypeKind.TYPE_PARAMETER -> { CirSimpleTypeKind.TYPE_PARAMETER -> {
typeParameterResolver.resolve(fqName.shortName()) typeParameterResolver.resolve(fqName.shortName())
?: error("Type parameter $fqName not found in ${typeParameterResolver::class.java}, $typeParameterResolver") ?: error("Type parameter $fqName not found in ${typeParameterResolver::class.java}, $typeParameterResolver for ${targetComponents.target}")
} }
CirSimpleTypeKind.CLASS, CirSimpleTypeKind.TYPE_ALIAS -> { CirSimpleTypeKind.CLASS, CirSimpleTypeKind.TYPE_ALIAS -> {
@@ -150,13 +149,13 @@ internal fun findClassOrTypeAlias(
// TODO: this works fine for Native as far as built-ins module contains full Native stdlib, but this is not enough for JVM and JS // TODO: this works fine for Native as far as built-ins module contains full Native stdlib, but this is not enough for JVM and JS
builtInsModule.resolveClassOrTypeAliasByFqName(fqName, NoLookupLocation.FOR_ALREADY_TRACKED) builtInsModule.resolveClassOrTypeAliasByFqName(fqName, NoLookupLocation.FOR_ALREADY_TRACKED)
?: error("Classifier $fqName not found in built-ins module $builtInsModule") ?: error("Classifier $fqName not found in built-ins module $builtInsModule for ${targetComponents.target}")
} }
else -> { else -> {
// otherwise, find the appropriate user classifier: // otherwise, find the appropriate user classifier:
targetComponents.findAppropriateClassOrTypeAlias(fqName) targetComponents.findAppropriateClassOrTypeAlias(fqName)
?: error("Classifier $fqName not found in created descriptors cache") ?: error("Classifier $fqName not found in created descriptors cache for ${targetComponents.target}")
} }
} }