Obfuscator needs more memory.

UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java

@@ -11,7 +11,7 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.*;
@@ -252,7 +252,7 @@ public class UsageInfo2UsageAdapter implements Usage, UsageInModule, UsageInLibr
     }
   }
 
-  private TextChunk[] createTextChunks(FileHighlighter highlighter, int start, int end) {
+  private TextChunk[] createTextChunks(SyntaxHighlighter highlighter, int start, int end) {
     LOG.assertTrue(start <= end);
     List<TextChunk> result = new ArrayList<TextChunk>();
 

openapi/src/com/intellij/lang/Language.java

@@ -0,0 +1,23 @@
+package com.intellij.lang;
+
+import com.intellij.codeFormatting.PseudoTextBuilder;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import com.intellij.openapi.fileTypes.PlainSyntaxHighlighter;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: max
+ * Date: Jan 16, 2005
+ * Time: 9:10:05 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public abstract class Language {
+  public SyntaxHighlighter getSyntaxHighlighter() {
+    return new PlainSyntaxHighlighter();
+  }
+
+  public PseudoTextBuilder getFormatter() {
+    return null;
+  }
+
+}

openapi/src/com/intellij/openapi/fileTypes/FileType.java

@@ -29,7 +29,7 @@ public interface FileType {
 
   String getCharset(VirtualFile file);
 
-  FileHighlighter getHighlighter(Project project);
+  SyntaxHighlighter getHighlighter(Project project);
 
   PsiFile createPsiFile(VirtualFile file, Project project);
 

openapi/src/com/intellij/openapi/fileTypes/PlainSyntaxHighlighter.java

@@ -37,7 +37,7 @@ import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.psi.tree.IElementType;
 
-public class PlainFileHighlighter implements FileHighlighter {
+public class PlainSyntaxHighlighter implements SyntaxHighlighter {
   private static final TextAttributesKey[] ATTRS = new TextAttributesKey[] {HighlighterColors.TEXT};
 
   public Lexer getHighlightingLexer() {

openapi/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java

@@ -35,7 +35,7 @@ import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.psi.tree.IElementType;
 
-public interface FileHighlighter {
+public interface SyntaxHighlighter {
   Lexer getHighlightingLexer();
   TextAttributesKey[] getTokenHighlights(IElementType tokenType);
 }

openapi/src/com/intellij/openapi/fileTypes/SyntaxHighlighterBase.java

@@ -37,7 +37,7 @@ import com.intellij.psi.tree.TokenSet;
 
 import java.util.Map;
 
-public abstract class FileHighlighterBase implements FileHighlighter {
+public abstract class SyntaxHighlighterBase implements SyntaxHighlighter {
   private static final TextAttributesKey[] EMPTY = new TextAttributesKey[0];
 
   protected static TextAttributesKey[] pack(TextAttributesKey key) {

openapi/src/com/intellij/openapi/options/colors/ColorSettingsPage.java

@@ -32,7 +32,7 @@
 package com.intellij.openapi.options.colors;
 
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 
 import javax.swing.*;
 import java.util.Map;
@@ -42,7 +42,7 @@ public interface ColorSettingsPage {
   Icon getIcon();
   AttributesDescriptor[] getAttributeDescriptors();
   ColorDescriptor[] getColorDescriptors();
-  FileHighlighter getHighlighter();
+  SyntaxHighlighter getHighlighter();
   String getDemoText();
   Map<String,TextAttributesKey> getAdditionalHighlightingTagToDescriptorMap();
 }

source/com/intellij/application/options/colors/ClickNavigator.java

@@ -13,7 +13,7 @@ import com.intellij.openapi.editor.event.CaretEvent;
 import com.intellij.openapi.editor.event.CaretListener;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.ex.HighlighterIterator;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.ui.ListScrollingUtil;
 
@@ -87,7 +87,7 @@ public class ClickNavigator {
   }
 
   public void addClickNavigator(final Editor view,
-                                final FileHighlighter highlighter,
+                                final SyntaxHighlighter highlighter,
                                 final HighlightData[] data,
                                 final boolean isBackgroundImportant) {
     addMouseMotionListener(view, highlighter, data, isBackgroundImportant);
@@ -100,7 +100,7 @@ public class ClickNavigator {
     view.getCaretModel().addCaretListener(listener);
   }
 
-  private boolean selectItem(boolean select, HighlighterIterator itr, FileHighlighter highlighter) {
+  private boolean selectItem(boolean select, HighlighterIterator itr, SyntaxHighlighter highlighter) {
 
     IElementType tokenType = itr.getTokenType();
     if (tokenType == null) return false;
@@ -108,7 +108,7 @@ public class ClickNavigator {
     return setSelectedItem(type, select);
   }
 
-  public static String highlightingTypeFromTokenType(IElementType tokenType, FileHighlighter highlighter) {
+  public static String highlightingTypeFromTokenType(IElementType tokenType, SyntaxHighlighter highlighter) {
     TextAttributesKey[] highlights = highlighter.getTokenHighlights(tokenType);
     String s = null;
     for (int i = 0; i < highlights.length; i++) {
@@ -122,7 +122,7 @@ public class ClickNavigator {
   }
 
   private void addMouseMotionListener(final Editor view,
-                                      final FileHighlighter highlighter,
+                                      final SyntaxHighlighter highlighter,
                                       final HighlightData[] data, final boolean isBackgroundImportant) {
     view.getContentComponent().addMouseMotionListener(new MouseMotionAdapter() {
       public void mouseMoved(MouseEvent e) {
@@ -134,7 +134,7 @@ public class ClickNavigator {
 
   private void navigate(final Editor editor, boolean select,
                         LogicalPosition pos,
-                        final FileHighlighter highlighter,
+                        final SyntaxHighlighter highlighter,
                         final HighlightData[] data, final boolean isBackgroundImportant) {
     int offset = editor.logicalPositionToOffset(pos);
 

source/com/intellij/codeInsight/template/impl/TemplateEditorUtil.java

@@ -13,8 +13,8 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.ex.util.LexerHighlighter;
-import com.intellij.openapi.fileTypes.FileHighlighter;
-import com.intellij.openapi.fileTypes.FileHighlighterBase;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.psi.tree.IElementType;
@@ -67,21 +67,21 @@ public class TemplateEditorUtil {
       fileType = StdFileTypes.PLAIN_TEXT;
     }
 
-    FileHighlighter highlighter = createTemplateTextHighlighter(fileType.getHighlighter(null));
+    SyntaxHighlighter highlighter = createTemplateTextHighlighter(fileType.getHighlighter(null));
     ((EditorEx)editor).setHighlighter(new LexerHighlighter(highlighter, EditorColorsManager.getInstance().getGlobalScheme()));
   }
 
   private final static TokenSet TOKENS_TO_MERGE = TokenSet.create(new IElementType[]{TemplateTokenType.TEXT});
 
-  private static FileHighlighter createTemplateTextHighlighter(final FileHighlighter original) {
+  private static SyntaxHighlighter createTemplateTextHighlighter(final SyntaxHighlighter original) {
     return new TemplateHighlighter(original);
   }
 
-  private static class TemplateHighlighter extends FileHighlighterBase {
+  private static class TemplateHighlighter extends SyntaxHighlighterBase {
     private Lexer myLexer;
-    private FileHighlighter myOriginalHighlighter;
+    private SyntaxHighlighter myOriginalHighlighter;
 
-    public TemplateHighlighter(FileHighlighter original) {
+    public TemplateHighlighter(SyntaxHighlighter original) {
       myOriginalHighlighter = original;
       Lexer originalLexer = original.getHighlightingLexer();
       Lexer templateLexer = new TemplateTextLexer();

source/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java

@@ -329,7 +329,7 @@ public class FileTemplateConfigurable implements Configurable {
       fileType = StdFileTypes.PLAIN_TEXT;
     }
 
-    FileHighlighter originalHighlighter = fileType.getHighlighter(null);
+    SyntaxHighlighter originalHighlighter = fileType.getHighlighter(null);
     LexerHighlighter highlighter = new LexerHighlighter(new TemplateHighlighter(originalHighlighter), EditorColorsManager.getInstance().getGlobalScheme());
     ((EditorEx)myTemplateEditor).setHighlighter(highlighter);
     ((EditorEx)myTemplateEditor).repaint(0, myTemplateEditor.getDocument().getTextLength());
@@ -337,11 +337,11 @@ public class FileTemplateConfigurable implements Configurable {
 
   private final static TokenSet TOKENS_TO_MERGE = TokenSet.create(new IElementType[]{FileTemplateTokenType.TEXT});
 
-  private static class TemplateHighlighter extends FileHighlighterBase {
+  private static class TemplateHighlighter extends SyntaxHighlighterBase {
     private Lexer myLexer;
-    private FileHighlighter myOriginalHighlighter;
+    private SyntaxHighlighter myOriginalHighlighter;
 
-    public TemplateHighlighter(FileHighlighter original) {
+    public TemplateHighlighter(SyntaxHighlighter original) {
       myOriginalHighlighter = original;
       Lexer originalLexer = original.getHighlightingLexer();
       Lexer templateLexer = new FileTemplateTextLexer();

source/com/intellij/ide/highlighter/ArchiveFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -78,7 +78,7 @@ public class ArchiveFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return null;
   }
 

source/com/intellij/ide/highlighter/DTDFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -79,7 +79,7 @@ public class DTDFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     //TODO: should be antoher?
     return new XmlFileHighlighter(true);
   }

source/com/intellij/ide/highlighter/GuiFormFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -78,7 +78,7 @@ public class GuiFormFileType implements FileType {
     return "UTF-8";
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new XmlFileHighlighter();
   }
 

source/com/intellij/ide/highlighter/HighlighterFactory.java

@@ -5,10 +5,10 @@ import com.intellij.ide.highlighter.custom.SyntaxTable;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.ex.util.LexerHighlighter;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeManager;
-import com.intellij.openapi.fileTypes.PlainFileHighlighter;
+import com.intellij.openapi.fileTypes.PlainSyntaxHighlighter;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.java.LanguageLevel;
@@ -20,11 +20,11 @@ public class HighlighterFactory {
   }
 
   public static LexerHighlighter createHTMLHighlighter(EditorColorsScheme settings){
-    FileHighlighter highlighter = new HtmlFileHighlighter();
+    SyntaxHighlighter highlighter = new HtmlFileHighlighter();
     return createHighlighter(highlighter, settings);
   }
 
-  public static LexerHighlighter createHighlighter(FileHighlighter highlighter, EditorColorsScheme settings) {
+  public static LexerHighlighter createHighlighter(SyntaxHighlighter highlighter, EditorColorsScheme settings) {
     return new LexerHighlighter(highlighter, settings);
   }
 
@@ -63,7 +63,7 @@ public class HighlighterFactory {
   }
 
   public static LexerHighlighter createHighlighter(FileType fileType, EditorColorsScheme settings, Project project) {
-    FileHighlighter highlighter = fileType.getHighlighter(project);
-    return createHighlighter(highlighter != null ? highlighter : new PlainFileHighlighter(), settings);
+    SyntaxHighlighter highlighter = fileType.getHighlighter(project);
+    return createHighlighter(highlighter != null ? highlighter : new PlainSyntaxHighlighter(), settings);
   }
 }

source/com/intellij/ide/highlighter/HtmlFileHighlighter.java

@@ -35,7 +35,7 @@ import com.intellij.lexer.HtmlHighlightingLexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighterBase;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.xml.XmlTokenType;
 
@@ -43,7 +43,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Iterator;
 
-public class HtmlFileHighlighter extends FileHighlighterBase {
+public class HtmlFileHighlighter extends SyntaxHighlighterBase {
   private static Map<IElementType, TextAttributesKey> keys1;
   private static Map<IElementType, TextAttributesKey> keys2;
 

source/com/intellij/ide/highlighter/HtmlFileType.java

@@ -35,7 +35,7 @@ import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.impl.xml.XmlStructureViewTreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -81,7 +81,7 @@ public class HtmlFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new HtmlFileHighlighter();
   }
 

source/com/intellij/ide/highlighter/JavaClassFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -81,7 +81,7 @@ public class JavaClassFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new JavaFileHighlighter(LanguageLevel.HIGHEST);
   }
 

source/com/intellij/ide/highlighter/JavaFileHighlighter.java

@@ -35,7 +35,7 @@ import com.intellij.lexer.JavaHighlightingLexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighterBase;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.JavaDocTokenType;
 import com.intellij.psi.JavaTokenType;
@@ -47,7 +47,7 @@ import com.intellij.psi.xml.XmlTokenType;
 import java.util.HashMap;
 import java.util.Map;
 
-public class JavaFileHighlighter extends FileHighlighterBase {
+public class JavaFileHighlighter extends SyntaxHighlighterBase {
   private static Map<IElementType, TextAttributesKey> ourMap1;
   private static Map<IElementType, TextAttributesKey> ourMap2;
 

source/com/intellij/ide/highlighter/JavaFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.structureView.StructureViewModel;
 import com.intellij.ide.structureView.impl.java.JavaFileTreeModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -84,7 +84,7 @@ public class JavaFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     LanguageLevel level = project != null ? PsiManager.getInstance(project).getEffectiveLanguageLevel() : LanguageLevel.HIGHEST;
     return new JavaFileHighlighter(level);
   }

source/com/intellij/ide/highlighter/ModuleFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -78,7 +78,7 @@ public class ModuleFileType implements FileType {
     return "UTF-8";
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new XmlFileHighlighter();
   }
 

source/com/intellij/ide/highlighter/ProjectFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -78,7 +78,7 @@ public class ProjectFileType implements FileType {
     return "UTF-8";
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new XmlFileHighlighter();
   }
 

source/com/intellij/ide/highlighter/UnknownFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -75,7 +75,7 @@ public class UnknownFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return null;
   }
 

source/com/intellij/ide/highlighter/WorkspaceFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.project.Project;
@@ -78,7 +78,7 @@ public class WorkspaceFileType implements FileType {
     return "UTF-8";
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new XmlFileHighlighter();
   }
 

source/com/intellij/ide/highlighter/XHtmlFileType.java

@@ -34,7 +34,7 @@ package com.intellij.ide.highlighter;
 import com.intellij.codeFormatting.PseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -79,7 +79,7 @@ public class XHtmlFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new XmlFileHighlighter(false,true);
   }
 

source/com/intellij/ide/highlighter/XmlFileHighlighter.java

@@ -37,7 +37,7 @@ import com.intellij.lexer.DtdHighlightingLexer;
 import com.intellij.lexer.XHtmlHighlightingLexer;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighterBase;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.xml.XmlTokenType;
 
@@ -45,7 +45,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Iterator;
 
-public class XmlFileHighlighter extends FileHighlighterBase {
+public class XmlFileHighlighter extends SyntaxHighlighterBase {
   private static Map<IElementType, TextAttributesKey> keys1;
   private static Map<IElementType, TextAttributesKey> keys2;
 

source/com/intellij/ide/highlighter/XmlFileType.java

@@ -36,7 +36,7 @@ import com.intellij.codeFormatting.xml.XmlPseudoTextBuilder;
 import com.intellij.ide.util.treeView.smartTree.TreeModel;
 import com.intellij.ide.structureView.impl.xml.XmlStructureViewTreeModel;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities;
 import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -84,7 +84,7 @@ public class XmlFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return new XmlFileHighlighter();
   }
 

source/com/intellij/ide/highlighter/custom/CustomFileHighlighter.java

@@ -33,14 +33,14 @@ package com.intellij.ide.highlighter.custom;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighterBase;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.psi.CustomHighlighterTokenType;
 import com.intellij.psi.tree.IElementType;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class CustomFileHighlighter extends FileHighlighterBase {
+public class CustomFileHighlighter extends SyntaxHighlighterBase {
   private static Map<IElementType, TextAttributesKey> ourKeys;
   private SyntaxTable myTable;
 

source/com/intellij/openapi/editor/ex/util/LexerHighlighter.java

@@ -13,7 +13,7 @@ import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.ex.Highlighter;
 import com.intellij.openapi.editor.ex.HighlighterIterator;
 import com.intellij.openapi.editor.markup.TextAttributes;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.text.CharArrayUtil;
 
@@ -29,10 +29,10 @@ public class LexerHighlighter extends DocumentAdapter implements Highlighter {
   private Lexer myLexer;
   private Map<IElementType, TextAttributes> myAttributesMap;
   private SegmentArrayWithData mySegments = new SegmentArrayWithData();
-  private FileHighlighter myHighlighter;
+  private SyntaxHighlighter myHighlighter;
   private EditorColorsScheme myScheme;
 
-  public LexerHighlighter(FileHighlighter highlighter, EditorColorsScheme scheme) {
+  public LexerHighlighter(SyntaxHighlighter highlighter, EditorColorsScheme scheme) {
     myScheme = scheme;
     myLexer = highlighter.getHighlightingLexer();
     myAttributesMap = new HashMap<IElementType, TextAttributes>();

source/com/intellij/openapi/fileTypes/PlainTextFileType.java

@@ -75,8 +75,8 @@ public class PlainTextFileType implements FileType {
     return null;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
-    return new PlainFileHighlighter();
+  public SyntaxHighlighter getHighlighter(Project project) {
+    return new PlainSyntaxHighlighter();
   }
 
   public PsiFile createPsiFile(VirtualFile file, Project project) {

source/com/intellij/openapi/fileTypes/UserBinaryFileType.java

@@ -48,7 +48,7 @@ public class UserBinaryFileType extends UserFileType<UserBinaryFileType> {
     return true;
   }
 
-  public FileHighlighter getHighlighter(Project project) {
+  public SyntaxHighlighter getHighlighter(Project project) {
     return null;
   }
 

source/com/intellij/openapi/options/colors/pages/CustomColorsPage.java

@@ -35,7 +35,7 @@ import com.intellij.ide.highlighter.custom.CustomFileHighlighter;
 import com.intellij.ide.highlighter.custom.CustomHighlighterColors;
 import com.intellij.ide.highlighter.custom.SyntaxTable;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
 import com.intellij.openapi.options.colors.ColorSettingsPage;
@@ -91,7 +91,7 @@ public class CustomColorsPage implements ColorSettingsPage {
     return COLORS;
   }
 
-  public FileHighlighter getHighlighter() {
+  public SyntaxHighlighter getHighlighter() {
     return new CustomFileHighlighter(SYNTAX_TABLE);
   }
 

source/com/intellij/openapi/options/colors/pages/GeneralColorsPage.java

@@ -35,8 +35,8 @@ import com.intellij.codeInsight.template.impl.TemplateColors;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.EditorColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighter;
-import com.intellij.openapi.fileTypes.PlainFileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import com.intellij.openapi.fileTypes.PlainSyntaxHighlighter;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
@@ -93,8 +93,8 @@ public class GeneralColorsPage implements ColorSettingsPage {
     return COLOR_DESCRIPTORS;
   }
 
-  public FileHighlighter getHighlighter() {
-    return new PlainFileHighlighter();
+  public SyntaxHighlighter getHighlighter() {
+    return new PlainSyntaxHighlighter();
   }
 
   public String getDemoText() {

source/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java

@@ -34,7 +34,7 @@ package com.intellij.openapi.options.colors.pages;
 import com.intellij.ide.highlighter.HtmlFileHighlighter;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
@@ -70,7 +70,7 @@ public class HTMLColorsPage implements ColorSettingsPage {
     return COLORS;
   }
 
-  public FileHighlighter getHighlighter() {
+  public SyntaxHighlighter getHighlighter() {
     return new HtmlFileHighlighter();
   }
 

source/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java

@@ -36,7 +36,7 @@ import com.intellij.debugger.settings.DebuggerColors;
 import com.intellij.ide.highlighter.JavaFileHighlighter;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
@@ -141,7 +141,7 @@ public class JavaColorSettingsPage implements ColorSettingsPage {
     return ourColorDescriptors;
   }
 
-  public FileHighlighter getHighlighter() {
+  public SyntaxHighlighter getHighlighter() {
     return new JavaFileHighlighter(LanguageLevel.HIGHEST);
   }
 

source/com/intellij/openapi/options/colors/pages/XMLColorsPage.java

@@ -34,7 +34,7 @@ package com.intellij.openapi.options.colors.pages;
 import com.intellij.ide.highlighter.XmlFileHighlighter;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.FileHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
@@ -71,7 +71,7 @@ public class XMLColorsPage implements ColorSettingsPage {
     return COLORS;
   }
 
-  public FileHighlighter getHighlighter() {
+  public SyntaxHighlighter getHighlighter() {
     return new XmlFileHighlighter();
   }