diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index 069e63bcb23..cf854a3e94c 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -52,6 +52,7 @@ macro.fun.anonymousSuper=anonymousSuper() change.visibility.modifier=Change visibility modifier options.jet.attribute.descriptor.builtin.annotation=Built-in annotation +options.jet.attribute.descriptor.string.escape=Valid escape in string and template braces options.jet.attribute.descriptor.closure.braces=Function literal braces and arrow options.jet.attribute.descriptor.safe.access=Safe access dot options.jet.attribute.descriptor.arrow=Arrow diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java index 965dde39577..f7f9cc2fdc4 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java @@ -58,7 +58,7 @@ public class JetColorSettingsPage implements ColorSettingsPage { "[Deprecated]\n" + "public class MyClass<out T : Iterable<T>>(var prop1 : Int) {\n" + " fun foo(nullable : String?, r : Runnable, f : () -> Int) {\n" + - " println(\"length is ${nullable?.length} \\e\")\n" + + " println(\"length\\nis ${nullable?.length} \\e\")\n" + " val ints = java.util.ArrayList(2)\n" + " ints[0] = 102 + f()\n" + " val myFun = { -> \"\" }\n" + @@ -107,7 +107,7 @@ public class JetColorSettingsPage implements ColorSettingsPage { new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.number"), JetHighlightingColors.NUMBER), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.string"), JetHighlightingColors.STRING), - new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.valid.escape.in.string"), JetHighlightingColors.VALID_STRING_ESCAPE), + new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.string.escape"), JetHighlightingColors.VALID_STRING_ESCAPE), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.invalid.escape.in.string"), JetHighlightingColors.INVALID_STRING_ESCAPE), new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.operator.sign"), JetHighlightingColors.OPERATOR_SIGN),