Add to support type alias.

navi-language · Apr 10, 2024 · 8370a41 · 8370a41
1 parent 24d3cf9
commit 8370a41
Show file tree

Hide file tree

Showing 9 changed files with 24,543 additions and 24,084 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-navi"
 description = "Navi grammar for the tree-sitter parsing library"
-version = "0.0.13"
+version = "0.0.14"
 keywords = ["incremental", "parsing", "navi"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-navi"

diff --git a/examples/bind.nv b/examples/bind.nv
@@ -1,12 +1,21 @@
-use std.io;
 use std.io.Bytes;
+use std.io;
 use std.time.{self, DateTime, Duration};
 
 use _sql.BindValue as _BindValue;
 
 /// A union type for query binding values.
-pub type BindValue = int | string | bool | float | DateTime | Duration | [string] | [int] | [float];
-pub type NamedBindValue = <string, <string, BindValue? | float? | bool | [string] | any>>;
+pub type alias BindValue =
+    int |
+    string |
+    bool |
+    float |
+    DateTime |
+    Duration |
+    [string] |
+    [int] |
+    [float];
+pub type alias NamedBindValue = <string, <string, BindValue? | float? | bool | [string] | any>>;
 
 pub const STATEMENT_TYPE_SELECT: string = `Hello ${DateTime.now() - 100.day()}`;
 

diff --git a/grammar.js b/grammar.js
@@ -164,6 +164,7 @@ module.exports = grammar({
         alias(choice(...primitive_types), $.primitive_type),
         prec.right(repeat1(choice(...TOKEN_TREE_NON_SPECIAL_TOKENS))),
         "'",
+        "alias",
         "as",
         "assert",
         "assert_eq",
@@ -315,6 +316,7 @@ module.exports = grammar({
       seq(
         optional($.visibility_modifier),
         "type",
+        optional("alias"),
         field("name", $._type_identifier),
         // field("type_parameters", optional($.type_parameters)),
         "=",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-navi",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Navi grammar for tree-sitter",
   "main": "bindings/node",
   "repository": {

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -102,6 +102,7 @@
 (parameter (identifier) @variable.parameter)
 
 [
+  "alias"
   "as"
   "assert"
   "assert_eq"

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,6 +102,7 @@ @@
     (parameter (identifier) @variable.parameter)
     [
+      "alias"
       "as"
       "assert"
       "assert_eq"
@@ Expand Down @@