Merge pull request Wilfred#4 from nvim-treesitter/master

* Implement return statements * Name field nodes
JafarAbdi · Jul 11, 2020 · 4f78468 · 4f78468
2 parents c919f55 + 6b6ce95
commit 4f78468
Show file tree

Hide file tree

Showing 9 changed files with 39,425 additions and 31,974 deletions.
diff --git a/corpus/functions.txt b/corpus/functions.txt
@@ -18,17 +18,19 @@ a.b.f = function(self, test, ...) return 10 end
     (function_definition (parameters)
       (return_statement (false))))
 
-  (variable_declaration (variable_declarator (identifier) (property_identifier) (property_identifier))
-    (function_definition (parameters)
-      (return_statement (true))))
+  (variable_declaration (variable_declarator
+    (field_expression (field_expression (identifier) (property_identifier)) (property_identifier)))
+      (function_definition (parameters)
+        (return_statement (true))))
 
   (local_variable_declaration (variable_declarator (identifier)))
 
   (variable_declaration (variable_declarator (identifier))
     (function_definition (parameters)
       (return_statement (string))))
 
-  (variable_declaration (variable_declarator (identifier) (property_identifier) (property_identifier))
+  (variable_declaration (variable_declarator
+    (field_expression (field_expression (identifier) (property_identifier)) (property_identifier)))
     (function_definition (parameters (self) (identifier) (spread))
       (return_statement (number)))))
 
@@ -46,8 +48,6 @@ function t.a.b.c.f()
   return true
 end
 
-t.a.b.c.f = function() return true end
-
 ---
 
 (program
@@ -58,11 +58,8 @@ t.a.b.c.f = function() return true end
     (function_definition (parameters)
       (return_statement (false))))
 
-  (function (function_name (identifier) (property_identifier) (property_identifier) (property_identifier) (property_identifier)) (parameters)
-    (return_statement (true)))
-
-  (variable_declaration (variable_declarator (identifier) (property_identifier) (property_identifier) (property_identifier) (property_identifier)) (function_definition (parameters)
-    (return_statement (true)))))
+  (function (function_name (function_name_field (identifier) (property_identifier) (property_identifier) (property_identifier) (property_identifier))) (parameters)
+    (return_statement (true))))
 
 
 ============================================

diff --git a/corpus/statements.txt b/corpus/statements.txt
@@ -61,13 +61,13 @@ end
       (function_call (identifier)
         (arguments (string)))
     (elseif (condition_expression (binary_operation (identifier) (string)))
-      (function_call (identifier) (property_identifier)
+      (function_call (field_expression (identifier) (property_identifier))
         (arguments (string))))
     (else
       (variable_declaration (variable_declarator (identifier)) (number))
 
       (local_variable_declaration (variable_declarator (identifier))
-        (function_call (identifier) (property_identifier)
+        (function_call (field_expression (identifier) (property_identifier))
           (arguments)))
 
       (function_call (identifier)

diff --git a/grammar.js b/grammar.js
@@ -31,7 +31,8 @@ module.exports = grammar({
   conflicts: $ => [
     [$._prefix],
     [$._expression, $._variable_declarator],
-    [$._expression, $.function_call_statement]
+    [$._expression, $.function_call_statement],
+	[$.function_name, $.function_name_field]
   ],
 
   externals: $ => [
@@ -40,7 +41,7 @@ module.exports = grammar({
   ],
 
   rules: {
-    program: $ => repeat($._statement),
+    program: $ => seq(repeat($._statement), optional($.return_statement)),
 
     // Return statement
     return_statement: $ => seq(
@@ -90,9 +91,11 @@ module.exports = grammar({
     _variable_declarator: $ => choice(
       $.identifier,
       seq($._prefix, '[', $._expression, ']'),
-      seq($._prefix, '.', alias($.identifier, $.property_identifier))
+		$.field_expression
     ),
 
+	field_expression: $ => seq($._prefix, '.', alias($.identifier, $.property_identifier)),
+
     _local_variable_declarator: $ => sequence($.identifier),
 
     // Statements: Control statements
@@ -222,11 +225,17 @@ module.exports = grammar({
     ),
 
     function_name: $ => seq(
-      $.identifier,
-      repeat(seq('.', alias($.identifier, $.property_identifier))),
+		choice($.identifier,
+			$.function_name_field
+		),
       optional(seq(':', alias($.identifier, $.method)))
     ),
 
+	function_name_field: $ => seq(
+      field("object", $.identifier),
+      repeat(seq('.', alias($.identifier, $.property_identifier))),
+	),
+
     parameters: $ => seq(
       '(',
       optional(seq(

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "prebuild": "^9.0.1",
-    "tree-sitter-cli": "^0.15.7"
+    "tree-sitter-cli": "^0.15.14"
   },
   "files": [
     "src",