Add lexer processing

Author: ice1000

.gitignore

@@ -1,21 +1,5 @@
-otspot.xml
-hs_err_pid*
-*.class
-*.log
-*.ctxt
 *.jar
-*.war
-*.ear
-*.zip
-*.tar.gz
-*.rar
-cmake-build-debug/
-cmake-build-release/
-out/
 .gradle
 build
-.build-cache
-config.properties
 .idea
-!lib/dev-kt-v1.3-SNAPSHOT.jar
 !gradle/wrapper/gradle-wrapper.jar

build.gradle.kts

@@ -1,9 +1,9 @@
 import java.io.*
 
-val kotlinVersion = "1.2.31"
+val kotlinVersion = "1.2.40"
 
 group = "com.intellij.devkt.json"
-version = "v1.0-SNAPSHOT"
+version = "v1.0"
 
 plugins { java }
 
@@ -22,10 +22,13 @@ java.sourceSets {
 repositories {
 	mavenCentral()
 	jcenter()
+	maven("https://jitpack.io")
 }
 
 dependencies {
 	compileOnly(kotlin("compiler-embeddable", kotlinVersion))
-	compileOnly(files(*File("lib").listFiles()))
+	val version = "5a71725385"
+	compileOnly(group = "com.github.ice1000.dev-kt", name = "common", version = version)
+	runtime(group = "com.github.ice1000.dev-kt", name = "swing", version = version)
 }
 

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

@@ -4,6 +4,10 @@
 import org.ice1000.devkt.openapi.ExtendedDevKtLanguage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.com.intellij.lexer.LayeredLexer;
+import org.jetbrains.kotlin.com.intellij.lexer.Lexer;
+import org.jetbrains.kotlin.com.intellij.lexer.StringLiteralLexer;
+import org.jetbrains.kotlin.com.intellij.openapi.project.Project;
 import org.jetbrains.kotlin.com.intellij.psi.StringEscapesTokenTypes;
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType;
 
@@ -17,8 +21,7 @@ public String getLineCommentStart() {
 	}
 
 	@Override
-	public @NotNull
-	Icon getIcon() {
+	public @NotNull Icon getIcon() {
 		return JsonFileType.INSTANCE.getIcon();
 	}
 
@@ -27,19 +30,37 @@ public Json() {
 	}
 
 	@Override
-	public boolean satisfies(String fileName) {
+	public boolean satisfies(@NotNull String fileName) {
 		return fileName.endsWith(".json") || fileName.equals(".pinpoint");
 	}
 
+	public @NotNull Lexer createLexer(@NotNull Project project) {
+		LayeredLexer layeredLexer = new LayeredLexer(new JsonLexer());
+		layeredLexer.registerSelfStoppingLayer(new StringLiteralLexer('\"',
+				JsonElementTypes.DOUBLE_QUOTED_STRING,
+				false,
+				"/",
+				false,
+				false), new IElementType[]{JsonElementTypes.DOUBLE_QUOTED_STRING}, IElementType.EMPTY_ARRAY);
+		layeredLexer.registerSelfStoppingLayer(new StringLiteralLexer('\'',
+				JsonElementTypes.SINGLE_QUOTED_STRING,
+				false,
+				"/",
+				false,
+				false), new IElementType[]{JsonElementTypes.SINGLE_QUOTED_STRING}, IElementType.EMPTY_ARRAY);
+		return layeredLexer;
+	}
+
 	@Override
-	public @Nullable
-	T attributesOf(IElementType iElementType, ColorScheme<? extends T> colorScheme) {
+	public @Nullable T attributesOf(@NotNull IElementType iElementType, @NotNull ColorScheme<? extends T> colorScheme) {
 		if (iElementType == JsonElementTypes.LINE_COMMENT) return colorScheme.getLineComments();
 		else if (iElementType == JsonElementTypes.BLOCK_COMMENT) return colorScheme.getBlockComments();
 		else if (iElementType == JsonElementTypes.NUMBER) return colorScheme.getNumbers();
 		else if (iElementType == JsonElementTypes.SINGLE_QUOTED_STRING) return colorScheme.getString();
 		else if (iElementType == JsonElementTypes.DOUBLE_QUOTED_STRING) return colorScheme.getProperty();
 		else if (iElementType == StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN) return colorScheme.getStringEscape();
+		else if (iElementType == StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN) return colorScheme.getUnknown();
+		else if (iElementType == StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN) return colorScheme.getUnknown();
 		else if (iElementType == JsonElementTypes.IDENTIFIER) return colorScheme.getIdentifiers();
 		else if (iElementType == JsonElementTypes.COLON) return colorScheme.getColon();
 		else if (iElementType == JsonElementTypes.COMMA) return colorScheme.getComma();