From 8f6e6065ff7d30a85b22c7a4e29132629a55f7eb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 2 Apr 2012 21:52:51 +0400 Subject: [PATCH] Added markup in settings page sample. --- .../highlighter/JetColorSettingsPage.java | 51 ++++++++++++------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java index 58d0cb2324c..8e80f0f4016 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java @@ -27,7 +27,9 @@ import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIconProvider; import javax.swing.*; -import java.util.Collections; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.HashMap; import java.util.Map; public class JetColorSettingsPage implements ColorSettingsPage { @@ -46,41 +48,52 @@ public class JetColorSettingsPage implements ColorSettingsPage { @Override public String getDemoText() { return "/* Block comment */\n" + - "import kotlin.util.* // line comment\n" + + "import kotlin.util.* // line comment\n" + "\n" + " Bad character: \\n\n" + "/**\n" + " * Doc comment here for `SomeClass`\n" + " * @see Iterator#next()\n" + " */\n" + - "[Deprecated]\n" + - "public class MyClass>(var prop1 : Int) {\n" + - " fun foo(nullable : String?, r : Runnable, f : () -> Int) {\n" + - " println(\"length is ${nullable?.length} \\e\")\n" + - " val ints = java.util.ArrayList(2)\n" + - " ints[0] = 102 + f()\n" + - " var ref = ints.size()\n" + - " if (!ints.empty) {\n" + - " ints.forEach @lit {\n" + - " if (it == null) return @lit\n" + - " println(it + ref)\n" + - " }\n" + + "[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" + + " val ints = java.util.ArrayList(2)\n" + + " ints[0] = 102 + f()\n" + + " var ref = ints.size()\n" + + " if (!ints.empty) {\n" + + " ints.forEach @lit {\n" + + " if (it == null) return @lit\n" + + " println(it + ref)\n" + + " }\n" + " }\n" + " }\n" + "}\n" + "\n" + - "var globalCounter : Int = 5\n" + - "get() {\n" + - " return $globalCounter\n" + + "var globalCounter : Int = 5\n" + + "get() {\n" + + " return $globalCounter\n" + "}\n" + "\n" + - "public abstract class Abstract {\n" + + "public abstract class Abstract {\n" + "}"; } @Override public Map getAdditionalHighlightingTagToDescriptorMap() { - return Collections.emptyMap(); + Map map = new HashMap(); + for (Field field : JetHighlightingColors.class.getFields()) { + if (Modifier.isStatic(field.getModifiers())) { + try { + map.put(field.getName(), (TextAttributesKey) field.get(null)); + } + catch (IllegalAccessException e) { + assert false; + } + } + } + return map; } @NotNull