Update covscript plugin

Author: ice1000

build.gradle.kts

@@ -4,14 +4,14 @@ import java.nio.file.*
 import java.util.concurrent.*
 import java.util.stream.Collectors
 
-val kotlinVersion = "1.2.31"
+val kotlinVersion = "1.2.40"
 
 group = "org.covscript.devkt.lang"
-version = "v1.0-SNAPSHOT"
+version = "v1.0"
 
 plugins {
   java
-  kotlin("jvm") version "1.2.31"
+  kotlin("jvm") version "1.2.40"
 }
 
 java {

covscript-devkt.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="covscript-devkt" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="org.covscript.devkt.lang" external.system.module.version="1.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="covscript-devkt" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="org.covscript.devkt.lang" external.system.module.version="v1.0" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

res/icons/cov_big.png

@@ -0,0 +1,12 @@
+import os
+
+
+def do_svgo(path):
+    list = os.walk(path)
+    for root, dir, files in list:
+        for file in files:
+            if file[-3:] == "svg":
+                os.system('svgo ./%s' % (file))
+
+
+do_svgo("/home/hoshino/Projects/IntelliJ/Kotlin/covscript-intellij/res/icons/svgs")

res/icons/cov_big.svg

@@ -2,37 +2,40 @@ package org.covscript.devkt.lang
 
 import org.covscript.devkt.lang.psi.CovSymbol
 import org.covscript.devkt.lang.psi.CovTypes
-
-import org.ice1000.devkt.openapi.AnnotationHolder
-import org.ice1000.devkt.openapi.Annotator
-import org.ice1000.devkt.openapi.ColorScheme
-import org.ice1000.devkt.openapi.ExtendedDevKtLanguage
-import org.ice1000.devkt.openapi.SyntaxHighlighter
-
+import org.ice1000.devkt.openapi.*
+import org.ice1000.devkt.openapi.ui.IconLoader
 import org.jetbrains.kotlin.com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType
+import javax.swing.Icon
 
-class CovScriptSyntaxHighlighter<TextAttributes> : SyntaxHighlighter<TextAttributes> {
-	override fun attributesOf(type: IElementType, colorScheme: ColorScheme<TextAttributes>) = when (type) {
-		in CovTokenType.KEYWORDS_LIST -> colorScheme.keywords
-		in CovTokenType.COMMENTS -> colorScheme.lineComments
-		CovTypes.NUM -> colorScheme.numbers
-		CovTypes.STR, CovTypes.CHAR -> colorScheme.string
-		CovTypes.COLLAPSER_BEGIN, CovTypes.COLLAPSER_END -> colorScheme.typeParam
-		else -> null
-	}
-}
+class CovScript<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
+		CovLanguage.INSTANCE,
+		CovParserDefinition()) {
+	override fun satisfies(fileName: String) = fileName.endsWith(".csc") or fileName.endsWith(".csp")
+	override val lineCommentStart: String get() = "# "
+	override val icon: Icon = IconLoader.getIcon("/icons/csc.png")
 
-class CovScriptAnnotator<TextAttributes> : Annotator<TextAttributes> {
 	override fun annotate(
 			element: PsiElement,
 			document: AnnotationHolder<TextAttributes>,
 			colorScheme: ColorScheme<TextAttributes>) {
 		when (element) {
 			is CovSymbol -> symbol(element, document, colorScheme)
+			else -> super.annotate(element, document, colorScheme)
 		}
 	}
 
+	override fun attributesOf(type: IElementType, colorScheme: ColorScheme<TextAttributes>) = when (type) {
+		in CovTokenType.KEYWORDS_LIST -> colorScheme.keywords
+		in CovTokenType.OPERATOR_LIST -> colorScheme.operators
+		in CovTokenType.COMMENTS -> colorScheme.lineComments
+		CovTypes.NUM -> colorScheme.numbers
+		CovTypes.STR -> colorScheme.string
+		CovTypes.CHAR -> colorScheme.charLiteral
+		CovTypes.COLLAPSER_BEGIN, CovTypes.COLLAPSER_END -> colorScheme.typeParam
+		else -> super.attributesOf(type, colorScheme)
+	}
+
 	private fun symbol(
 			element: CovSymbol,
 			document: AnnotationHolder<TextAttributes>,
@@ -43,12 +46,3 @@ class CovScriptAnnotator<TextAttributes> : Annotator<TextAttributes> {
 		}
 	}
 }
-
-class CovScript<TextAttributes> : ExtendedDevKtLanguage<TextAttributes>(
-		CovLanguage.INSTANCE,
-		CovParserDefinition()),
-		Annotator<TextAttributes> by CovScriptAnnotator(),
-		SyntaxHighlighter<TextAttributes> by CovScriptSyntaxHighlighter() {
-	override fun satisfies(fileName: String) = fileName.endsWith(".csc") or fileName.endsWith(".csp")
-	override val lineCommentStart: String get() = "# "
-}