Update highlighter

Author: ice1000

README.md

@@ -1,6 +1,6 @@
 # Clojure-Kit DevKt
 
-This is the devkt version of [Clojure-Kit](https://github.com/gregsh/Clojure-Kit).
+This is the DevKt version of [Clojure-Kit](https://github.com/gregsh/Clojure-Kit).
 
 # Build
 

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

@@ -2,7 +2,9 @@ package org.intellij.clojure.devkt
 
 import org.ice1000.devkt.openapi.*
 import org.intellij.clojure.devkt.lang.*
+import org.intellij.clojure.devkt.psi.*
 import org.intellij.clojure.devkt.psi.ClojureTypes.*
+import org.intellij.clojure.devkt.util.*
 import org.jetbrains.kotlin.com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType
 
@@ -16,6 +18,11 @@ class Clojure<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
 			fileName.endsWith(".cljs") ||
 			fileName.endsWith(".cljc")
 
+	/**
+	 * @param type IElementType
+	 * @param colorScheme ColorScheme<TextAttributes>
+	 * @return TextAttributes?
+	 */
 	override fun attributesOf(type: IElementType, colorScheme: ColorScheme<TextAttributes>) = when (type) {
 		ClojureTokens.LINE_COMMENT -> colorScheme.lineComments
 		C_STRING -> colorScheme.string
@@ -33,16 +40,38 @@ class Clojure<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
 		C_QUOTE -> colorScheme.string
 		C_TILDE, C_TILDE_AT -> colorScheme.operators
 		C_AT -> colorScheme.operators
-		// C_HAT, C_SHARP_HAT -> colorScheme.metadata
-		// C_SHARP, C_SHARP_COMMENT, C_SHARP_EQ, C_SHARP_NS -> pack(ClojureColors.READER_MACRO)
-		// C_SHARP_QMARK, C_SHARP_QMARK_AT, C_SHARP_QUOTE -> pack(ClojureColors.READER_MACRO)
+	// C_HAT, C_SHARP_HAT -> colorScheme.metadata
+	// C_SHARP, C_SHARP_COMMENT, C_SHARP_EQ, C_SHARP_NS -> pack(ClojureColors.READER_MACRO)
+	// C_SHARP_QMARK, C_SHARP_QMARK_AT, C_SHARP_QUOTE -> pack(ClojureColors.READER_MACRO)
 		C_PAREN1, C_PAREN2 -> colorScheme.parentheses
 		C_BRACE1, C_BRACE2 -> colorScheme.braces
 		C_BRACKET1, C_BRACKET2 -> colorScheme.brackets
 		else -> null
 	}
 
-	override fun annotate(element: PsiElement, document: AnnotationHolder<TextAttributes>, colorScheme: ColorScheme<TextAttributes>) {
-		// TODO
+	/**
+	 * @param element PsiElement
+	 * @param document AnnotationHolder<TextAttributes>
+	 * @param colorScheme ColorScheme<TextAttributes>
+	 */
+	override fun annotate(
+			element: PsiElement,
+			document: AnnotationHolder<TextAttributes>,
+			colorScheme: ColorScheme<TextAttributes>) {
+		val callable = element is CSForm && element.parentForm.let {
+			it is CList && it.firstForm == element && it.iterate(CReaderMacro::class).isEmpty
+		}
+		if (callable) document.highlight(element.valueRange, colorScheme.keywords)
+		when (element) {
+			is CMetadata -> {
+				element.firstForm.let {
+					/// if (it is CSymbol) document.highlight(it, null)
+					// TODO metadata
+				}
+			}
+		}
+		if (element is CForm && element.iterate(CReaderMacro::class)
+						.find { it.firstChild.elementType == ClojureTypes.C_SHARP_COMMENT } != null)
+			document.highlight(element, colorScheme.docComments)
 	}
 }

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

@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.com.intellij.lang.parser.GeneratedParserUtilBase
 import org.jetbrains.kotlin.com.intellij.lexer.FlexAdapter
 import org.jetbrains.kotlin.com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.com.intellij.psi.FileViewProvider
-import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.CompositeElement
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType
 import org.jetbrains.kotlin.com.intellij.psi.tree.TokenSet
 
@@ -82,26 +81,20 @@ class ClojureParserUtil {
 
 		@JvmStatic
 		fun nospace(b: PsiBuilder, l: Int): Boolean {
-			if (space(b, l)) {
-				b.mark().apply { b.tokenType; error("no <whitespace> allowed") }
-						.setCustomEdgeTokenBinders(WhitespacesBinders.GREEDY_LEFT_BINDER, WhitespacesBinders.GREEDY_RIGHT_BINDER)
-			}
+			if (space(b, l)) b.mark().apply { b.tokenType; error("no <whitespace> allowed") }
+					.setCustomEdgeTokenBinders(WhitespacesBinders.GREEDY_LEFT_BINDER, WhitespacesBinders.GREEDY_RIGHT_BINDER)
 			return true
 		}
 
-		@JvmStatic
-		fun space(b: PsiBuilder, l: Int): Boolean {
-			return b.rawLookup(0).wsOrComment() || b.rawLookup(-1).wsOrComment()
-		}
-
 		private val RECOVER_SET = TokenSet.orSet(
 				ClojureTokens.SHARPS, ClojureTokens.MACROS, ClojureTokens.PAREN_ALIKE, ClojureTokens.LITERALS,
 				TokenSet.create(C_DOT, C_DOTDASH))
 
 		@JvmStatic
-		fun formRecover(b: PsiBuilder, l: Int): Boolean {
-			return !RECOVER_SET.contains(b.tokenType)
-		}
+		fun space(b: PsiBuilder, l: Int) = b.rawLookup(0).wsOrComment() or b.rawLookup(-1).wsOrComment()
+
+		@JvmStatic
+		fun formRecover(b: PsiBuilder, l: Int) = b.tokenType !in RECOVER_SET
 
 		@JvmStatic
 		fun rootFormRecover(b: PsiBuilder, l: Int): Boolean {