Skip to content

Commit 8d17785

Browse files
committed
Do not throw errors when computing AW entry MemberReference
1 parent 1c7e871 commit 8d17785

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/main/kotlin/platform/mcp/aw/psi/mixins/impl/AwClassEntryImplMixin.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import com.intellij.util.resettableLazy
2929
abstract class AwClassEntryImplMixin(node: ASTNode) : AwEntryImplMixin(node), AwClassEntry, AwClassEntryMixin {
3030

3131
private val lazyMemberReference = resettableLazy {
32-
MemberReference("", owner = checkNotNull(targetClassName) { "Expected targetClassName" }.replace('/', '.'))
32+
val owner = targetClassName?.replace('/', '.') ?: return@resettableLazy null
33+
MemberReference("", owner = owner)
3334
}
3435

3536
override val memberReference: MemberReference? by lazyMemberReference

src/main/kotlin/platform/mcp/aw/psi/mixins/impl/AwFieldEntryImplMixin.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ abstract class AwFieldEntryImplMixin(node: ASTNode) : AwEntryImplMixin(node), Aw
3535
get() = findChildByType<PsiElement>(AwTypes.FIELD_DESC)?.text
3636

3737
private val lazyMemberReference = resettableLazy {
38-
MemberReference(
39-
checkNotNull(fieldName) { "Expected fieldName" },
40-
owner = checkNotNull(targetClassName) { "Expected targetClassName" }.replace('/', '.')
41-
)
38+
val name = fieldName ?: return@resettableLazy null
39+
val owner = targetClassName?.replace('/', '.') ?: return@resettableLazy null
40+
MemberReference(name, owner = owner)
4241
}
4342

4443
override val memberReference: MemberReference? by lazyMemberReference

src/main/kotlin/platform/mcp/aw/psi/mixins/impl/AwMethodEntryImplMixin.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ abstract class AwMethodEntryImplMixin(node: ASTNode) : AwEntryImplMixin(node), A
3535
get() = findChildByType<PsiElement>(AwTypes.METHOD_DESC)?.text
3636

3737
private val lazyMemberReference = resettableLazy {
38-
MemberReference(
39-
checkNotNull(methodName) { "Expected methodName" },
40-
descriptor = checkNotNull(methodDescriptor) { "Expected methodDescriptor" },
41-
owner = checkNotNull(targetClassName) { "Expected targetClassName" }.replace('/', '.')
42-
)
38+
val name = methodName ?: return@resettableLazy null
39+
val desc = methodDescriptor ?: return@resettableLazy null
40+
val owner = targetClassName?.replace('/', '.') ?: return@resettableLazy null
41+
MemberReference(name, desc, owner)
4342
}
4443

4544
override val memberReference: MemberReference? by lazyMemberReference

0 commit comments

Comments
 (0)