From 39788ab1437763643641866c29db6eb0f5906973 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@jetbrains.com>
Date: Fri, 17 Oct 2008 17:07:30 +0400
Subject: [PATCH] IDEADEV-31431

---
 .../com/intellij/find/impl/RevealingSpaceComboboxEditor.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lang-impl/src/com/intellij/find/impl/RevealingSpaceComboboxEditor.java b/lang-impl/src/com/intellij/find/impl/RevealingSpaceComboboxEditor.java
index 9a4ea8a02f..201497649d 100644
--- a/lang-impl/src/com/intellij/find/impl/RevealingSpaceComboboxEditor.java
+++ b/lang-impl/src/com/intellij/find/impl/RevealingSpaceComboboxEditor.java
@@ -9,6 +9,7 @@ package com.intellij.find.impl;
 import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBox;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.ui.StringComboboxEditor;
 
 import javax.swing.*;
@@ -19,15 +20,19 @@ public class RevealingSpaceComboboxEditor extends StringComboboxEditor {
 
     SwingUtilities.invokeLater(new Runnable() {
       public void run() {
-        getEditor().getSettings().setWhitespacesShown(true);
+        Editor editor = getEditor();
+        if (editor != null) {
+          editor.getSettings().setWhitespacesShown(true);
+        }
       }
     });
   }
 
   public void setItem(Object anObject) {
     super.setItem(anObject);
-    if (getEditor() != null) {
-      getEditor().getSettings().setWhitespacesShown(true);
+    Editor editor = getEditor();
+    if (editor != null) {
+      editor.getSettings().setWhitespacesShown(true);
     }
   }
 }
\ No newline at end of file
-- 
2.11.4.GIT