Migrate to new APIs

Author: ice1000

lib/dev-kt-v1.3-SNAPSHOT.jar

@@ -5,6 +5,8 @@ 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.lexer.Lexer
+import org.jetbrains.kotlin.com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.com.intellij.psi.PsiErrorElement
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType
@@ -19,6 +21,10 @@ class Clojure<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
 			fileName.endsWith(".cljs") ||
 			fileName.endsWith(".cljc")
 
+	override fun createLexer(project: Project): Lexer {
+		return ClojureHighlightingLexer(ClojureLanguage)
+	}
+
 	/**
 	 * @param type IElementType
 	 * @param colorScheme ColorScheme<TextAttributes>
@@ -41,16 +47,16 @@ 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 -> colorScheme.macro
+		C_SHARP_QMARK, C_SHARP_QMARK_AT, C_SHARP_QUOTE -> colorScheme.macro
 		C_PAREN1, C_PAREN2 -> colorScheme.parentheses
 		C_BRACE1, C_BRACE2 -> colorScheme.braces
 		C_BRACKET1, C_BRACKET2 -> colorScheme.brackets
-	// ClojureHighlightingLexer.CALLABLE -> pack(ClojureColors.CALLABLE)
-		C_KEYWORD -> colorScheme.keywords
-	// ClojureHighlightingLexer.CALLABLE_KEYWORD -> pack(ClojureColors.CALLABLE, ClojureColors.KEYWORD)
-	// ClojureHighlightingLexer.QUOTED_SYM -> pack(ClojureColors.QUOTED_SYM)
+		ClojureHighlightingLexer.CALLABLE -> colorScheme.keywords
+		ClojureHighlightingLexer.KEYWORD -> colorScheme.keywords
+		ClojureHighlightingLexer.CALLABLE_KEYWORD -> colorScheme.keywords
+		ClojureHighlightingLexer.QUOTED_SYM -> colorScheme.string
 		else -> null
 	}
 
@@ -69,11 +75,8 @@ class Clojure<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
 		if (callable) document.highlight(element.valueRange, colorScheme.keywords)
 		when (element) {
 			is PsiErrorElement -> document.highlight(element, colorScheme.unknown)
-			is CMetadata -> {
-				element.firstForm.let {
-					/// if (it is CSymbol) document.highlight(it, null)
-					// TODO metadata
-				}
+			is CMetadata -> element.firstForm.let {
+				if (it is CSymbol) document.highlight(it, colorScheme.metaData)
 			}
 		}
 		if (element is CForm && element.iterate(CReaderMacro::class)

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

@@ -24,7 +24,7 @@ import org.intellij.clojure.devkt.psi.ClojureTypes.*
 import org.intellij.clojure.devkt.util.wsOrComment
 import org.jetbrains.kotlin.com.intellij.lang.*
 import org.jetbrains.kotlin.com.intellij.lang.parser.GeneratedParserUtilBase
-import org.jetbrains.kotlin.com.intellij.lexer.FlexAdapter
+import org.jetbrains.kotlin.com.intellij.lexer.*
 import org.jetbrains.kotlin.com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.com.intellij.psi.FileViewProvider
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType
@@ -39,6 +39,69 @@ object ClojureParserDefinition : ClojureParserDefinitionBase() {
 	override fun getFileNodeType() = ClojureTokens.CLJ_FILE_TYPE
 }
 
+class ClojureHighlightingLexer(language: Language) : LookAheadLexer(ClojureLexer(language)) {
+	companion object {
+		val CALLABLE = IElementType("C_CALLABLE*", ClojureLanguage)
+		val KEYWORD = IElementType("C_KEYWORD*", ClojureLanguage)
+		val CALLABLE_KEYWORD = IElementType("C_CALLABLE_KEYWORD*", ClojureLanguage)
+		val QUOTED_SYM = IElementType("C_QUOTED_SYM*", ClojureLanguage)
+	}
+
+	override fun lookAhead(baseLexer: Lexer) {
+		fun skipWs(l: Lexer) {
+			while (l.tokenType.let {
+						ClojureTokens.WHITESPACES.contains(it) ||
+								ClojureTokens.COMMENTS.contains(it)
+					}) advanceLexer(l)
+		}
+
+		val tokenType0 = baseLexer.tokenType
+
+		when (tokenType0) {
+			C_SHARP -> {
+				baseLexer.advance()
+				when (baseLexer.tokenType) {
+					C_STRING, C_PAREN1, C_BRACE1 -> advanceAs(baseLexer, baseLexer.tokenType)
+					else -> addToken(baseLexer.tokenStart, C_SHARP)
+				}
+			}
+			C_QUOTE -> {
+				advanceAs(baseLexer, tokenType0)
+				skipWs(baseLexer)
+				if (baseLexer.tokenType === C_SYM) advanceSymbolAs(baseLexer, QUOTED_SYM)
+				else advanceLexer(baseLexer)
+			}
+			C_COLON, C_COLONCOLON -> {
+				advanceAs(baseLexer, tokenType0)
+				if (baseLexer.tokenType === C_SYM) {
+					advanceAs(baseLexer, KEYWORD)
+					if (baseLexer.tokenType === C_SLASH) advanceAs(baseLexer, KEYWORD)
+					if (baseLexer.tokenType === C_SYM) advanceAs(baseLexer, KEYWORD)
+				}
+			}
+			C_PAREN1 -> {
+				advanceAs(baseLexer, tokenType0)
+				skipWs(baseLexer)
+				val callableType = if (baseLexer.tokenType.let { it == C_COLON || it == C_COLONCOLON }) CALLABLE_KEYWORD else CALLABLE
+				advanceSymbolAs(baseLexer, callableType)
+			}
+			else -> super.lookAhead(baseLexer)
+		}
+	}
+
+	private fun advanceSymbolAs(baseLexer: Lexer, type: IElementType) {
+		w@ while (true) {
+			val tokenType = baseLexer.tokenType
+			when (tokenType) {
+				C_DOT, C_DOTDASH -> advanceAs(baseLexer, tokenType)
+				C_SLASH, C_SYM -> advanceAs(baseLexer, type)
+				C_COLON, C_COLONCOLON -> advanceAs(baseLexer, type)
+				else -> break@w
+			}
+		}
+	}
+}
+
 abstract class ClojureParserDefinitionBase : ParserDefinition {
 
 	override fun createLexer(project: Project?) = ClojureLexer(fileNodeType.language)