From 3b2eebf5ed341333b69e03b740104e2c7c978517 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 2 Apr 2012 18:50:48 +0400 Subject: [PATCH] Moved text of color settings to JetBundle. --- .../jetbrains/jet/plugin/JetBundle.properties | 29 +++++++++- .../highlighter/JetColorSettingsPage.java | 58 ++++++++++--------- 2 files changed, 58 insertions(+), 29 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index f8784df1890..8823feeaef3 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -46,4 +46,31 @@ macro.variable.of.type=kotlinVariable() macro.iterable.variable=kotlinIterableVariable() macro.suggest.variable.name=kotlinSuggestVariableName() macro.fun.parameters=functionParameters() -macro.fun.anonymousSuper=anonymousSuper() \ No newline at end of file +macro.fun.anonymousSuper=anonymousSuper() + +options.jet.attribute.descriptor.builtin.annotation=Built-in annotation +options.jet.attribute.descriptor.closure.braces=Function literal braces +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=Mutable variable, parameter or property (var) +options.jet.attribute.descriptor.local.variable=Local variable +options.jet.attribute.descriptor.bound.variable=Function literal or anonymous object bound variable +options.jet.attribute.descriptor.instance.property=Instance property +options.jet.attribute.descriptor.namespace.property=Namespace property +options.jet.attribute.descriptor.property.with.backing=Property with backing field +options.jet.attribute.descriptor.backing.field.access=Backing field access +options.jet.attribute.descriptor.extension.property=Extension property +options.jet.attribute.descriptor.it=Function literal default parameter +options.jet.attribute.descriptor.fun=Function declaration +options.jet.attribute.descriptor.fun.call=Function call +options.jet.attribute.descriptor.namespace.fun.call=Namespace function call +options.jet.attribute.descriptor.extension.fun.call=Extension function call +options.jet.attribute.descriptor.constructor.call=Constructor call +options.jet.attribute.descriptor.auto.casted=Automatically casted value +options.jet.attribute.descriptor.label=Label diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java index b9d4580a0f5..57fe3eef47a 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java @@ -23,6 +23,7 @@ import com.intellij.openapi.options.colors.AttributesDescriptor; import com.intellij.openapi.options.colors.ColorDescriptor; import com.intellij.openapi.options.colors.ColorSettingsPage; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIconProvider; import javax.swing.*; @@ -95,10 +96,9 @@ public class JetColorSettingsPage implements ColorSettingsPage { @NotNull @Override public AttributesDescriptor[] getAttributeDescriptors() { - // TODO i18n return new AttributesDescriptor[]{ new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.keyword"), JetHighlightingColors.KEYWORD), - new AttributesDescriptor("Built-in annotation", JetHighlightingColors.BUILTIN_ANNOTATION), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.builtin.annotation"), JetHighlightingColors.BUILTIN_ANNOTATION), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.number"), JetHighlightingColors.NUMBER), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.string"), JetHighlightingColors.STRING), @@ -109,50 +109,52 @@ public class JetColorSettingsPage implements ColorSettingsPage { new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.parentheses"), JetHighlightingColors.PARENTHESIS), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.braces"), JetHighlightingColors.BRACES), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.brackets"), JetHighlightingColors.BRACKETS), - new AttributesDescriptor("Function literal braces", JetHighlightingColors.FUNCTION_LITERAL_BRACES), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.closure.braces"), JetHighlightingColors.FUNCTION_LITERAL_BRACES), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.comma"), JetHighlightingColors.COMMA), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.semicolon"), JetHighlightingColors.SEMICOLON), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.dot"), JetHighlightingColors.DOT), - new AttributesDescriptor("Safe access dot", JetHighlightingColors.SAFE_ACCESS), - new AttributesDescriptor("Arrow", JetHighlightingColors.ARROW), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.safe.access"), JetHighlightingColors.SAFE_ACCESS), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.arrow"), JetHighlightingColors.ARROW), 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), - new AttributesDescriptor("KDoc comment", JetHighlightingColors.DOC_COMMENT), - new AttributesDescriptor("KDoc tag", JetHighlightingColors.DOC_COMMENT_TAG), - new AttributesDescriptor("KDoc tag value", JetHighlightingColors.DOC_COMMENT_TAG_VALUE), - new AttributesDescriptor("KDoc markup", JetHighlightingColors.DOC_COMMENT_MARKUP), + + // 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), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.abstract.class"), JetHighlightingColors.ABSTRACT_CLASS), - new AttributesDescriptor("Trait", JetHighlightingColors.TRAIT), - new AttributesDescriptor("Annotation", JetHighlightingColors.ANNOTATION), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.trait"), JetHighlightingColors.TRAIT), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.annotation"), JetHighlightingColors.ANNOTATION), - new AttributesDescriptor("Mutable variable, parameter or property", JetHighlightingColors.MUTABLE_VARIABLE), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.var"), JetHighlightingColors.MUTABLE_VARIABLE), - new AttributesDescriptor("Local variable", JetHighlightingColors.LOCAL_VARIABLE), - new AttributesDescriptor("Parameter", JetHighlightingColors.PARAMETER), - new AttributesDescriptor("Closure or anonymous object bound variable", JetHighlightingColors.WRAPPED_INTO_REF), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.local.variable"), JetHighlightingColors.LOCAL_VARIABLE), + new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.parameter"), JetHighlightingColors.PARAMETER), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.bound.variable"), JetHighlightingColors.WRAPPED_INTO_REF), - new AttributesDescriptor("Instance property", JetHighlightingColors.INSTANCE_PROPERTY), - new AttributesDescriptor("Namespace property", JetHighlightingColors.NAMESPACE_PROPERTY), - new AttributesDescriptor("Property with backing field", JetHighlightingColors.PROPERTY_WITH_BACKING_FIELD), - new AttributesDescriptor("Property backing field access", JetHighlightingColors.BACKING_FIELD_ACCESS), - new AttributesDescriptor("Extension property", JetHighlightingColors.EXTENSION_PROPERTY), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.instance.property"), JetHighlightingColors.INSTANCE_PROPERTY), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.namespace.property"), JetHighlightingColors.NAMESPACE_PROPERTY), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.property.with.backing"), JetHighlightingColors.PROPERTY_WITH_BACKING_FIELD), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.backing.field.access"), JetHighlightingColors.BACKING_FIELD_ACCESS), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.extension.property"), JetHighlightingColors.EXTENSION_PROPERTY), - new AttributesDescriptor("Function literal default parameter", JetHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER), - new AttributesDescriptor("Function declaration", JetHighlightingColors.FUNCTION_DECLARATION), - new AttributesDescriptor("Function call", JetHighlightingColors.FUNCTION_CALL), - new AttributesDescriptor("Namespace function call", JetHighlightingColors.NAMESPACE_FUNCTION_CALL), - new AttributesDescriptor("Extension function call", JetHighlightingColors.EXTENSION_FUNCTION_CALL), - new AttributesDescriptor("Constructor call", JetHighlightingColors.CONSTRUCTOR_CALL), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.it"), JetHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.fun"), JetHighlightingColors.FUNCTION_DECLARATION), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.fun.call"), JetHighlightingColors.FUNCTION_CALL), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.namespace.fun.call"), JetHighlightingColors.NAMESPACE_FUNCTION_CALL), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.extension.fun.call"), JetHighlightingColors.EXTENSION_FUNCTION_CALL), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.constructor.call"), JetHighlightingColors.CONSTRUCTOR_CALL), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.bad.character"), JetHighlightingColors.BAD_CHARACTER), - new AttributesDescriptor("Automatically casted value", JetHighlightingColors.AUTO_CASTED_VALUE), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.auto.casted"), JetHighlightingColors.AUTO_CASTED_VALUE), - new AttributesDescriptor("Label", JetHighlightingColors.LABEL), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.label"), JetHighlightingColors.LABEL), }; }