fixed parsing of companion object refs #38

kotlinx · May 11, 2021 · 763bb49 · 763bb49
1 parent bdfd629
commit 763bb49
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/common/src/commonMain/kotlin/kotlinx/ast/common/klass/Klass.kt b/common/src/commonMain/kotlin/kotlinx/ast/common/klass/Klass.kt
@@ -274,6 +274,7 @@ private val klassDeclarationKeywords: Map<String, String> = mapOf(
     "VAL" to "val",
     "CLASS" to "class",
     "INTERFACE" to "interface",
+    "COMPANION" to "companion object",
     "OBJECT" to "object",
     "primaryConstructor" to "constructor",
     "valueArgument" to "argument",

diff --git a/...n/src/commonMain/kotlin/kotlinx/ast/grammar/kotlin/common/summary/KotlinTreeMapBuilder.kt b/...n/src/commonMain/kotlin/kotlinx/ast/grammar/kotlin/common/summary/KotlinTreeMapBuilder.kt
@@ -344,6 +344,19 @@ val kotlinTreeMapBuilder = TreeMapBuilder<KotlinTreeMapState>()
 //     (NL* COLON NL* delegationSpecifiers)?
 //     (NL* classBody)?
 //     ;
+    .convert(
+        filter = byDescription("companionObject")
+    ) { node: AstNode ->
+        toKlassDeclaration(node) { ast ->
+            astContinue(
+                ast.filter(
+                    setOf(
+                        "classBody",
+                    )
+                )
+            )
+        }.toAstList()
+    }
 
 // functionValueParameters
 //     : LPAREN NL* (functionValueParameter (NL* COMMA NL* functionValueParameter)* (NL* COMMA)?)? NL* RPAREN