Skip to content

Commit 0a351b7

Browse files
committed
Underscore query: tolerate synthetic functions
1 parent 41ca791 commit 0a351b7

File tree

6 files changed

+48
-6
lines changed

6 files changed

+48
-6
lines changed

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/IsUnderscoreParameter.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
99

1010
@OptIn(ObsoleteDescriptorBasedAPI::class)
1111
fun isUnderscoreParameter(vp: IrValueParameter) =
12-
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)?.safeAs<KtParameter>()?.isSingleUnderscore == true
12+
try {
13+
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)
14+
?.safeAs<KtParameter>()?.isSingleUnderscore == true
15+
} catch(e: NotImplementedError) {
16+
// Some kinds of descriptor throw in `getSourceFromDescriptor` as that method is not normally expected to
17+
// be applied to synthetic functions.
18+
false
19+
}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/IsUnderscoreParameter.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
99

1010
@OptIn(ObsoleteDescriptorBasedAPI::class)
1111
fun isUnderscoreParameter(vp: IrValueParameter) =
12-
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)?.safeAs<KtParameter>()?.isSingleUnderscore == true
12+
try {
13+
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)
14+
?.safeAs<KtParameter>()?.isSingleUnderscore == true
15+
} catch(e: NotImplementedError) {
16+
// Some kinds of descriptor throw in `getSourceFromDescriptor` as that method is not normally expected to
17+
// be applied to synthetic functions.
18+
false
19+
}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/IsUnderscoreParameter.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
99

1010
@OptIn(ObsoleteDescriptorBasedAPI::class)
1111
fun isUnderscoreParameter(vp: IrValueParameter) =
12-
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)?.safeAs<KtParameter>()?.isSingleUnderscore == true
12+
try {
13+
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)
14+
?.safeAs<KtParameter>()?.isSingleUnderscore == true
15+
} catch(e: NotImplementedError) {
16+
// Some kinds of descriptor throw in `getSourceFromDescriptor` as that method is not normally expected to
17+
// be applied to synthetic functions.
18+
false
19+
}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/IsUnderscoreParameter.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
99

1010
@OptIn(ObsoleteDescriptorBasedAPI::class)
1111
fun isUnderscoreParameter(vp: IrValueParameter) =
12-
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)?.safeAs<KtParameter>()?.isSingleUnderscore == true
12+
try {
13+
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)
14+
?.safeAs<KtParameter>()?.isSingleUnderscore == true
15+
} catch(e: NotImplementedError) {
16+
// Some kinds of descriptor throw in `getSourceFromDescriptor` as that method is not normally expected to
17+
// be applied to synthetic functions.
18+
false
19+
}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_31/IsUnderscoreParameter.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
99

1010
@OptIn(ObsoleteDescriptorBasedAPI::class)
1111
fun isUnderscoreParameter(vp: IrValueParameter) =
12-
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)?.safeAs<KtParameter>()?.isSingleUnderscore == true
12+
try {
13+
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)
14+
?.safeAs<KtParameter>()?.isSingleUnderscore == true
15+
} catch(e: NotImplementedError) {
16+
// Some kinds of descriptor throw in `getSourceFromDescriptor` as that method is not normally expected to
17+
// be applied to synthetic functions.
18+
false
19+
}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_10/IsUnderscoreParameter.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
99

1010
@OptIn(ObsoleteDescriptorBasedAPI::class)
1111
fun isUnderscoreParameter(vp: IrValueParameter) =
12-
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)?.safeAs<KtParameter>()?.isSingleUnderscore == true
12+
try {
13+
DescriptorToSourceUtils.getSourceFromDescriptor(vp.descriptor)
14+
?.safeAs<KtParameter>()?.isSingleUnderscore == true
15+
} catch(e: NotImplementedError) {
16+
// Some kinds of descriptor throw in `getSourceFromDescriptor` as that method is not normally expected to
17+
// be applied to synthetic functions.
18+
false
19+
}

0 commit comments

Comments
 (0)