@@ -57,16 +57,16 @@ class ColorLineMarkerProvider : LineMarkerProvider {
57
57
ColorIcon (12 , color),
58
58
FunctionUtil .nullConstant<Any , String >(),
59
59
GutterIconNavigationHandler handler@{ _, psiElement ->
60
- if (! psiElement.isWritable || ! element .isValid) {
60
+ if (psiElement == null || ! psiElement.isWritable || ! psiElement .isValid) {
61
61
return @handler
62
62
}
63
63
64
- val editor = PsiEditorUtil .findEditor(element ) ? : return @handler
64
+ val editor = PsiEditorUtil .findEditor(psiElement ) ? : return @handler
65
65
66
66
val picker = ColorPicker (map, editor.component)
67
67
val newColor = picker.showDialog()
68
68
if (newColor != null ) {
69
- element .setColor(newColor)
69
+ psiElement .setColor(newColor)
70
70
}
71
71
},
72
72
GutterIconRenderer .Alignment .RIGHT
@@ -107,12 +107,12 @@ class ColorLineMarkerProvider : LineMarkerProvider {
107
107
) : ColorLineMarkerProvider.ColorInfo(
108
108
element,
109
109
color,
110
- GutterIconNavigationHandler handler@{ _, _ ->
111
- if (!element .isWritable) {
110
+ GutterIconNavigationHandler handler@{ _, psiElement ->
111
+ if (psiElement == null || !psiElement.isValid || !workElement.isValid || !workElement .isWritable) {
112
112
return @handler
113
113
}
114
114
115
- val editor = PsiEditorUtil .findEditor(element ) ? : return @handler
115
+ val editor = PsiEditorUtil .findEditor(psiElement ) ? : return @handler
116
116
117
117
val c = ColorChooser .chooseColor(editor.component, "Choose Color ", color, false)
118
118
if (c != null) {
0 commit comments