MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring: only SyntaxHighlighterFactory should be used to create highlighters.

Browse Source 
- SyntaxHighlighter.PROVIDER moved to SyntaxHighlighterFactory.
- POVIDER.create() encapsulated into SyntaxHighlighterFactory.getSyntaxHighligher(FileType, Project, VirtualFile()
This commit is contained in:
Oleg Sukhodolsky
2012-10-01 15:29:06 +04:00
parent db33fba286
commit fd07b2c58d
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/python-rest/src/com/jetbrains/rest/RestEditorHighlighter.java
View File

@@ -5,7 +5,6 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.ex.util.LayerDescriptor;
import com.intellij.openapi.editor.ex.util.LayeredLexerEditorHighlighter;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
@@ -25,13 +24,13 @@ public class RestEditorHighlighter extends LayeredLexerEditorHighlighter {
super(SyntaxHighlighterFactory.getSyntaxHighlighter(RestLanguage.INSTANCE, project, file), scheme);
registerLayer(RestTokenTypes.PYTHON_LINE, new LayerDescriptor(
SyntaxHighlighter.PROVIDER.create(PythonFileType.INSTANCE, project, file), "", EditorColors.INJECTED_LANGUAGE_FRAGMENT));
SyntaxHighlighterFactory.getSyntaxHighlighter(PythonFileType.INSTANCE, project, file), "", EditorColors.INJECTED_LANGUAGE_FRAGMENT));
registerLayer(RestTokenTypes.DJANGO_LINE, new LayerDescriptor(
SyntaxHighlighter.PROVIDER.create(DjangoTemplateFileType.INSTANCE, project, file), "", EditorColors.INJECTED_LANGUAGE_FRAGMENT));
SyntaxHighlighterFactory.getSyntaxHighlighter(DjangoTemplateFileType.INSTANCE, project, file), "", EditorColors.INJECTED_LANGUAGE_FRAGMENT));
registerLayer(RestTokenTypes.JAVASCRIPT_LINE, new LayerDescriptor(
SyntaxHighlighter.PROVIDER.create(StdFileTypes.JS, project, file), "", EditorColors.INJECTED_LANGUAGE_FRAGMENT));
SyntaxHighlighterFactory.getSyntaxHighlighter(StdFileTypes.JS, project, file), "", EditorColors.INJECTED_LANGUAGE_FRAGMENT));
}
}

3
python/rest/src/com/jetbrains/rest/RestColorsPage.java
View File

@@ -2,6 +2,7 @@ package com.jetbrains.rest;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.options.colors.AttributesDescriptor;
import com.intellij.openapi.options.colors.ColorDescriptor;
import com.intellij.openapi.options.colors.ColorSettingsPage;
@@ -53,7 +54,7 @@ public class RestColorsPage implements ColorSettingsPage {
@NotNull
public SyntaxHighlighter getHighlighter() {
final SyntaxHighlighter highlighter = SyntaxHighlighter.PROVIDER.create(RestFileType.INSTANCE, null, null);
final SyntaxHighlighter highlighter = SyntaxHighlighterFactory.getSyntaxHighlighter(RestFileType.INSTANCE, null, null);
assert highlighter != null;
return highlighter;
}

3
python/src/com/jetbrains/python/buildout/config/BuildoutCfgColorsPage.java
View File

@@ -2,6 +2,7 @@ package com.jetbrains.python.buildout.config;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.options.colors.AttributesDescriptor;
import com.intellij.openapi.options.colors.ColorDescriptor;
import com.intellij.openapi.options.colors.ColorSettingsPage;
@@ -51,7 +52,7 @@ public class BuildoutCfgColorsPage implements ColorSettingsPage {
@NotNull
public SyntaxHighlighter getHighlighter() {
final SyntaxHighlighter highlighter = SyntaxHighlighter.PROVIDER.create(BuildoutCfgFileType.INSTANCE, null, null);
final SyntaxHighlighter highlighter = SyntaxHighlighterFactory.getSyntaxHighlighter(BuildoutCfgFileType.INSTANCE, null, null);
assert highlighter != null;
return highlighter;
}

3
python/src/com/jetbrains/python/highlighting/PythonColorsPage.java
View File

@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap;
import com.intellij.application.options.colors.InspectionColorSettingsPage;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.options.colors.AttributesDescriptor;
import com.intellij.openapi.options.colors.ColorDescriptor;
import com.intellij.openapi.options.colors.ColorSettingsPage;
@@ -81,7 +82,7 @@ public class PythonColorsPage implements ColorSettingsPage, InspectionColorSetti
@NotNull
public SyntaxHighlighter getHighlighter() {
final SyntaxHighlighter highlighter = SyntaxHighlighter.PROVIDER.create(PythonFileType.INSTANCE, null, null);
final SyntaxHighlighter highlighter = SyntaxHighlighterFactory.getSyntaxHighlighter(PythonFileType.INSTANCE, null, null);
assert highlighter != null;
return highlighter;
}

8
python/src/com/jetbrains/python/lexer/PythonEditorHighlighter.java
View File

@@ -7,7 +7,7 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.editor.ex.util.LexerEditorHighlighter;
import com.intellij.openapi.editor.highlighter.HighlighterClient;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
@@ -23,9 +23,9 @@ import org.jetbrains.annotations.Nullable;
public class PythonEditorHighlighter extends LexerEditorHighlighter {
public PythonEditorHighlighter(@NotNull EditorColorsScheme scheme, @Nullable Project project, @Nullable VirtualFile file) {
super(SyntaxHighlighter.PROVIDER.create(file != null ? file.getFileType() : PythonFileType.INSTANCE,
project,
file),
super(SyntaxHighlighterFactory.getSyntaxHighlighter(file != null ? file.getFileType() : PythonFileType.INSTANCE,
project,
file),
scheme);
}