Fix GDScript string highlighting and stuff

Author: sockeye-d

core/src/main/kotlin/dev/fishies/coho/core/highlighting/Gdscript.kt

@@ -54,8 +54,8 @@ private val variantTypes = listOf(
 fun createGdscriptGrammar() = grammar(
     "gdscript",
     token("comment", pattern(compile("#.*\\n"))),
-    token("double-quote-string", pattern(compile("r?\"(?:[^\"\\\\]|\\\\.)*+\""), false, true, "string")),
-    token("single-quote-string", pattern(compile("r?\'(?:[^\'\\\\]|\\\\.)*+\'"), false, true, "string")),
+    token("double-quote-string", pattern(compile("&?\\^?r?\"(?:[^\"\\\\]|\\\\.)*+\""), false, true, "string")),
+    token("single-quote-string", pattern(compile("&?\\^?r?\'(?:[^\'\\\\]|\\\\.)*+\'"), false, true, "string")),
     token("triple-double-quote-string", pattern(compile("r?(\"{3,}).*?\\1"), false, true, "string")),
     token("triple-single-quote-string", pattern(compile("r?(\'{3,}).*?\\1"), false, true, "string")),
     token("annotation", pattern(compile("@$identifier"), false, true)),
@@ -66,7 +66,7 @@ fun createGdscriptGrammar() = grammar(
     ),
     token(
         "number",
-        pattern(compile("-?(?:0x(?:[0-9a-fA-F]_?)+|0b(?:[01]_?)+|(?:(?:[0-9]_?)*\\.(?:[0-9]_?)+)(?:e-?(?:[0-9]_?)+)?|(?:[0-9]_?)+\\.?(?:e-?(?:[0-9]_?)+)?)"))
+        pattern(compile("-?(?:0[xX](?:[0-9a-fA-F]_?)+|0[bB](?:[01]_?)+|(?:[0-9]_?)*\\.(?:[0-9]_?)+(?:[eE]-?(?:[0-9]_?)+)?|(?:[0-9]_?)+\\.?(?:[eE]-?(?:[0-9]_?)+)?)"))
     ),
     token("operator", pattern(compile("=|\\+=|-=|\\*\\*=|\\*=|/=|%=|&=|\\^=|<<=|>>=|:\\s*=|->"))),
     token(

core/src/main/kotlin/dev/fishies/coho/core/highlighting/Ini.kt

@@ -6,11 +6,25 @@ import io.noties.prism4j.Prism4j.token
 import java.util.regex.Pattern.MULTILINE
 import java.util.regex.Pattern.compile
 
+private val variantTypes = listOf(
+    "int",
+    "bool",
+    "float",
+    "void",
+).sortedBy { it.length }.joinToString("|")
+
 fun createIniGrammar() = grammar(
     "ini",
     token("comment", pattern(compile(";.*\\n"))),
     token("property", pattern(compile("^.+?(?==)", MULTILINE))),
     token("class-name", pattern(compile("^\\[.+\\]$", MULTILINE))),
-    token("string", pattern(compile("\"(?:[^\"\\\\]|\\\\.)*+\""))),
-    token("punctuation", pattern(compile("[={}\\[\\],:]"))),
+    token("string", pattern(compile("&?\\^?\"(?:[^\"\\\\]|\\\\.)*+\""))),
+    token("boolean", pattern(compile("true|false"))),
+    token(
+        "number",
+        pattern(compile("-?(?:0[xX](?:[0-9a-fA-F]_?)+|0[bB](?:[01]_?)+|(?:[0-9]_?)*\\.(?:[0-9]_?)+(?:[eE]-?(?:[0-9]_?)+)?|(?:[0-9]_?)+\\.?(?:[eE]-?(?:[0-9]_?)+)?)"))
+    ),
+    token("pascal-class-name", pattern(compile("\\b[A-Z][a-zA-Z0-9_]*\\b"), false, true, "class-name")),
+    token("variant-class-name", pattern(compile("\\b(?:$variantTypes)\\b"), false, true, "class-name")),
+    token("punctuation", pattern(compile("[=,:{}\\[\\]()]"))),
 )