From 84e9cfe6f8e2e5a861c2974fd0db3d8f460333c4 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 15 Jan 2010 16:31:02 +0300
Subject: [PATCH] fix NPE when building searchable options (PY-315)

---
 python/src/com/jetbrains/python/PySyntaxHighlighterFactory.java | 2 +-
 python/src/com/jetbrains/python/psi/LanguageLevel.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/src/com/jetbrains/python/PySyntaxHighlighterFactory.java b/python/src/com/jetbrains/python/PySyntaxHighlighterFactory.java
index 5c5f970eb2aa..c2d10b2b43e8 100644
--- a/python/src/com/jetbrains/python/PySyntaxHighlighterFactory.java
+++ b/python/src/com/jetbrains/python/PySyntaxHighlighterFactory.java
@@ -22,7 +22,7 @@ public class PySyntaxHighlighterFactory extends SyntaxHighlighterFactory {
 
   @NotNull
   public SyntaxHighlighter getSyntaxHighlighter(final Project project, final VirtualFile virtualFile) {
-    LanguageLevel languageLevel = LanguageLevel.forFile(virtualFile);
+   LanguageLevel languageLevel = virtualFile != null ? LanguageLevel.forFile(virtualFile) : LanguageLevel.getDefault();
     return myMap.get(languageLevel);
   }
 }
diff --git a/python/src/com/jetbrains/python/psi/LanguageLevel.java b/python/src/com/jetbrains/python/psi/LanguageLevel.java
index bace3c251e93..65803391e18a 100644
--- a/python/src/com/jetbrains/python/psi/LanguageLevel.java
+++ b/python/src/com/jetbrains/python/psi/LanguageLevel.java
@@ -48,7 +48,7 @@ public enum LanguageLevel {
   public static final Key<LanguageLevel> KEY = new Key<LanguageLevel>("python.language.level");
 
   @NotNull
-  public static LanguageLevel forFile(VirtualFile virtualFile) {
+  public static LanguageLevel forFile(@NotNull VirtualFile virtualFile) {
     final VirtualFile folder = virtualFile.getParent();
     if (folder != null) {
       final LanguageLevel level = folder.getUserData(KEY);