Skip to content

Commit c9e671f

Browse files
committed
fix: npe when control palette is on method line
1 parent 5a088dc commit c9e671f

File tree

1 file changed

+5
-2
lines changed
  • marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils

1 file changed

+5
-2
lines changed

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,10 +409,12 @@ object JVMMarkerUtils {
409409
element.putUserData(SourceKey.GutterMark, null)
410410
null
411411
}
412+
412413
gutterMark.configuration.icon != null -> {
413414
gutterMark.setVisible(true)
414415
gutterMark
415416
}
417+
416418
else -> {
417419
gutterMark.setVisible(false)
418420
gutterMark
@@ -461,7 +463,7 @@ object JVMMarkerUtils {
461463
Base64.getEncoder().encodeToString(expression.toString().toByteArray())
462464
}""",
463465
type = ArtifactType.EXPRESSION,
464-
lineNumber = SourceMarkerUtils.getLineNumber(expression.sourcePsi!!)
466+
lineNumber = expression.sourcePsi?.let { SourceMarkerUtils.getLineNumber(it) }
465467
)
466468
}
467469

@@ -511,7 +513,8 @@ object JVMMarkerUtils {
511513
}
512514
return ArtifactQualifiedName(
513515
"$classQualifiedName.${getQualifiedName(method)}",
514-
type = ArtifactType.METHOD
516+
type = ArtifactType.METHOD,
517+
lineNumber = method.sourcePsi?.let { SourceMarkerUtils.getLineNumber(it) }
515518
)
516519
}
517520

0 commit comments

Comments
 (0)