From 71dbe671fa9142961b7cca905ebce89353990165 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 2 Feb 2015 19:40:23 +0100 Subject: [PATCH] rename tag value to link --- .../src/org/jetbrains/kotlin/idea/JetBundle.properties | 2 +- .../kotlin/idea/highlighter/JetHighlightingColors.java | 2 +- .../org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt | 2 +- .../kotlin/idea/highlighter/JetColorSettingsPage.java | 2 +- idea/testData/highlighter/KDoc.kt | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties index e4f0cee0681..3f12b8f32f7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties @@ -153,7 +153,7 @@ options.kotlin.attribute.descriptor.safe.access=Safe access dot options.kotlin.attribute.descriptor.arrow=Arrow options.kotlin.attribute.descriptor.kdoc.comment=KDoc comment options.kotlin.attribute.descriptor.kdoc.tag=KDoc tag -options.kotlin.attribute.descriptor.kdoc.value=KDoc tag value +options.kotlin.attribute.descriptor.kdoc.value=Link in KDoc tag options.kotlin.attribute.descriptor.trait=Trait options.kotlin.attribute.descriptor.object=Object options.kotlin.attribute.descriptor.annotation=Annotation diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java index 776e1ec14ce..4709e8e514e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java @@ -46,7 +46,7 @@ public class JetHighlightingColors { public static final TextAttributesKey BLOCK_COMMENT = createTextAttributesKey("KOTLIN_BLOCK_COMMENT", DefaultLanguageHighlighterColors.BLOCK_COMMENT); public static final TextAttributesKey DOC_COMMENT = createTextAttributesKey("KOTLIN_DOC_COMMENT", DefaultLanguageHighlighterColors.DOC_COMMENT); public static final TextAttributesKey KDOC_TAG = createTextAttributesKey("KDOC_TAG_NAME", DefaultLanguageHighlighterColors.DOC_COMMENT_TAG); - public static final TextAttributesKey KDOC_TAG_VALUE = createTextAttributesKey("KDOC_TAG_VALUE", DefaultLanguageHighlighterColors.DOC_COMMENT_TAG_VALUE); + public static final TextAttributesKey KDOC_LINK = createTextAttributesKey("KDOC_LINK", DefaultLanguageHighlighterColors.DOC_COMMENT_TAG_VALUE); // class kinds public static final TextAttributesKey CLASS = createTextAttributesKey("KOTLIN_CLASS", CodeInsightColors.CLASS_NAME_ATTRIBUTES); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt index 80fb0dee477..e8315ae05a9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.highlighter.JetHighlightingColors class KDocHighlightingVisitor(holder: AnnotationHolder): HighlightingVisitor(holder) { override fun visitElement(element: PsiElement) { if (element is KDocLink) { - holder.createInfoAnnotation(element, null).setTextAttributes(JetHighlightingColors.KDOC_TAG_VALUE) + holder.createInfoAnnotation(element, null).setTextAttributes(JetHighlightingColors.KDOC_LINK) } super.visitElement(element) } diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java index 19b07209831..76a8e913153 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java @@ -129,7 +129,7 @@ public class JetColorSettingsPage implements ColorSettingsPage { new AttributesDescriptor(JetBundle.message("options.kotlin.attribute.descriptor.kdoc.comment"), JetHighlightingColors.DOC_COMMENT), new AttributesDescriptor(JetBundle.message("options.kotlin.attribute.descriptor.kdoc.tag"), JetHighlightingColors.KDOC_TAG), - new AttributesDescriptor(JetBundle.message("options.kotlin.attribute.descriptor.kdoc.value"), JetHighlightingColors.KDOC_TAG_VALUE), + new AttributesDescriptor(JetBundle.message("options.kotlin.attribute.descriptor.kdoc.value"), JetHighlightingColors.KDOC_LINK), 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/testData/highlighter/KDoc.kt b/idea/testData/highlighter/KDoc.kt index 37be8a3c2d3..05bd200147f 100644 --- a/idea/testData/highlighter/KDoc.kt +++ b/idea/testData/highlighter/KDoc.kt @@ -1,6 +1,6 @@ /** - * @param x foo and [baz] - * @param y bar + * @param x foo and [baz] + * @param y bar * @return notALink here */ fun f(x: Int, y: Int): Int {