diff --git a/platform/platform-api/src/com/intellij/ide/highlighter/HighlighterFactory.java b/platform/platform-api/src/com/intellij/ide/highlighter/HighlighterFactory.java
index b72206c3103e..8371c4ae6a1a 100644
--- a/platform/platform-api/src/com/intellij/ide/highlighter/HighlighterFactory.java
+++ b/platform/platform-api/src/com/intellij/ide/highlighter/HighlighterFactory.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
 
 public class HighlighterFactory {
   private HighlighterFactory() {}
@@ -50,7 +51,7 @@ public class HighlighterFactory {
     return EditorHighlighterFactory.getInstance().createEditorHighlighter(fileType, settings, project);
   }
 
-  public static EditorHighlighter createHighlighter(VirtualFile vFile, EditorColorsScheme settings, Project project) {
+  public static EditorHighlighter createHighlighter(@NotNull VirtualFile vFile, EditorColorsScheme settings, Project project) {
     return EditorHighlighterFactory.getInstance().createEditorHighlighter(vFile, settings, project);
   }
 }
\ No newline at end of file
diff --git a/platform/platform-api/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactory.java b/platform/platform-api/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactory.java
index 6e50f90e57b3..0d69d5d84ca5 100644
--- a/platform/platform-api/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactory.java
+++ b/platform/platform-api/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactory.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author yole
@@ -37,7 +38,7 @@ public abstract class EditorHighlighterFactory {
 
   public abstract EditorHighlighter createEditorHighlighter(final Project project, final FileType fileType);
 
-  public abstract EditorHighlighter createEditorHighlighter(final VirtualFile file, final EditorColorsScheme globalScheme, final Project project);
+  public abstract EditorHighlighter createEditorHighlighter(@NotNull final VirtualFile file, final EditorColorsScheme globalScheme, final Project project);
 
   public abstract EditorHighlighter createEditorHighlighter(final Project project, final VirtualFile file);
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
index 6efe69510e5e..47e2effd3961 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.LanguageSubstitutors;
 import com.intellij.testFramework.LightVirtualFile;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -49,7 +50,7 @@ public class EditorHighlighterFactoryImpl extends EditorHighlighterFactory {
     return createEditorHighlighter(fileType, EditorColorsManager.getInstance().getGlobalScheme(), project);
   }
 
-  public EditorHighlighter createEditorHighlighter(final VirtualFile vFile, final EditorColorsScheme settings, final Project project) {
+  public EditorHighlighter createEditorHighlighter(@NotNull final VirtualFile vFile, final EditorColorsScheme settings, final Project project) {
     final FileType fileType = vFile.getFileType();
     if (fileType instanceof LanguageFileType) {
       LanguageFileType substFileType = substituteFileType(((LanguageFileType)fileType).getLanguage(), vFile, project);