Resolved the schema config

kcl-lang · Aug 20, 2024 · f062bcb · f062bcb
1 parent 2aa8074
commit f062bcb
Show file tree

Hide file tree

Showing 5 changed files with 164,719 additions and 159,818 deletions.
diff --git a/grammar.js b/grammar.js
@@ -876,10 +876,14 @@ module.exports = grammar({
       field('attribute', $.identifier),
     )),
 
-    optional_attribute_declaration: $ => prec(2, seq(
+    optional_attribute_declaration: $ => prec.right(12, seq(
       field('attribute', $.identifier),
       '?:',
       field('type', $.type),
+      optional(seq(
+        '=',
+        field('default', $.expression)
+      ))
     )),
 
     optional_item: $ => prec(PREC.call, seq(

diff --git a/src/grammar.json b/src/grammar.json
@@ -3542,8 +3542,8 @@
       }
     },
     "optional_attribute_declaration": {
-      "type": "PREC",
-      "value": 2,
+      "type": "PREC_RIGHT",
+      "value": 12,
       "content": {
         "type": "SEQ",
         "members": [
@@ -3566,6 +3566,31 @@
               "type": "SYMBOL",
               "name": "type"
             }
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "="
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "default",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "expression"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
           }
         ]
       }

diff --git a/src/node-types.json b/src/node-types.json
@@ -1836,6 +1836,16 @@
           }
         ]
       },
+      "default": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      },
       "type": {
         "multiple": false,
         "required": true,