From b67cb3162a2a22697f39ba63c63e4a034b636f1f Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Mon, 15 Oct 2012 10:14:26 +0200 Subject: [PATCH] restore compatibility --- .../intellij/openapi/fileTypes/SyntaxHighlighter.java | 8 ++++++++ .../openapi/fileTypes/SyntaxHighlighterFactory.java | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java index 120cf43418ce..a3fcf0749ed1 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java @@ -17,6 +17,7 @@ package com.intellij.openapi.fileTypes; import com.intellij.lexer.Lexer; import com.intellij.openapi.editor.colors.TextAttributesKey; +import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; @@ -27,6 +28,13 @@ import org.jetbrains.annotations.NotNull; * @see com.intellij.openapi.fileTypes.SyntaxHighlighterFactory#getSyntaxHighlighter(com.intellij.lang.Language, com.intellij.openapi.project.Project, com.intellij.openapi.vfs.VirtualFile) */ public interface SyntaxHighlighter { + /** + * @deprecated + * @see com.intellij.openapi.fileTypes.SyntaxHighlighterFactory#getSyntaxHighlighter(com.intellij.openapi.project.Project, com.intellij.openapi.vfs.VirtualFile) + * @see com.intellij.openapi.fileTypes.SyntaxHighlighterFactory#getSyntaxHighlighter(com.intellij.lang.Language, com.intellij.openapi.project.Project, com.intellij.openapi.vfs.VirtualFile) + */ + @Deprecated SyntaxHighlighterProvider PROVIDER = new FileTypeExtensionFactory(SyntaxHighlighterProvider.class, "com.intellij.syntaxHighlighter").get(); + /** * Returns the lexer used for highlighting the file. The lexer is invoked incrementally when the file is changed, so it must be * capable of saving/restoring state and resuming lexing from the middle of the file. diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighterFactory.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighterFactory.java index 3796f59c0fb0..bc27f5975396 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighterFactory.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighterFactory.java @@ -28,13 +28,6 @@ import org.jetbrains.annotations.Nullable; public abstract class SyntaxHighlighterFactory { public static final SyntaxHighlighterLanguageFactory LANGUAGE_FACTORY = new SyntaxHighlighterLanguageFactory(); - private static final NotNullLazyValue PROVIDER = new NotNullLazyValue() { - @NotNull - @Override - protected SyntaxHighlighterProvider compute() { - return new FileTypeExtensionFactory(SyntaxHighlighterProvider.class, "com.intellij.syntaxHighlighter").get(); - } - }; /** * Returns syntax highlighter for the given language. @@ -58,7 +51,7 @@ public abstract class SyntaxHighlighterFactory { */ @Nullable public static SyntaxHighlighter getSyntaxHighlighter(final FileType fileType, final @Nullable Project project, final @Nullable VirtualFile virtualFile) { - return PROVIDER.getValue().create(fileType, project, virtualFile); + return SyntaxHighlighter.PROVIDER.create(fileType, project, virtualFile); } /**