Finished, release v1.0

Author: ice1000

build.gradle.kts

@@ -4,7 +4,7 @@ import java.io.*
 val kotlinVersion = "1.2.31"
 
 group = "org.intellij.clojure.devkt"
-version = "v1.0-SNAPSHOT"
+version = "v1.0"
 
 plugins {
   java

src/org/intellij/clojure/devkt/clojure-devkt.kt

@@ -37,8 +37,8 @@ class Clojure<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
 		C_NUMBER, C_HEXNUM, C_RDXNUM, C_RATIO -> colorScheme.numbers
 		C_BOOL -> colorScheme.keywords
 		C_NIL -> colorScheme.keywords
-		C_DOT, C_DOTDASH -> colorScheme.keywords
-		C_COLONCOLON -> colorScheme.keywords
+		C_DOT, C_DOTDASH -> colorScheme.colon
+		C_COLONCOLON -> colorScheme.colon
 		C_COLON -> colorScheme.colon
 		C_SYM -> colorScheme.identifiers
 		C_COMMA -> colorScheme.comma
@@ -55,8 +55,8 @@ class Clojure<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
 		C_BRACKET1, C_BRACKET2 -> colorScheme.brackets
 		ClojureHighlightingLexer.CALLABLE -> colorScheme.keywords
 		ClojureHighlightingLexer.KEYWORD -> colorScheme.keywords
-		ClojureHighlightingLexer.CALLABLE_KEYWORD -> colorScheme.keywords
-		ClojureHighlightingLexer.QUOTED_SYM -> colorScheme.string
+		ClojureHighlightingLexer.CALLABLE_KEYWORD -> colorScheme.annotations
+		ClojureHighlightingLexer.QUOTED_SYM -> colorScheme.macro
 		else -> null
 	}
 

src/org/intellij/clojure/devkt/lang/clojure-parser.kt

@@ -61,7 +61,9 @@ class ClojureHighlightingLexer(language: Language) : LookAheadLexer(ClojureLexer
 			C_SHARP -> {
 				baseLexer.advance()
 				when (baseLexer.tokenType) {
-					C_STRING, C_PAREN1, C_BRACE1 -> advanceAs(baseLexer, baseLexer.tokenType)
+					C_STRING,
+					C_PAREN1,
+					C_BRACE1 -> advanceAs(baseLexer, baseLexer.tokenType)
 					else -> addToken(baseLexer.tokenStart, C_SHARP)
 				}
 			}
@@ -71,7 +73,8 @@ class ClojureHighlightingLexer(language: Language) : LookAheadLexer(ClojureLexer
 				if (baseLexer.tokenType === C_SYM) advanceSymbolAs(baseLexer, QUOTED_SYM)
 				else advanceLexer(baseLexer)
 			}
-			C_COLON, C_COLONCOLON -> {
+			C_COLON,
+			C_COLONCOLON -> {
 				advanceAs(baseLexer, tokenType0)
 				if (baseLexer.tokenType === C_SYM) {
 					advanceAs(baseLexer, KEYWORD)
@@ -82,7 +85,10 @@ class ClojureHighlightingLexer(language: Language) : LookAheadLexer(ClojureLexer
 			C_PAREN1 -> {
 				advanceAs(baseLexer, tokenType0)
 				skipWs(baseLexer)
-				val callableType = if (baseLexer.tokenType.let { it == C_COLON || it == C_COLONCOLON }) CALLABLE_KEYWORD else CALLABLE
+				val callableType = when {
+					baseLexer.tokenType.let { it == C_COLON || it == C_COLONCOLON } -> CALLABLE_KEYWORD
+					else -> CALLABLE
+				}
 				advanceSymbolAs(baseLexer, callableType)
 			}
 			else -> super.lookAhead(baseLexer)