From 2d2b9f098cf2db1a812f04edc0a7b4c96d352fe9 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Sun, 16 Jan 2005 21:37:20 +0300 Subject: [PATCH] Renamed FileHighlighter -> SyntaxHighlighter, Highlighter -> EditorHighlighter, LexerHighlighter -> LexerEditorHighlighter, EditorHighlighter -> SelectInEditorManager --- .../usages/UsageInfo2UsageAdapter.java | 4 +-- ...ighter.java => SelectInEditorManager.java} | 6 ++-- resources/src/componentSets/Editor.xml | 4 +-- .../codeEditor/printing/HTMLTextPainter.java | 4 +-- .../codeEditor/printing/PrintManager.java | 4 +-- .../codeEditor/printing/TextPainter.java | 6 ++-- .../completion/DefaultInsertHandler.java | 6 ++-- .../daemon/impl/UpdateHighlightersUtil.java | 2 +- .../impl/analysis/HighlightMethodUtil.java | 2 +- .../editorActions/EnterHandler.java | 8 +++--- .../editorActions/HtmlSelectioner.java | 6 ++-- .../hint/ImplementationViewComponent.java | 4 +-- .../template/impl/TemplateEditorUtil.java | 4 +-- .../execution/impl/ConsoleViewImpl.java | 6 ++-- .../impl/FileTemplateConfigurable.java | 4 +-- .../ide/highlighter/HighlighterFactory.java | 28 +++++++++---------- ...pl.java => SelectInEditorManagerImpl.java} | 8 +++--- .../intellij/ide/todo/TodoTreeBuilder.java | 14 +++++----- .../intellij/ide/todo/nodes/TodoItemNode.java | 4 +-- .../diff/impl/DiffHighliterFactory.java | 4 +-- .../diff/impl/DiffHighliterFactoryImpl.java | 4 +-- .../openapi/diff/impl/DiffSideView.java | 4 +-- .../intellij/openapi/editor/ex/EditorEx.java | 4 +-- ...ighlighter.java => EditorHighlighter.java} | 2 +- ...ghter.java => EmptyEditorHighlighter.java} | 8 +++--- ...ghter.java => LexerEditorHighlighter.java} | 8 +++--- .../openapi/editor/impl/BorderEffect.java | 4 +-- .../openapi/editor/impl/DocumentImpl.java | 4 +-- .../openapi/editor/impl/EditorImpl.java | 10 +++---- .../impl/text/TextEditorComponent.java | 6 ++-- .../openapi/vcs/ex/LineStatusTracker.java | 4 +-- 31 files changed, 93 insertions(+), 93 deletions(-) rename openapi/src/com/intellij/ide/{EditorHighlighter.java => SelectInEditorManager.java} (73%) rename source/com/intellij/ide/impl/{EditorHighlighterImpl.java => SelectInEditorManagerImpl.java} (94%) rename source/com/intellij/openapi/editor/ex/{Highlighter.java => EditorHighlighter.java} (86%) rename source/com/intellij/openapi/editor/ex/util/{EmptyHighlighter.java => EmptyEditorHighlighter.java} (88%) rename source/com/intellij/openapi/editor/ex/util/{LexerHighlighter.java => LexerEditorHighlighter.java} (96%) diff --git a/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java b/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java index c2240043b74b..929535ab9274 100644 --- a/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java +++ b/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java @@ -1,6 +1,6 @@ package com.intellij.usages; -import com.intellij.ide.EditorHighlighter; +import com.intellij.ide.SelectInEditorManager; import com.intellij.lexer.Lexer; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; @@ -152,7 +152,7 @@ public class UsageInfo2UsageAdapter implements Usage, UsageInModule, UsageInLibr if (!isValid()) return; RangeMarker marker = myRangeMarkers.get(0); - EditorHighlighter.getInstance(getProject()) + SelectInEditorManager.getInstance(getProject()) .selectInEditor(getFile(), marker.getStartOffset(), marker.getEndOffset(), false, false); } diff --git a/openapi/src/com/intellij/ide/EditorHighlighter.java b/openapi/src/com/intellij/ide/SelectInEditorManager.java similarity index 73% rename from openapi/src/com/intellij/ide/EditorHighlighter.java rename to openapi/src/com/intellij/ide/SelectInEditorManager.java index cfca343c015f..d35f90783be9 100644 --- a/openapi/src/com/intellij/ide/EditorHighlighter.java +++ b/openapi/src/com/intellij/ide/SelectInEditorManager.java @@ -7,9 +7,9 @@ import com.intellij.openapi.vfs.VirtualFile; * @author MYakovlev * Date: Jul 1, 2002 */ -public abstract class EditorHighlighter{ - public static EditorHighlighter getInstance(Project project) { - return project.getComponent(EditorHighlighter.class); +public abstract class SelectInEditorManager{ + public static SelectInEditorManager getInstance(Project project) { + return project.getComponent(SelectInEditorManager.class); } /** Do selection in Editor. This selection is removed automatically, then caret position is changed, diff --git a/resources/src/componentSets/Editor.xml b/resources/src/componentSets/Editor.xml index 93fa6ffba2a6..0a611ca1910f 100644 --- a/resources/src/componentSets/Editor.xml +++ b/resources/src/componentSets/Editor.xml @@ -57,8 +57,8 @@ com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl - com.intellij.ide.EditorHighlighter - com.intellij.ide.impl.EditorHighlighterImpl + com.intellij.ide.SelectInEditorManager + com.intellij.ide.impl.SelectInEditorManagerImpl com.intellij.codeEditor.printing.ExportToHTMLSettings diff --git a/source/com/intellij/codeEditor/printing/HTMLTextPainter.java b/source/com/intellij/codeEditor/printing/HTMLTextPainter.java index 815a03b71971..b85c01f8cd4c 100644 --- a/source/com/intellij/codeEditor/printing/HTMLTextPainter.java +++ b/source/com/intellij/codeEditor/printing/HTMLTextPainter.java @@ -8,7 +8,7 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.colors.EditorColorsScheme; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.fileTypes.FileType; @@ -28,7 +28,7 @@ class HTMLTextPainter { private static final Logger LOG = Logger.getInstance("#com.intellij.codeEditor.printing.HTMLTextPainter"); private int myOffset = 0; - private Highlighter myHighlighter; + private EditorHighlighter myHighlighter; private String myText; private String myFileName; private String myHTMLFileName; diff --git a/source/com/intellij/codeEditor/printing/PrintManager.java b/source/com/intellij/codeEditor/printing/PrintManager.java index e987176bba6a..114fbff8516d 100644 --- a/source/com/intellij/codeEditor/printing/PrintManager.java +++ b/source/com/intellij/codeEditor/printing/PrintManager.java @@ -7,7 +7,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.DocumentEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -199,7 +199,7 @@ class PrintManager { final String fileName = psiFile.getVirtualFile().getPresentableUrl(); DocumentEx doc = (DocumentEx)PsiDocumentManager.getInstance(project).getDocument(psiFile); if (doc == null) return null; - Highlighter highlighter = HighlighterFactory.createHighlighter(project, psiFile.getVirtualFile()); + EditorHighlighter highlighter = HighlighterFactory.createHighlighter(project, psiFile.getVirtualFile()); highlighter.setText(doc.getCharsSequence()); return new TextPainter(doc, highlighter, fileName, psiFile, project); } diff --git a/source/com/intellij/codeEditor/printing/TextPainter.java b/source/com/intellij/codeEditor/printing/TextPainter.java index 444b928b4009..b274ea0f1b64 100644 --- a/source/com/intellij/codeEditor/printing/TextPainter.java +++ b/source/com/intellij/codeEditor/printing/TextPainter.java @@ -4,7 +4,7 @@ import com.intellij.codeInsight.daemon.impl.GeneralHighlightingPass; import com.intellij.codeInsight.daemon.impl.LineMarkerInfo; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.ex.DocumentEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.editor.ex.LineIterator; import com.intellij.openapi.editor.markup.TextAttributes; @@ -46,7 +46,7 @@ public class TextPainter implements Printable { private Font myItalicFont; private Font myBoldItalicFont; private Font myHeaderFont; - private Highlighter myHighlighter; + private EditorHighlighter myHighlighter; private PrintSettings myPrintSettings; private String myFileName; private int myPageIndex; @@ -57,7 +57,7 @@ public class TextPainter implements Printable { private FileType myFileType; private ProgressIndicator myProgress; - public TextPainter(DocumentEx editorDocument, Highlighter highlighter, String fileName, final PsiFile psiFile, + public TextPainter(DocumentEx editorDocument, EditorHighlighter highlighter, String fileName, final PsiFile psiFile, final Project project) { myCodeStyleSettings = CodeStyleSettingsManager.getSettings(project); myDocument = editorDocument; diff --git a/source/com/intellij/codeInsight/completion/DefaultInsertHandler.java b/source/com/intellij/codeInsight/completion/DefaultInsertHandler.java index 054074a38fda..7da01796a5d9 100644 --- a/source/com/intellij/codeInsight/completion/DefaultInsertHandler.java +++ b/source/com/intellij/codeInsight/completion/DefaultInsertHandler.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.editor.ScrollType; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; @@ -601,7 +601,7 @@ public class DefaultInsertHandler implements InsertHandler{ CharSequence chars = myDocument.getCharsSequence(); int textLength = myDocument.getTextLength(); - Highlighter highlighter = ((EditorEx) myEditor).getHighlighter(); + EditorHighlighter highlighter = ((EditorEx) myEditor).getHighlighter(); int existingRParenthOffset = -1; for(HighlighterIterator iterator = highlighter.createIterator(tailOffset); !iterator.atEnd(); iterator.advance()){ @@ -740,7 +740,7 @@ public class DefaultInsertHandler implements InsertHandler{ return new TextRange(start, end); } - private static int calcParensBalance(Document document, Highlighter highlighter, int rangeStart, int rangeEnd){ + private static int calcParensBalance(Document document, EditorHighlighter highlighter, int rangeStart, int rangeEnd){ LOG.assertTrue(0 <= rangeStart); LOG.assertTrue(rangeStart <= rangeEnd); LOG.assertTrue(rangeEnd <= document.getTextLength()); diff --git a/source/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java b/source/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java index 313032bd3d68..b5a547c4cc24 100644 --- a/source/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java +++ b/source/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java @@ -231,7 +231,7 @@ public class UpdateHighlightersUtil { int offset = e.getOffset(); Editor[] editors = EditorFactory.getInstance().getEditors(document, project); if (editors.length > 0) { - Editor editor = editors[0]; // use any editor - just to fetch Highlighter + Editor editor = editors[0]; // use any editor - just to fetch SelectInEditorManager HighlighterIterator iterator = ((EditorEx)editor).getHighlighter().createIterator(Math.max(0, offset - 1)); if (iterator.atEnd()) return; int start = iterator.getStart(); diff --git a/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index 232032238dc9..e786a5e1fbce 100644 --- a/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -110,7 +110,7 @@ public class HighlightMethodUtil { if (returnType == null || superReturnType == null || method == superMethod) continue; final PsiClass superClass = superMethod.getContainingClass(); if (superClass == null) continue; - // EJB override rules are tricky, they are checked elsewhere in EJB Highlighter + // EJB override rules are tricky, they are checked elsewhere in EJB SelectInEditorManager if (!Comparing.strEqual(method.getName(), superMethod.getName()) || method.getParameterList().getParameters().length != superMethod.getParameterList().getParameters().length) { continue; diff --git a/source/com/intellij/codeInsight/editorActions/EnterHandler.java b/source/com/intellij/codeInsight/editorActions/EnterHandler.java index 1eca3504fbde..3916578b6cf8 100644 --- a/source/com/intellij/codeInsight/editorActions/EnterHandler.java +++ b/source/com/intellij/codeInsight/editorActions/EnterHandler.java @@ -14,7 +14,7 @@ import com.intellij.openapi.editor.*; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; @@ -231,7 +231,7 @@ public class EnterHandler extends EditorWriteActionHandler { return false; } - Highlighter highlighter = ((EditorEx)editor).getHighlighter(); + EditorHighlighter highlighter = ((EditorEx)editor).getHighlighter(); HighlighterIterator iterator = highlighter.createIterator(offset - 2); if (iterator.getTokenType() != JspTokenType.JSP_SCRIPTLET_START && iterator.getTokenType() != JspTokenType.JSP_DECLARATION_START) { @@ -284,7 +284,7 @@ public class EnterHandler extends EditorWriteActionHandler { CharSequence chars = editor.getDocument().getCharsSequence(); if (chars.charAt(offset - 1) != '{') return false; - Highlighter highlighter = ((EditorEx)editor).getHighlighter(); + EditorHighlighter highlighter = ((EditorEx)editor).getHighlighter(); HighlighterIterator iterator = highlighter.createIterator(offset - 1); BraceMatchingUtil.BraceMatcher braceMatcher = BraceMatchingUtil.getBraceMatcher(fileType); @@ -324,7 +324,7 @@ public class EnterHandler extends EditorWriteActionHandler { CharSequence chars = editor.getDocument().getCharsSequence(); if (chars.charAt(offset - 1) != '>') return false; - Highlighter highlighter = ((EditorEx)editor).getHighlighter(); + EditorHighlighter highlighter = ((EditorEx)editor).getHighlighter(); HighlighterIterator iterator = highlighter.createIterator(offset - 1); if (iterator.getTokenType() != first) return false; iterator.advance(); diff --git a/source/com/intellij/codeInsight/editorActions/HtmlSelectioner.java b/source/com/intellij/codeInsight/editorActions/HtmlSelectioner.java index b419d554458b..40ad42489544 100644 --- a/source/com/intellij/codeInsight/editorActions/HtmlSelectioner.java +++ b/source/com/intellij/codeInsight/editorActions/HtmlSelectioner.java @@ -11,7 +11,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.codeInsight.highlighting.BraceMatchingUtil; import com.intellij.ide.highlighter.HighlighterFactory; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; @@ -63,7 +63,7 @@ public class HtmlSelectioner extends SelectWordUtil.WordSelectioner { PsiFile psiFile = e.getContainingFile(); FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(psiFile.getVirtualFile()); - Highlighter highlighter = HighlighterFactory.createHighlighter(e.getProject(), psiFile.getVirtualFile()); + EditorHighlighter highlighter = HighlighterFactory.createHighlighter(e.getProject(), psiFile.getVirtualFile()); highlighter.setText(editorText); HighlighterIterator i = highlighter.createIterator(cursorOffset); @@ -78,7 +78,7 @@ public class HtmlSelectioner extends SelectWordUtil.WordSelectioner { return result; } - private static void addTagSelection(CharSequence editorText, int cursorOffset, FileType fileType, Highlighter highlighter, List result) { + private static void addTagSelection(CharSequence editorText, int cursorOffset, FileType fileType, EditorHighlighter highlighter, List result) { HighlighterIterator i; int start = cursorOffset; diff --git a/source/com/intellij/codeInsight/hint/ImplementationViewComponent.java b/source/com/intellij/codeInsight/hint/ImplementationViewComponent.java index e70eb5ec6271..2f60da25ee1e 100644 --- a/source/com/intellij/codeInsight/hint/ImplementationViewComponent.java +++ b/source/com/intellij/codeInsight/hint/ImplementationViewComponent.java @@ -40,7 +40,7 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; import com.intellij.openapi.project.Project; @@ -91,7 +91,7 @@ public class ImplementationViewComponent extends JPanel { Document doc = factory.createDocument(""); doc.setReadOnly(true); myEditor = factory.createEditor(doc, project); - Highlighter highlighter=HighlighterFactory.createHighlighter(project, myElements[0].getContainingFile().getName()); + EditorHighlighter highlighter=HighlighterFactory.createHighlighter(project, myElements[0].getContainingFile().getName()); ((EditorEx) myEditor).setHighlighter(highlighter); ((EditorEx)myEditor).setBackgroundColor(EditorFragmentComponent.getBackgroundColor(myEditor)); diff --git a/source/com/intellij/codeInsight/template/impl/TemplateEditorUtil.java b/source/com/intellij/codeInsight/template/impl/TemplateEditorUtil.java index 3c2fb093b021..7a1ce6b89066 100644 --- a/source/com/intellij/codeInsight/template/impl/TemplateEditorUtil.java +++ b/source/com/intellij/codeInsight/template/impl/TemplateEditorUtil.java @@ -12,7 +12,7 @@ import com.intellij.openapi.editor.colors.EditorColorsManager; 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.editor.ex.util.LexerEditorHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; import com.intellij.openapi.fileTypes.FileType; @@ -68,7 +68,7 @@ public class TemplateEditorUtil { } SyntaxHighlighter highlighter = createTemplateTextHighlighter(fileType.getHighlighter(null)); - ((EditorEx)editor).setHighlighter(new LexerHighlighter(highlighter, EditorColorsManager.getInstance().getGlobalScheme())); + ((EditorEx)editor).setHighlighter(new LexerEditorHighlighter(highlighter, EditorColorsManager.getInstance().getGlobalScheme())); } private final static TokenSet TOKENS_TO_MERGE = TokenSet.create(new IElementType[]{TemplateTokenType.TEXT}); diff --git a/source/com/intellij/execution/impl/ConsoleViewImpl.java b/source/com/intellij/execution/impl/ConsoleViewImpl.java index 05dfdb0cc3d7..307d1d415e0d 100644 --- a/source/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/source/com/intellij/execution/impl/ConsoleViewImpl.java @@ -23,7 +23,7 @@ import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.EditorMouseAdapter; import com.intellij.openapi.editor.event.EditorMouseEvent; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.editor.markup.HighlighterLayer; import com.intellij.openapi.editor.markup.HighlighterTargetArea; @@ -369,7 +369,7 @@ public final class ConsoleViewImpl extends JPanel implements ConsoleView, DataPr final EditorFactory editorFactory = EditorFactory.getInstance(); final Document editorDocument = editorFactory.createDocument(""); final EditorEx editor = (EditorEx) editorFactory.createViewer(editorDocument,myProject); - final Highlighter highlighter = new MyHighghlighter(); + final EditorHighlighter highlighter = new MyHighghlighter(); editor.setHighlighter(highlighter); editor.putUserData(CONSOLE_VIEW_IN_EDITOR_VIEW, ConsoleViewImpl.this); @@ -528,7 +528,7 @@ public final class ConsoleViewImpl extends JPanel implements ConsoleView, DataPr } } - private class MyHighghlighter extends DocumentAdapter implements Highlighter { + private class MyHighghlighter extends DocumentAdapter implements EditorHighlighter { private boolean myHasEditor; public HighlighterIterator createIterator(final int startOffset) { diff --git a/source/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java b/source/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java index ff0630685ce3..803edd31bf75 100644 --- a/source/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java +++ b/source/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.editor.ex.util.LexerHighlighter; +import com.intellij.openapi.editor.ex.util.LexerEditorHighlighter; import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider; import com.intellij.openapi.fileTypes.*; import com.intellij.openapi.options.Configurable; @@ -330,7 +330,7 @@ public class FileTemplateConfigurable implements Configurable { } SyntaxHighlighter originalHighlighter = fileType.getHighlighter(null); - LexerHighlighter highlighter = new LexerHighlighter(new TemplateHighlighter(originalHighlighter), EditorColorsManager.getInstance().getGlobalScheme()); + LexerEditorHighlighter highlighter = new LexerEditorHighlighter(new TemplateHighlighter(originalHighlighter), EditorColorsManager.getInstance().getGlobalScheme()); ((EditorEx)myTemplateEditor).setHighlighter(highlighter); ((EditorEx)myTemplateEditor).repaint(0, myTemplateEditor.getDocument().getTextLength()); } diff --git a/source/com/intellij/ide/highlighter/HighlighterFactory.java b/source/com/intellij/ide/highlighter/HighlighterFactory.java index bbb5f23534bd..3d1e1acd72ae 100644 --- a/source/com/intellij/ide/highlighter/HighlighterFactory.java +++ b/source/com/intellij/ide/highlighter/HighlighterFactory.java @@ -4,7 +4,7 @@ import com.intellij.ide.highlighter.custom.CustomFileHighlighter; 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.editor.ex.util.LexerEditorHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; @@ -15,54 +15,54 @@ import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.PsiManager; public class HighlighterFactory { - public static LexerHighlighter createJavaHighlighter(EditorColorsScheme settings, LanguageLevel languageLevel){ + public static LexerEditorHighlighter createJavaHighlighter(EditorColorsScheme settings, LanguageLevel languageLevel){ return createHighlighter(new JavaFileHighlighter(languageLevel), settings); } - public static LexerHighlighter createHTMLHighlighter(EditorColorsScheme settings){ + public static LexerEditorHighlighter createHTMLHighlighter(EditorColorsScheme settings){ SyntaxHighlighter highlighter = new HtmlFileHighlighter(); return createHighlighter(highlighter, settings); } - public static LexerHighlighter createHighlighter(SyntaxHighlighter highlighter, EditorColorsScheme settings) { - return new LexerHighlighter(highlighter, settings); + public static LexerEditorHighlighter createHighlighter(SyntaxHighlighter highlighter, EditorColorsScheme settings) { + return new LexerEditorHighlighter(highlighter, settings); } - public static LexerHighlighter createXMLHighlighter(EditorColorsScheme settings){ + public static LexerEditorHighlighter createXMLHighlighter(EditorColorsScheme settings){ return createHighlighter(new XmlFileHighlighter(), settings); } - public static LexerHighlighter createJSPHighlighter(EditorColorsScheme settings, Project project){ + public static LexerEditorHighlighter createJSPHighlighter(EditorColorsScheme settings, Project project){ final LanguageLevel languageLevel = project != null ? PsiManager.getInstance(project).getEffectiveLanguageLevel() : LanguageLevel.HIGHEST; return createHighlighter(new JspFileHighlighter(languageLevel), settings); } - public static LexerHighlighter createJSPHighlighter(EditorColorsScheme settings, LanguageLevel languageLevel){ + public static LexerEditorHighlighter createJSPHighlighter(EditorColorsScheme settings, LanguageLevel languageLevel){ return createHighlighter(new JspFileHighlighter(languageLevel), settings); } - public static LexerHighlighter createCustomHighlighter(SyntaxTable syntaxTable, EditorColorsScheme settings){ + public static LexerEditorHighlighter createCustomHighlighter(SyntaxTable syntaxTable, EditorColorsScheme settings){ return createHighlighter(new CustomFileHighlighter(syntaxTable), settings); } - public static LexerHighlighter createHighlighter(Project project, String fileName) { + public static LexerEditorHighlighter createHighlighter(Project project, String fileName) { return createHighlighter(EditorColorsManager.getInstance().getGlobalScheme(), fileName, project); } - public static LexerHighlighter createHighlighter(Project project, VirtualFile file) { + public static LexerEditorHighlighter createHighlighter(Project project, VirtualFile file) { return createHighlighter(project, file.getFileType()); } - public static LexerHighlighter createHighlighter(Project project, FileType fileType) { + public static LexerEditorHighlighter createHighlighter(Project project, FileType fileType) { return createHighlighter(fileType, EditorColorsManager.getInstance().getGlobalScheme(), project); } - public static LexerHighlighter createHighlighter(EditorColorsScheme settings, String fileName, Project project) { + public static LexerEditorHighlighter createHighlighter(EditorColorsScheme settings, String fileName, Project project) { FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(fileName); return createHighlighter(fileType, settings, project); } - public static LexerHighlighter createHighlighter(FileType fileType, EditorColorsScheme settings, Project project) { + public static LexerEditorHighlighter createHighlighter(FileType fileType, EditorColorsScheme settings, Project project) { SyntaxHighlighter highlighter = fileType.getHighlighter(project); return createHighlighter(highlighter != null ? highlighter : new PlainSyntaxHighlighter(), settings); } diff --git a/source/com/intellij/ide/impl/EditorHighlighterImpl.java b/source/com/intellij/ide/impl/SelectInEditorManagerImpl.java similarity index 94% rename from source/com/intellij/ide/impl/EditorHighlighterImpl.java rename to source/com/intellij/ide/impl/SelectInEditorManagerImpl.java index 70da415093b1..6917691d4bee 100644 --- a/source/com/intellij/ide/impl/EditorHighlighterImpl.java +++ b/source/com/intellij/ide/impl/SelectInEditorManagerImpl.java @@ -1,6 +1,6 @@ package com.intellij.ide.impl; -import com.intellij.ide.EditorHighlighter; +import com.intellij.ide.SelectInEditorManager; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.editor.Editor; @@ -25,12 +25,12 @@ import java.awt.event.FocusListener; * @author MYakovlev * Date: Jul 1, 2002 */ -public class EditorHighlighterImpl extends EditorHighlighter implements ProjectComponent, FocusListener, CaretListener{ +public class SelectInEditorManagerImpl extends SelectInEditorManager implements ProjectComponent, FocusListener, CaretListener{ private Project myProject; private RangeHighlighter mySegmentHighlighter; private Editor myEditor; - public EditorHighlighterImpl(Project project){ + public SelectInEditorManagerImpl(Project project){ myProject = project; } @@ -41,7 +41,7 @@ public class EditorHighlighterImpl extends EditorHighlighter implements ProjectC } public String getComponentName(){ - return "EditorHighlighter"; + return "SelectInEditorManager"; } public void initComponent() { } diff --git a/source/com/intellij/ide/todo/TodoTreeBuilder.java b/source/com/intellij/ide/todo/TodoTreeBuilder.java index b9cdfba4e4c6..28cd698cac61 100644 --- a/source/com/intellij/ide/todo/TodoTreeBuilder.java +++ b/source/com/intellij/ide/todo/TodoTreeBuilder.java @@ -8,7 +8,7 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.ide.util.treeView.TreeBuilderUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FileStatusListener; import com.intellij.openapi.vcs.FileStatusManager; @@ -48,7 +48,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { */ protected final HashSet myDirtyFileSet; - protected final com.intellij.util.containers.HashMap myFile2Highlighter; + protected final com.intellij.util.containers.HashMap myFile2Highlighter; protected final PsiSearchHelper mySearchHelper; /** @@ -69,7 +69,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { myFileTree = new FileTree(); myDirtyFileSet = new HashSet(); - myFile2Highlighter = new com.intellij.util.containers.HashMap(); + myFile2Highlighter = new com.intellij.util.containers.HashMap(); PsiManager psiManager = PsiManager.getInstance(myProject); mySearchHelper = psiManager.getSearchHelper(); @@ -247,7 +247,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { myFileTree.add(file); // file can be moved. remove/add calls move it to another place if (myFile2Highlighter.containsKey(file)) { // update highlighter's text Document document = PsiDocumentManager.getInstance(myProject).getDocument(psiFile); - Highlighter highlighter = myFile2Highlighter.get(file); + EditorHighlighter highlighter = myFile2Highlighter.get(file); highlighter.setText(document.getCharsSequence()); } } @@ -507,16 +507,16 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { } /** - * @return Highlighter for the specified psiFile. Highlighters are + * @return SelectInEditorManager for the specified psiFile. Highlighters are * lazy created and initialized. */ - public Highlighter getHighlighter(PsiFile psiFile, Document document) { + public EditorHighlighter getHighlighter(PsiFile psiFile, Document document) { VirtualFile file = psiFile.getVirtualFile(); if (myFile2Highlighter.containsKey(file)) { return myFile2Highlighter.get(file); } else { - Highlighter highlighter = HighlighterFactory.createHighlighter(UsageTreeColorsScheme.getInstance().getScheme(), file.getName(), myProject); + EditorHighlighter highlighter = HighlighterFactory.createHighlighter(UsageTreeColorsScheme.getInstance().getScheme(), file.getName(), myProject); highlighter.setText(document.getCharsSequence()); myFile2Highlighter.put(file, highlighter); return highlighter; diff --git a/source/com/intellij/ide/todo/nodes/TodoItemNode.java b/source/com/intellij/ide/todo/nodes/TodoItemNode.java index 71ca5164338b..fb2b7d4fb66f 100644 --- a/source/com/intellij/ide/todo/nodes/TodoItemNode.java +++ b/source/com/intellij/ide/todo/nodes/TodoItemNode.java @@ -8,7 +8,7 @@ import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.RangeMarker; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.project.Project; @@ -101,7 +101,7 @@ public final class TodoItemNode extends BaseToDoNode imple // Update highlighted regions myHighlightedRegions.clear(); - Highlighter highlighter = myBuilder.getHighlighter(todoItem.getFile(),document); + EditorHighlighter highlighter = myBuilder.getHighlighter(todoItem.getFile(),document); HighlighterIterator iterator=highlighter.createIterator(lineStartOffset); while(!iterator.atEnd()){ int start=Math.max(iterator.getStart(),lineStartOffset); diff --git a/source/com/intellij/openapi/diff/impl/DiffHighliterFactory.java b/source/com/intellij/openapi/diff/impl/DiffHighliterFactory.java index 05e612321c77..cb77f3756cd5 100644 --- a/source/com/intellij/openapi/diff/impl/DiffHighliterFactory.java +++ b/source/com/intellij/openapi/diff/impl/DiffHighliterFactory.java @@ -1,7 +1,7 @@ package com.intellij.openapi.diff.impl; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; public interface DiffHighliterFactory { - Highlighter createHighlighter(); + EditorHighlighter createHighlighter(); } diff --git a/source/com/intellij/openapi/diff/impl/DiffHighliterFactoryImpl.java b/source/com/intellij/openapi/diff/impl/DiffHighliterFactoryImpl.java index 9c40aaaf3a42..1c36f62c8197 100644 --- a/source/com/intellij/openapi/diff/impl/DiffHighliterFactoryImpl.java +++ b/source/com/intellij/openapi/diff/impl/DiffHighliterFactoryImpl.java @@ -1,7 +1,7 @@ package com.intellij.openapi.diff.impl; import com.intellij.ide.highlighter.HighlighterFactory; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; @@ -14,7 +14,7 @@ public class DiffHighliterFactoryImpl implements DiffHighliterFactory { myProject = project; } - public Highlighter createHighlighter() { + public EditorHighlighter createHighlighter() { return (myFileType == null || myProject == null) ? null : HighlighterFactory.createHighlighter(myProject, myFileType); } diff --git a/source/com/intellij/openapi/diff/impl/DiffSideView.java b/source/com/intellij/openapi/diff/impl/DiffSideView.java index 82d6221f53df..788c2183efa4 100644 --- a/source/com/intellij/openapi/diff/impl/DiffSideView.java +++ b/source/com/intellij/openapi/diff/impl/DiffSideView.java @@ -12,7 +12,7 @@ import com.intellij.openapi.editor.event.EditorMouseEvent; import com.intellij.openapi.editor.event.EditorMouseEventArea; import com.intellij.openapi.editor.event.EditorMouseMotionAdapter; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; import com.intellij.util.IJSwingUtilities; @@ -79,7 +79,7 @@ public class DiffSideView { private void applyHighlighter() { EditorEx editor = myEditorSource.getEditor(); if (editor == null) return; - Highlighter highlighter = myHighlighterFactory.createHighlighter(); + EditorHighlighter highlighter = myHighlighterFactory.createHighlighter(); if (highlighter != null) editor.setHighlighter(highlighter); editor.getColorsScheme().setColor(EditorColors.CARET_ROW_COLOR, null); } diff --git a/source/com/intellij/openapi/editor/ex/EditorEx.java b/source/com/intellij/openapi/editor/ex/EditorEx.java index 398be8e0a564..a9063a0446f7 100644 --- a/source/com/intellij/openapi/editor/ex/EditorEx.java +++ b/source/com/intellij/openapi/editor/ex/EditorEx.java @@ -24,9 +24,9 @@ public interface EditorEx extends Editor { EditorGutterComponentEx getGutterComponentEx(); - Highlighter getHighlighter(); + EditorHighlighter getHighlighter(); - void setHighlighter(Highlighter highlighter); + void setHighlighter(EditorHighlighter highlighter); void setColorsScheme(EditorColorsScheme scheme); diff --git a/source/com/intellij/openapi/editor/ex/Highlighter.java b/source/com/intellij/openapi/editor/ex/EditorHighlighter.java similarity index 86% rename from source/com/intellij/openapi/editor/ex/Highlighter.java rename to source/com/intellij/openapi/editor/ex/EditorHighlighter.java index 905a3791877c..bd0744cd649a 100644 --- a/source/com/intellij/openapi/editor/ex/Highlighter.java +++ b/source/com/intellij/openapi/editor/ex/EditorHighlighter.java @@ -4,7 +4,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.event.DocumentListener; -public interface Highlighter extends DocumentListener { +public interface EditorHighlighter extends DocumentListener { HighlighterIterator createIterator(int startOffset); void setText(CharSequence text); void setEditor(Editor editor); diff --git a/source/com/intellij/openapi/editor/ex/util/EmptyHighlighter.java b/source/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java similarity index 88% rename from source/com/intellij/openapi/editor/ex/util/EmptyHighlighter.java rename to source/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java index 6733998a044a..c9440b643992 100644 --- a/source/com/intellij/openapi/editor/ex/util/EmptyHighlighter.java +++ b/source/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java @@ -6,19 +6,19 @@ import com.intellij.openapi.editor.HighlighterColors; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.psi.tree.IElementType; -public class EmptyHighlighter extends DocumentAdapter implements Highlighter{ - private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.EmptyHighlighter"); +public class EmptyEditorHighlighter extends DocumentAdapter implements EditorHighlighter{ + private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.EmptyEditorHighlighter"); private TextAttributes myAttributes; private int myTextLength = 0; private boolean myHasEditor = false; - public EmptyHighlighter(TextAttributes attributes) { + public EmptyEditorHighlighter(TextAttributes attributes) { myAttributes = attributes; } diff --git a/source/com/intellij/openapi/editor/ex/util/LexerHighlighter.java b/source/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java similarity index 96% rename from source/com/intellij/openapi/editor/ex/util/LexerHighlighter.java rename to source/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java index 972ae0251b00..1e3ac8fd11c9 100644 --- a/source/com/intellij/openapi/editor/ex/util/LexerHighlighter.java +++ b/source/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java @@ -10,7 +10,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.HighlighterIterator; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.fileTypes.SyntaxHighlighter; @@ -23,8 +23,8 @@ import java.util.Map; /** * */ -public class LexerHighlighter extends DocumentAdapter implements Highlighter { - private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.LexerHighlighter"); +public class LexerEditorHighlighter extends DocumentAdapter implements EditorHighlighter { + private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.LexerEditorHighlighter"); private Editor myEditor; private Lexer myLexer; private Map myAttributesMap; @@ -32,7 +32,7 @@ public class LexerHighlighter extends DocumentAdapter implements Highlighter { private SyntaxHighlighter myHighlighter; private EditorColorsScheme myScheme; - public LexerHighlighter(SyntaxHighlighter highlighter, EditorColorsScheme scheme) { + public LexerEditorHighlighter(SyntaxHighlighter highlighter, EditorColorsScheme scheme) { myScheme = scheme; myLexer = highlighter.getHighlightingLexer(); myAttributesMap = new HashMap(); diff --git a/source/com/intellij/openapi/editor/impl/BorderEffect.java b/source/com/intellij/openapi/editor/impl/BorderEffect.java index 9ce61c3f346b..54611fa8a34d 100644 --- a/source/com/intellij/openapi/editor/impl/BorderEffect.java +++ b/source/com/intellij/openapi/editor/impl/BorderEffect.java @@ -1,7 +1,7 @@ package com.intellij.openapi.editor.impl; import com.intellij.openapi.editor.LogicalPosition; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.markup.EffectType; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.TextAttributes; @@ -82,7 +82,7 @@ public class BorderEffect { myRange.contains(rangeHighlighter.getAffectedAreaEndOffset()); } - public void paintHighlighters(Highlighter highlighter) { + public void paintHighlighters(EditorHighlighter highlighter) { int startOffset = startOfLineByOffset(myStartOffset); if (0 > startOffset || startOffset >= myEditor.getDocument().getTextLength()) return; RangeIterator iterator = new RangeIterator(new FoldingOrNewLineGaps(myEditor), SAME_COLOR_BOXES, diff --git a/source/com/intellij/openapi/editor/impl/DocumentImpl.java b/source/com/intellij/openapi/editor/impl/DocumentImpl.java index 3e180fbf92f7..e6be3f9994aa 100644 --- a/source/com/intellij/openapi/editor/impl/DocumentImpl.java +++ b/source/com/intellij/openapi/editor/impl/DocumentImpl.java @@ -8,7 +8,7 @@ import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.DocumentListener; import com.intellij.openapi.editor.ex.DocumentEx; import com.intellij.openapi.editor.ex.EditReadOnlyListener; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.ex.LineIterator; import com.intellij.openapi.editor.impl.event.DocumentEventImpl; import com.intellij.openapi.editor.markup.MarkupModel; @@ -52,7 +52,7 @@ public class DocumentImpl implements DocumentEx { private int getPriority(Object o) { if (o instanceof FoldingModel) return 1; - if (o instanceof Highlighter) return 2; + if (o instanceof EditorHighlighter) return 2; if (o instanceof CaretModel) return 3; if (o instanceof SelectionModel) return 4; if (o instanceof EditorImpl.EditorDocumentAdapter) return 5; diff --git a/source/com/intellij/openapi/editor/impl/EditorImpl.java b/source/com/intellij/openapi/editor/impl/EditorImpl.java index 37338fae7e1e..532cc95db9bf 100644 --- a/source/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/source/com/intellij/openapi/editor/impl/EditorImpl.java @@ -22,7 +22,7 @@ import com.intellij.openapi.editor.colors.*; import com.intellij.openapi.editor.event.*; import com.intellij.openapi.editor.ex.*; import com.intellij.openapi.editor.ex.util.EditorUtil; -import com.intellij.openapi.editor.ex.util.EmptyHighlighter; +import com.intellij.openapi.editor.ex.util.EmptyEditorHighlighter; import com.intellij.openapi.editor.impl.event.MarkupModelEvent; import com.intellij.openapi.editor.impl.event.MarkupModelListener; import com.intellij.openapi.editor.markup.*; @@ -126,7 +126,7 @@ public class EditorImpl implements EditorEx { private final MarkupModelListener myMarkupModelListener; - private Highlighter myHighlighter; + private EditorHighlighter myHighlighter; private int myScrollbarOrientation; private boolean myMousePressedInsideSelection; @@ -225,7 +225,7 @@ public class EditorImpl implements EditorEx { myFoldingModel.flushCaretShift(); myScrollbarOrientation = EditorEx.VERTICAL_SCROLLBAR_RIGHT; - Highlighter highlighter = new EmptyHighlighter(myScheme.getAttributes(HighlighterColors.TEXT)); + EditorHighlighter highlighter = new EmptyEditorHighlighter(myScheme.getAttributes(HighlighterColors.TEXT)); setHighlighter(highlighter); initComponent(); @@ -515,7 +515,7 @@ public class EditorImpl implements EditorEx { } } - public void setHighlighter(Highlighter highlighter) { + public void setHighlighter(EditorHighlighter highlighter) { ApplicationManager.getApplication().assertIsDispatchThread(); if (myHighlighter != null) { getDocument().removeDocumentListener(myHighlighter); @@ -530,7 +530,7 @@ public class EditorImpl implements EditorEx { } } - public Highlighter getHighlighter() { + public EditorHighlighter getHighlighter() { ApplicationManager.getApplication().assertIsDispatchThread(); return myHighlighter; } diff --git a/source/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/source/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java index ac055485df91..4a96937d3850 100644 --- a/source/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java +++ b/source/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java @@ -12,7 +12,7 @@ import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.event.*; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.ex.EditorMarkupModel; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileTypes.FileTypeEvent; @@ -169,7 +169,7 @@ final class TextEditorComponent extends JPanel implements DataProvider{ private Editor createEditor(){ Editor editor=EditorFactory.getInstance().createEditor(myDocument, myProject); ((EditorMarkupModel) editor.getMarkupModel()).setErrorStripeVisible(true); - Highlighter highlighter=HighlighterFactory.createHighlighter(myProject, myFile.getName()); + EditorHighlighter highlighter=HighlighterFactory.createHighlighter(myProject, myFile.getName()); ((EditorEx) editor).setHighlighter(highlighter); ((EditorEx) editor).setFile(myFile); @@ -244,7 +244,7 @@ final class TextEditorComponent extends JPanel implements DataProvider{ * changes its file type. */ private void updateHighlighters(){ - final Highlighter highlighter = HighlighterFactory.createHighlighter(myProject, myFile.getName()); + final EditorHighlighter highlighter = HighlighterFactory.createHighlighter(myProject, myFile.getName()); ((EditorEx)myEditor).setHighlighter(highlighter); } diff --git a/source/com/intellij/openapi/vcs/ex/LineStatusTracker.java b/source/com/intellij/openapi/vcs/ex/LineStatusTracker.java index 9e178ffbffbf..b5ab42b38ffd 100644 --- a/source/com/intellij/openapi/vcs/ex/LineStatusTracker.java +++ b/source/com/intellij/openapi/vcs/ex/LineStatusTracker.java @@ -18,7 +18,7 @@ import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.ex.DocumentEx; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.ex.EditorGutterComponentEx; -import com.intellij.openapi.editor.ex.Highlighter; +import com.intellij.openapi.editor.ex.EditorHighlighter; import com.intellij.openapi.editor.impl.EditorImpl; import com.intellij.openapi.editor.markup.*; import com.intellij.openapi.fileEditor.FileDocumentManager; @@ -697,7 +697,7 @@ public class LineStatusTracker implements EditorColorsListener { if (range.getType() != Range.INSERTED) { DocumentEx doc = (DocumentEx)myUpToDateDocument; EditorImpl uEditor = new EditorImpl(doc, true, myProject); - Highlighter highlighter = HighlighterFactory.createHighlighter(myProject, getFileName()); + EditorHighlighter highlighter = HighlighterFactory.createHighlighter(myProject, getFileName()); uEditor.setHighlighter(highlighter); EditorFragmentComponent editorFragmentComponent = EditorFragmentComponent.createEditorFragmentComponent(uEditor,