diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties
index f946f436acf..1e62dcdce8e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties
@@ -65,6 +65,8 @@ options.kotlin.attribute.descriptor.string.escape=String//Escape in string and t
options.kotlin.attribute.descriptor.closure.braces=Braces and Operators//Lambda expression braces and arrow
options.kotlin.attribute.descriptor.safe.access=Braces and Operators//Safe access dot
options.kotlin.attribute.descriptor.arrow=Braces and Operators//Arrow
+options.kotlin.attribute.descriptor.colon=Braces and Operators//Colon
+options.kotlin.attribute.descriptor.double.colon=Braces and Operators//Double colon
options.kotlin.attribute.descriptor.kdoc.comment=Comments//KDoc//KDoc comment
options.kotlin.attribute.descriptor.kdoc.tag=Comments//KDoc//KDoc tag
options.kotlin.attribute.descriptor.kdoc.value=Comments//KDoc//Link in KDoc tag
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java
index 4d4b1d04e2f..ca4a4a87986 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java
@@ -70,6 +70,8 @@ public class KotlinHighlighter extends SyntaxHighlighterBase {
keys1.put(KtTokens.RBRACKET, KotlinHighlightingColors.BRACKETS);
keys1.put(KtTokens.COMMA, KotlinHighlightingColors.COMMA);
keys1.put(KtTokens.SEMICOLON, KotlinHighlightingColors.SEMICOLON);
+ keys1.put(KtTokens.COLON, KotlinHighlightingColors.COLON);
+ keys1.put(KtTokens.COLONCOLON, KotlinHighlightingColors.DOUBLE_COLON);
keys1.put(KtTokens.DOT, KotlinHighlightingColors.DOT);
keys1.put(KtTokens.ARROW, KotlinHighlightingColors.ARROW);
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
index 5c72dc5a2ec..c2a600a7bed 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
@@ -38,6 +38,8 @@ public class KotlinHighlightingColors {
public static final TextAttributesKey FUNCTION_LITERAL_BRACES_AND_ARROW = createTextAttributesKey("KOTLIN_FUNCTION_LITERAL_BRACES_AND_ARROW");
public static final TextAttributesKey COMMA = createTextAttributesKey("KOTLIN_COMMA", DefaultLanguageHighlighterColors.COMMA);
public static final TextAttributesKey SEMICOLON = createTextAttributesKey("KOTLIN_SEMICOLON", DefaultLanguageHighlighterColors.SEMICOLON);
+ public static final TextAttributesKey COLON = createTextAttributesKey("KOTLIN_COLON");
+ public static final TextAttributesKey DOUBLE_COLON = createTextAttributesKey("KOTLIN_DOUBLE_COLON");
public static final TextAttributesKey DOT = createTextAttributesKey("KOTLIN_DOT", DefaultLanguageHighlighterColors.DOT);
public static final TextAttributesKey SAFE_ACCESS = createTextAttributesKey("KOTLIN_SAFE_ACCESS", DefaultLanguageHighlighterColors.DOT);
public static final TextAttributesKey ARROW = createTextAttributesKey("KOTLIN_ARROW", PARENTHESIS);
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
index 5ddeda29285..7fb03ec491b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
@@ -58,6 +58,7 @@ class KotlinColorSettingsPage : ColorSettingsPage, RainbowColorSettingsPage {
}
dyn.dynamicCall()
dyn.dynamicProp = 5
+ val klass = MyClass::class
}
override fun hashCode(): Int {
@@ -123,6 +124,8 @@ var globalCounter