Merge pull request #125 from danzat/danzat/fix_class_literal_precedence

Danzat/fix class literal precedence

Author: aryx

grammar.js

@@ -24,6 +24,7 @@ const PREC = {
   ARRAY: 16,       // [Index]
   OBJ_ACCESS: 16,  // .
   PARENS: 16,      // (Expression)
+  CLASS_LITERAL: 17,  // .
 };
 
 module.exports = grammar({
@@ -69,6 +70,7 @@ module.exports = grammar({
     // Only conflicts in switch expressions
     [$.lambda_expression, $.primary_expression],
     [$.inferred_parameters, $.primary_expression],
+    [$.class_literal, $.field_access],
   ],
 
   word: $ => $.identifier,
@@ -309,7 +311,7 @@ module.exports = grammar({
 
     parenthesized_expression: $ => seq('(', $.expression, ')'),
 
-    class_literal: $ => seq($._unannotated_type, '.', 'class'),
+    class_literal: $ => prec.dynamic(PREC.CLASS_LITERAL, seq($._unannotated_type, '.', 'class')),
 
     object_creation_expression: $ => choice(
       $._unqualified_object_creation_expression,
@@ -324,15 +326,15 @@ module.exports = grammar({
       optional($.class_body)
     )),
 
-    field_access: $ => seq(
+    field_access: $ => prec.dynamic(PREC.OBJ_ACCESS, seq(
       field('object', choice($.primary_expression, $.super)),
       optional(seq(
         '.',
         $.super
       )),
       '.',
       field('field', choice($.identifier, $._reserved_identifier, $.this))
-    ),
+    )),
 
     array_access: $ => seq(
       field('array', $.primary_expression),

src/grammar.json

@@ -2537,21 +2537,25 @@
       ]
     },
     "class_literal": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_unannotated_type"
-        },
-        {
-          "type": "STRING",
-          "value": "."
-        },
-        {
-          "type": "STRING",
-          "value": "class"
-        }
-      ]
+      "type": "PREC_DYNAMIC",
+      "value": 17,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "_unannotated_type"
+          },
+          {
+            "type": "STRING",
+            "value": "."
+          },
+          {
+            "type": "STRING",
+            "value": "class"
+          }
+        ]
+      }
     },
     "object_creation_expression": {
       "type": "CHOICE",
@@ -2637,72 +2641,76 @@
       }
     },
     "field_access": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "FIELD",
-          "name": "object",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "primary_expression"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "super"
-              }
-            ]
-          }
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SEQ",
+      "type": "PREC_DYNAMIC",
+      "value": 16,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "object",
+            "content": {
+              "type": "CHOICE",
               "members": [
                 {
-                  "type": "STRING",
-                  "value": "."
+                  "type": "SYMBOL",
+                  "name": "primary_expression"
                 },
                 {
                   "type": "SYMBOL",
                   "name": "super"
                 }
               ]
-            },
-            {
-              "type": "BLANK"
             }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": "."
-        },
-        {
-          "type": "FIELD",
-          "name": "field",
-          "content": {
+          },
+          {
             "type": "CHOICE",
             "members": [
               {
-                "type": "SYMBOL",
-                "name": "identifier"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_reserved_identifier"
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "."
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "super"
+                  }
+                ]
               },
               {
-                "type": "SYMBOL",
-                "name": "this"
+                "type": "BLANK"
               }
             ]
+          },
+          {
+            "type": "STRING",
+            "value": "."
+          },
+          {
+            "type": "FIELD",
+            "name": "field",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_reserved_identifier"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "this"
+                }
+              ]
+            }
           }
-        }
-      ]
+        ]
+      }
     },
     "array_access": {
       "type": "SEQ",
@@ -7099,6 +7107,10 @@
     [
       "inferred_parameters",
       "primary_expression"
+    ],
+    [
+      "class_literal",
+      "field_access"
     ]
   ],
   "precedences": [],