Skip to content

Commit ae8f5ca

Browse files
committed
Use correct PsiElements in ColorLineMarkerProvider
1 parent 1ab0ba2 commit ae8f5ca

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/kotlin/insight/ColorLineMarkerProvider.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ class ColorLineMarkerProvider : LineMarkerProvider {
5757
ColorIcon(12, color),
5858
FunctionUtil.nullConstant<Any, String>(),
5959
GutterIconNavigationHandler handler@{ _, psiElement ->
60-
if (!psiElement.isWritable || !element.isValid) {
60+
if (psiElement == null || !psiElement.isWritable || !psiElement.isValid) {
6161
return@handler
6262
}
6363

64-
val editor = PsiEditorUtil.findEditor(element) ?: return@handler
64+
val editor = PsiEditorUtil.findEditor(psiElement) ?: return@handler
6565

6666
val picker = ColorPicker(map, editor.component)
6767
val newColor = picker.showDialog()
6868
if (newColor != null) {
69-
element.setColor(newColor)
69+
psiElement.setColor(newColor)
7070
}
7171
},
7272
GutterIconRenderer.Alignment.RIGHT
@@ -107,12 +107,12 @@ class ColorLineMarkerProvider : LineMarkerProvider {
107107
) : ColorLineMarkerProvider.ColorInfo(
108108
element,
109109
color,
110-
GutterIconNavigationHandler handler@{ _, _ ->
111-
if (!element.isWritable) {
110+
GutterIconNavigationHandler handler@{ _, psiElement ->
111+
if (psiElement == null || !psiElement.isValid || !workElement.isValid || !workElement.isWritable) {
112112
return@handler
113113
}
114114

115-
val editor = PsiEditorUtil.findEditor(element) ?: return@handler
115+
val editor = PsiEditorUtil.findEditor(psiElement) ?: return@handler
116116

117117
val c = ColorChooser.chooseColor(editor.component, "Choose Color", color, false)
118118
if (c != null) {

0 commit comments

Comments
 (0)