diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpHighlighter.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpHighlighter.java index 0f258b4e1fc9..fd3a8b03bd22 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpHighlighter.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpHighlighter.java @@ -19,7 +19,6 @@ import com.intellij.lang.ParserDefinition; import com.intellij.lexer.Lexer; import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; import com.intellij.openapi.editor.HighlighterColors; -import com.intellij.openapi.editor.SyntaxHighlighterColors; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; import com.intellij.openapi.project.Project; diff --git a/java/java-impl/src/com/intellij/application/options/ImportLayoutPanel.java b/java/java-impl/src/com/intellij/application/options/ImportLayoutPanel.java index d82d51f56b6e..e7d0082155db 100644 --- a/java/java-impl/src/com/intellij/application/options/ImportLayoutPanel.java +++ b/java/java-impl/src/com/intellij/application/options/ImportLayoutPanel.java @@ -18,7 +18,6 @@ package com.intellij.application.options; import com.intellij.ide.highlighter.JavaHighlightingColors; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.editor.SyntaxHighlighterColors; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.psi.codeStyle.PackageEntry; import com.intellij.psi.codeStyle.PackageEntryTable; diff --git a/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java b/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java index c1db84915e8c..2d5f6a3299e5 100644 --- a/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java +++ b/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java @@ -19,7 +19,6 @@ import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.lang.properties.parsing.PropertiesTokenTypes; import com.intellij.lexer.Lexer; import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; -import com.intellij.openapi.editor.SyntaxHighlighterColors; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; import com.intellij.openapi.options.OptionsBundle; diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncHighlighter.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncHighlighter.java index 2b5375229e9f..f73aa00751f9 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncHighlighter.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncHighlighter.java @@ -18,7 +18,7 @@ package org.intellij.plugins.relaxNG.compact; import com.intellij.lexer.Lexer; import com.intellij.openapi.editor.HighlighterColors; -import com.intellij.openapi.editor.SyntaxHighlighterColors; +import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; @@ -45,24 +45,24 @@ public class RncHighlighter extends SyntaxHighlighterBase { static { ourMap1 = new HashMap(); - fillMap(ourMap1, RncTokenTypes.KEYWORDS, SyntaxHighlighterColors.KEYWORD); - fillMap(ourMap1, RncTokenTypes.OPERATORS, SyntaxHighlighterColors.OPERATION_SIGN); + fillMap(ourMap1, RncTokenTypes.KEYWORDS, DefaultLanguageHighlighterColors.KEYWORD); + fillMap(ourMap1, RncTokenTypes.OPERATORS, DefaultLanguageHighlighterColors.OPERATION_SIGN); - fillMap(ourMap1, RncTokenTypes.STRINGS, SyntaxHighlighterColors.STRING); + fillMap(ourMap1, RncTokenTypes.STRINGS, DefaultLanguageHighlighterColors.STRING); - ourMap1.put(RncTokenTypes.LBRACE, SyntaxHighlighterColors.BRACES); - ourMap1.put(RncTokenTypes.RBRACE, SyntaxHighlighterColors.BRACES); + ourMap1.put(RncTokenTypes.LBRACE, DefaultLanguageHighlighterColors.BRACES); + ourMap1.put(RncTokenTypes.RBRACE, DefaultLanguageHighlighterColors.BRACES); - ourMap1.put(RncTokenTypes.LBRACKET, SyntaxHighlighterColors.BRACKETS); - ourMap1.put(RncTokenTypes.RBRACKET, SyntaxHighlighterColors.BRACKETS); + ourMap1.put(RncTokenTypes.LBRACKET, DefaultLanguageHighlighterColors.BRACKETS); + ourMap1.put(RncTokenTypes.RBRACKET, DefaultLanguageHighlighterColors.BRACKETS); - ourMap1.put(RncTokenTypes.LPAREN, SyntaxHighlighterColors.PARENTHS); - ourMap1.put(RncTokenTypes.RPAREN, SyntaxHighlighterColors.PARENTHS); + ourMap1.put(RncTokenTypes.LPAREN, DefaultLanguageHighlighterColors.PARENTHESES); + ourMap1.put(RncTokenTypes.RPAREN, DefaultLanguageHighlighterColors.PARENTHESES); - ourMap1.put(RncTokenTypes.COMMA, SyntaxHighlighterColors.COMMA); + ourMap1.put(RncTokenTypes.COMMA, DefaultLanguageHighlighterColors.COMMA); - fillMap(ourMap1, RncTokenTypes.DOC_TOKENS, SyntaxHighlighterColors.DOC_COMMENT); - fillMap(ourMap1, RncTokenTypes.COMMENTS, SyntaxHighlighterColors.LINE_COMMENT); + fillMap(ourMap1, RncTokenTypes.DOC_TOKENS, DefaultLanguageHighlighterColors.DOC_COMMENT); + fillMap(ourMap1, RncTokenTypes.COMMENTS, DefaultLanguageHighlighterColors.LINE_COMMENT); fillMap(ourMap1, RncTokenTypes.IDENTIFIERS, CodeInsightColors.LOCAL_VARIABLE_ATTRIBUTES);