From 3c31620f5a02ae7011c1f5d3605c4cfc088e80f0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 3 Apr 2013 20:36:20 +0400 Subject: [PATCH] Removed commented out code from color settings. When we implement actual highlighting for KDoc highlighting, returning these lines would be easy. --- .../org/jetbrains/jet/plugin/JetBundle.properties | 3 --- .../plugin/highlighter/JetColorSettingsPage.java | 4 ---- .../plugin/highlighter/JetHighlightingColors.java | 15 --------------- 3 files changed, 22 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index 5b3239298a4..ba9b2c3b3d7 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -96,9 +96,6 @@ options.jet.attribute.descriptor.closure.braces=Function literal braces and arro options.jet.attribute.descriptor.safe.access=Safe access dot options.jet.attribute.descriptor.arrow=Arrow options.jet.attribute.descriptor.kdoc.comment=KDoc comment -options.jet.attribute.descriptor.kdoc.tag=KDoc tag -options.jet.attribute.descriptor.kdoc.tag.value=KDoc tag value -options.jet.attribute.descriptor.kdoc.markup=KDoc markup options.jet.attribute.descriptor.trait=Trait options.jet.attribute.descriptor.annotation=Annotation options.jet.attribute.descriptor.var=Var (mutable variable, parameter or property) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java index 4e55276ed3b..c39db363ffd 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java @@ -125,11 +125,7 @@ public class JetColorSettingsPage implements ColorSettingsPage { new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.line.comment"), JetHighlightingColors.LINE_COMMENT), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.block.comment"), JetHighlightingColors.BLOCK_COMMENT), - // KDoc highlighting options are temporarily disabled, until actual highlighting and parsing of them is implemented new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.kdoc.comment"), JetHighlightingColors.DOC_COMMENT), - //new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.kdoc.tag"), JetHighlightingColors.DOC_COMMENT_TAG), - //new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.kdoc.tag.value"), JetHighlightingColors.DOC_COMMENT_TAG_VALUE), - //new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.kdoc.markup"), JetHighlightingColors.DOC_COMMENT_MARKUP), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.class"), JetHighlightingColors.CLASS), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.type.parameter"), JetHighlightingColors.TYPE_PARAMETER), diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java index 2f769c9354d..66c7e8ee930 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java @@ -121,21 +121,6 @@ public class JetHighlightingColors { SyntaxHighlighterColors.DOC_COMMENT.getDefaultAttributes() ); - public static final TextAttributesKey DOC_COMMENT_TAG = TextAttributesKey.createTextAttributesKey( - "KOTLIN_DOC_COMMENT_TAG", - SyntaxHighlighterColors.DOC_COMMENT_TAG.getDefaultAttributes() - ); - - public static final TextAttributesKey DOC_COMMENT_TAG_VALUE = TextAttributesKey.createTextAttributesKey( - "KOTLIN_DOC_COMMENT_TAG_VALUE", - CodeInsightColors.DOC_COMMENT_TAG_VALUE.getDefaultAttributes() - ); - - public static final TextAttributesKey DOC_COMMENT_MARKUP = TextAttributesKey.createTextAttributesKey( - "KOTLIN_DOC_COMMENT_MARKUP", - SyntaxHighlighterColors.DOC_COMMENT_MARKUP.getDefaultAttributes() - ); - public static final TextAttributesKey CLASS = TextAttributesKey.createTextAttributesKey( "KOTLIN_CLASS", CodeInsightColors.CLASS_NAME_ATTRIBUTES.getDefaultAttributes()