@acristoffers/tree-sitter-matlab 1.2.12 → 1.2.13

package/README.md

@@ -62,11 +62,24 @@ special class folder.
 
 # Installation
 
-This parser is now the default for the following editors:
+This parser is available in the following editors:
 
-- Emacs: Through the `tree-sitter-langs` package.
-- Helix: Builtin.
-- Neovim: Through the `nvim-treesitter` plugin.
+| Editor | Plugin              | Highlights | Folds | Indents | Code Format | Injections  | Locals |
+| :---   | :---                | :---       | :---  | :---    | :---        | :---        | :---   |
+| Emacs  | [Emacs-MATLAB-Mode] | ✔          | ✘     | ✔       | ✔           | ✔           | ✘      |
+| Helix  | Builtin             | ✔          | ✘     | ✔       | ✘           | ✘           | ✘      |
+| NeoVim | [nvim-treesitter]   | ✔          | ✔     | ✔       | ✘           | ✔           | ✔      |
+
+The columns have the following meaning:
+
+- *Highlights*: supports syntax highlight
+- *Folds*: supports code folding
+- *Indents*: supports code indenting, which adjusts the leftmost whitespace on each line.
+- *Code Format*: indent includes code formatting that standardizes the spacing of language elements
+  within code lines, aligns matrix columns, adds missing commas within cells and matrices, etc.
+- *Injections*: supports embedding the language into another language (i.e.: MATLAB code blocks inside
+  Markdown or [org-mode](https://orgmode.org/))
+- *Locals*: supports identifying variables/functions/etc scope
 
 # Known issues
 
@@ -81,3 +94,6 @@ This parser is now the default for the following editors:
 ![First Screenshot](https://raw.githubusercontent.com/acristoffers/tree-sitter-matlab/screenshots/s1.png)
 ![Second Screenshot](https://raw.githubusercontent.com/acristoffers/tree-sitter-matlab/screenshots/s2.png)
 ![Third Screenshot](https://raw.githubusercontent.com/acristoffers/tree-sitter-matlab/screenshots/s3.png)
+
+[Emacs-MATLAB-Mode]: https://github.com/mathworks/Emacs-MATLAB-Mode
+[nvim-treesitter]: https://github.com/nvim-treesitter/nvim-treesitter

package/grammar.js

@@ -527,14 +527,20 @@ module.exports = grammar({
         ),
       ),
     _index_parenthesis: ($) => seq('(', $._index_expression, ')'),
+    // _index_expression is intentionally a superset of _expression to avoid
+    // conflicts like obj([1;end]) where the parser would otherwise reduce to
+    // a non-index matrix/row too early.
     _index_expression: ($) =>
       choice(
         alias($._index_boolean_operator, $.boolean_operator),
         $.field_expression,
         $.function_call,
+        $.handle_operator,
         $.identifier,
         $.cell,
+        $.lambda,
         alias($._index_matrix, $.matrix),
+        $.metaclass_operator,
         alias($._index_not_operator, $.not_operator),
         $.number,
         alias($._index_comparison_operator, $.comparison_operator),
@@ -590,7 +596,7 @@ module.exports = grammar({
         ),
       );
     },
-    _index_argument: ($) => choice($.spread_operator, choice(prec.dynamic(1, $._index_expression), prec.dynamic(-1, $._expression))),
+    _index_argument: ($) => choice($.spread_operator, $._index_expression),
     _index_arguments: ($) => commaSep1(field('argument', $._index_argument)),
 
     arguments: ($) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acristoffers/tree-sitter-matlab",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "description": "MATLAB tree-sitter parser",
   "keywords": [
     "incremental",

package/src/grammar.json

@@ -2521,6 +2521,10 @@
           "type": "SYMBOL",
           "name": "function_call"
         },
+        {
+          "type": "SYMBOL",
+          "name": "handle_operator"
+        },
         {
           "type": "SYMBOL",
           "name": "identifier"
@@ -2529,6 +2533,10 @@
           "type": "SYMBOL",
           "name": "cell"
         },
+        {
+          "type": "SYMBOL",
+          "name": "lambda"
+        },
         {
           "type": "ALIAS",
           "content": {
@@ -2538,6 +2546,10 @@
           "named": true,
           "value": "matrix"
         },
+        {
+          "type": "SYMBOL",
+          "name": "metaclass_operator"
+        },
         {
           "type": "ALIAS",
           "content": {
@@ -3143,25 +3155,8 @@
           "name": "spread_operator"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "PREC_DYNAMIC",
-              "value": 1,
-              "content": {
-                "type": "SYMBOL",
-                "name": "_index_expression"
-              }
-            },
-            {
-              "type": "PREC_DYNAMIC",
-              "value": -1,
-              "content": {
-                "type": "SYMBOL",
-                "name": "_expression"
-              }
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "_index_expression"
         }
       ]
     },

package/src/node-types.json

@@ -35,14 +35,26 @@
           "type": "function_call",
           "named": true
         },
+        {
+          "type": "handle_operator",
+          "named": true
+        },
         {
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "lambda",
+          "named": true
+        },
         {
           "type": "matrix",
           "named": true
         },
+        {
+          "type": "metaclass_operator",
+          "named": true
+        },
         {
           "type": "not_operator",
           "named": true