fix declaration bug.

victorhqc · Sep 19, 2019 · eaf6eb9 · eaf6eb9
1 parent 85dca95
commit eaf6eb9
Show file tree

Hide file tree

Showing 5 changed files with 4,347 additions and 6,053 deletions.
diff --git a/corpus/model.txt b/corpus/model.txt
@@ -6,6 +6,8 @@ model User {
   id         Int
   email      String?
   posts      Post?[]
+  type       String
+  number     Int?
 }
 
 ---
@@ -35,6 +37,20 @@ model User {
         )
         (new_line)
       )
+      (column_declaration
+        (identifier)
+        (column_type
+          (identifier)
+        )
+        (new_line)
+      )
+      (column_declaration
+        (identifier)
+        (column_type
+          (identifier)
+        )
+        (new_line)
+      )
     )
   )
 )

diff --git a/grammar.js b/grammar.js
@@ -47,19 +47,12 @@ module.exports = grammar({
   // ],
 
   conflicts: $ => [
-    [$.type_declaration, $.column_declaration],
+    [$.column_declaration, $.type_declaration],
     [$.assignment_pattern, $.assignment_expression],
   ],
 
   rules: {
-    program: $ => repeat($._definition),
-
-    _definition: $ => choice(
-      $.datasource_declaration,
-      $.model_declaration,
-      $.type_declaration,
-      $.generator_declaration,
-    ),
+    program: $ => repeat($._declaration),
 
     datasource_declaration: $ => seq(
       'datasource',
@@ -86,6 +79,13 @@ module.exports = grammar({
       ),
     )),
 
+    _declaration: $ => choice(
+      $.datasource_declaration,
+      $.model_declaration,
+      $.generator_declaration,
+      $.type_declaration,
+    ),
+
     comment: $ => token(
       seq('//', /.*/),
     ),
@@ -97,13 +97,6 @@ module.exports = grammar({
     )),
 
     _statement: $ => choice(
-      $._declaration,
-    ),
-
-    _declaration: $ => choice(
-      $.datasource_declaration,
-      $.model_declaration,
-      $.type_declaration,
       $.column_declaration,
       $.block_attribute_declaration,
       $.assignment_expression,
@@ -134,7 +127,6 @@ module.exports = grammar({
       $.type_expression,
       $.block_attribute_declaration,
       $.namespace,
-      // $.column_type,
       $.member_expression,
       $.number,
       $.string,
@@ -245,15 +237,14 @@ module.exports = grammar({
       // $.name_pattern,
     ),
 
-
     _expression: $ => choice(
       $._constructable_expression,
 
       $.assignment_expression,
       $.call_expression,
       $.binary_expression,
     ),
-  //
+
     // identifier: $ => /[a-zA-Z-_][a-zA-Z0-9-_]*/,
     identifier: $ => /[a-zA-Z-_][a-zA-Z0-9-_]*/,
     string: $ => token(choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -5,30 +5,9 @@
       "type": "REPEAT",
       "content": {
         "type": "SYMBOL",
-        "name": "_definition"
+        "name": "_declaration"
       }
     },
-    "_definition": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "datasource_declaration"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "model_declaration"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "type_declaration"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "generator_declaration"
-        }
-      ]
-    },
     "datasource_declaration": {
       "type": "SEQ",
       "members": [
@@ -100,6 +79,27 @@
         ]
       }
     },
+    "_declaration": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "datasource_declaration"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "model_declaration"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "generator_declaration"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "type_declaration"
+        }
+      ]
+    },
     "comment": {
       "type": "TOKEN",
       "content": {
@@ -143,27 +143,6 @@
     "_statement": {
       "type": "CHOICE",
       "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_declaration"
-        }
-      ]
-    },
-    "_declaration": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "datasource_declaration"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "model_declaration"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "type_declaration"
-        },
         {
           "type": "SYMBOL",
           "name": "column_declaration"
@@ -1206,8 +1185,8 @@
   ],
   "conflicts": [
     [
-      "type_declaration",
-      "column_declaration"
+      "column_declaration",
+      "type_declaration"
     ],
     [
       "assignment_pattern",

diff --git a/src/node-types.json b/src/node-types.json
@@ -746,18 +746,6 @@
         {
           "type": "column_declaration",
           "named": true
-        },
-        {
-          "type": "datasource_declaration",
-          "named": true
-        },
-        {
-          "type": "model_declaration",
-          "named": true
-        },
-        {
-          "type": "type_declaration",
-          "named": true
         }
       ]
     }