feat: support grammar more

Author: xepozz

src/main/kotlin/com/github/xepozz/toon/language/ToonAnnotator.kt

@@ -20,10 +20,10 @@ class ToonAnnotator : Annotator {
             }
 
             is ToonValue -> {
-                holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
-                    .range(element.textRange)
-                    .textAttributes(VALUE_HIGHLIGHT)
-                    .create()
+//                holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
+//                    .range(element.textRange)
+//                    .textAttributes(VALUE_HIGHLIGHT)
+//                    .create()
             }
         }
     }

src/main/kotlin/com/github/xepozz/toon/language/ToonSyntaxHighlighter.kt

@@ -13,6 +13,7 @@ class ToonSyntaxHighlighter : SyntaxHighlighterBase() {
     override fun getHighlightingLexer() = ToonLexerAdapter()
 
     override fun getTokenHighlights(tokenType: IElementType) = when (tokenType) {
+        ToonTypes.TEXT -> STRING_KEYS
         ToonTypes.NUMBER -> NUMBER_KEYS
         ToonTypes.TRUE -> CONSTANT_KEYS
         ToonTypes.FALSE -> CONSTANT_KEYS
@@ -36,6 +37,9 @@ class ToonSyntaxHighlighter : SyntaxHighlighterBase() {
         private val NUMBER_KEYS = arrayOf(
             DefaultLanguageHighlighterColors.NUMBER
         )
+        private val STRING_KEYS = arrayOf(
+            DefaultLanguageHighlighterColors.STRING
+        )
         private val EMPTY_KEYS = emptyArray<TextAttributesKey>()
     }
 }

src/main/kotlin/com/github/xepozz/toon/language/parser/Toon.bnf

@@ -21,20 +21,37 @@
 
 file ::= entry*
 
-private entry ::= table | keyValueList | COMMENT | EOL
+private entry ::= table | keyValueMap | COMMENT | EOL
 
-table ::= tableDefinition DELIMITER iterable?
+table ::= tableDefinition DELIMITER (iterable | EOL array)
+{
+    pin=2
+}
+
+tableDefinition ::= key LBRACKET '#'? NUMBER RBRACKET (LBRACE iterable RBRACE)?
+{
+    pin=2
+}
 
-tableDefinition ::= key LBRACKET NUMBER RBRACKET (LBRACE iterable RBRACE)?
+array ::= keyValueArray+ | keyValueMap+ | valuesList
 
-keyValueList ::= key DELIMITER iterable?
+valuesList ::= iterable (EOL iterable)*
+
+keyValueArray ::= keyValueArrayItem (EOL keyValueArrayItem)*
+
+keyValueArrayItem ::= DASH (keyValueMap | iterable)
 {
     pin=1
 }
 
+keyValueMap ::= key DELIMITER (iterable | EOL array)
+{
+    pin=2
+}
+
 key ::= TEXT
 
-iterable ::= value (COMMA value)+
+iterable ::= value (COMMA value)*
 
 value ::= TEXT | NULL | FALSE | TRUE | NUMBER
 {

src/main/kotlin/com/github/xepozz/toon/language/parser/Toon.flex

@@ -25,7 +25,7 @@ NUMBER=[\d]+(.[\d]+)?
 
 <YYINITIAL> {
     #[^\n]*       { return ToonTypes.COMMENT; }
-    ([\w-]+)      { return ToonTypes.TEXT; }
+    ([\w]+)      { return ToonTypes.TEXT; }
     ":"           { yybegin(VALUE); return ToonTypes.DELIMITER; }
     "["           { yybegin(TABLE_SIZE); return ToonTypes.LBRACKET; }
 }
@@ -54,5 +54,6 @@ NUMBER=[\d]+(.[\d]+)?
 ")"                     { return ToonTypes.RPAREN; }
 "["                     { return ToonTypes.LBRACKET; }
 "]"                     { return ToonTypes.RBRACKET; }
+"-"                     { return ToonTypes.DASH; }
 {WHITESPACE}            { return TokenType.WHITE_SPACE; }
 {NEWLINE}               { yybegin(YYINITIAL); return ToonTypes.EOL; }