Skip to content

Commit dd52a96

Browse files
committed
update zed ext
1 parent 65f3d66 commit dd52a96

7 files changed

Lines changed: 5183 additions & 4251 deletions

File tree

extensions/zed/extension.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ repository = "https://github.com/cyteon/modu"
88

99
[grammars.modu]
1010
repository = "https://github.com/cyteon/tree-sitter-modu"
11-
rev = "660f60ea6e506a7e939c725d0f63b3a3f4bebde5"
11+
rev = "4f09a0c8fa29e836876d3ae30ca1c6ddda00e567"

extensions/zed/grammars/modu.wasm

2.16 KB
Binary file not shown.

extensions/zed/grammars/modu/grammar.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = grammar({
1010
_statement: ($) =>
1111
choice(
1212
$.let_stmt,
13+
$.const_stmt,
1314
$.assign_stmt,
1415
$.fn_stmt,
1516
$.if_stmt,
@@ -26,6 +27,8 @@ module.exports = grammar({
2627

2728
let_stmt: ($) =>
2829
seq("let", $.identifier, "=", $._expression),
30+
const_stmt: ($) =>
31+
seq("const", $.identifier, "=", $._expression),
2932
assign_stmt: ($) =>
3033
seq($.identifier, choice("=", "+=", "-=", "*=", "/=", "%="), $._expression),
3134
fn_stmt: ($) =>
@@ -96,15 +99,16 @@ module.exports = grammar({
9699
),
97100

98101
unary_expr: ($) =>
99-
seq(choice("!", "-"), $._expression),
102+
seq(choice("!", "-", "~"), $._expression),
100103

101104
binary_expr: ($) =>
102105
choice(
103106
prec.left(1, seq($._expression, choice("and", "or"), $._expression)),
104107
prec.left(2, seq($._expression, choice("==", "!=", "<", ">", "<=", ">="), $._expression)),
105-
prec.left(3, seq($._expression, choice("+", "-"), $._expression)),
106-
prec.left(4, seq($._expression, choice("*", "/", "%"), $._expression)),
107-
prec.left(5, seq($._expression, "**", $._expression))
108+
prec.left(3, seq($._expression, choice("&", "|", "^", "<<", ">>"), $._expression)),
109+
prec.left(4, seq($._expression, choice("+", "-"), $._expression)),
110+
prec.left(5, seq($._expression, choice("*", "/", "%"), $._expression)),
111+
prec.left(6, seq($._expression, "**", $._expression))
108112
),
109113

110114
call_expr: ($) =>

extensions/zed/grammars/modu/src/grammar.json

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,10 @@
626626
{
627627
"type": "STRING",
628628
"value": "-"
629+
},
630+
{
631+
"type": "STRING",
632+
"value": "~"
629633
}
630634
]
631635
},
@@ -717,6 +721,48 @@
717721
{
718722
"type": "PREC_LEFT",
719723
"value": 3,
724+
"content": {
725+
"type": "SEQ",
726+
"members": [
727+
{
728+
"type": "SYMBOL",
729+
"name": "_expression"
730+
},
731+
{
732+
"type": "CHOICE",
733+
"members": [
734+
{
735+
"type": "STRING",
736+
"value": "&"
737+
},
738+
{
739+
"type": "STRING",
740+
"value": "|"
741+
},
742+
{
743+
"type": "STRING",
744+
"value": "^"
745+
},
746+
{
747+
"type": "STRING",
748+
"value": "<<"
749+
},
750+
{
751+
"type": "STRING",
752+
"value": ">>"
753+
}
754+
]
755+
},
756+
{
757+
"type": "SYMBOL",
758+
"name": "_expression"
759+
}
760+
]
761+
}
762+
},
763+
{
764+
"type": "PREC_LEFT",
765+
"value": 4,
720766
"content": {
721767
"type": "SEQ",
722768
"members": [
@@ -746,7 +792,7 @@
746792
},
747793
{
748794
"type": "PREC_LEFT",
749-
"value": 4,
795+
"value": 5,
750796
"content": {
751797
"type": "SEQ",
752798
"members": [
@@ -780,7 +826,7 @@
780826
},
781827
{
782828
"type": "PREC_LEFT",
783-
"value": 5,
829+
"value": 6,
784830
"content": {
785831
"type": "SEQ",
786832
"members": [

extensions/zed/grammars/modu/src/node-types.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,6 +1604,10 @@
16041604
"type": "%=",
16051605
"named": false
16061606
},
1607+
{
1608+
"type": "&",
1609+
"named": false
1610+
},
16071611
{
16081612
"type": "'",
16091613
"named": false
@@ -1676,6 +1680,10 @@
16761680
"type": "<",
16771681
"named": false
16781682
},
1683+
{
1684+
"type": "<<",
1685+
"named": false
1686+
},
16791687
{
16801688
"type": "<=",
16811689
"named": false
@@ -1696,6 +1704,10 @@
16961704
"type": ">=",
16971705
"named": false
16981706
},
1707+
{
1708+
"type": ">>",
1709+
"named": false
1710+
},
16991711
{
17001712
"type": "[",
17011713
"named": false
@@ -1704,6 +1716,10 @@
17041716
"type": "]",
17051717
"named": false
17061718
},
1719+
{
1720+
"type": "^",
1721+
"named": false
1722+
},
17071723
{
17081724
"type": "and",
17091725
"named": false
@@ -1796,8 +1812,16 @@
17961812
"type": "{",
17971813
"named": false
17981814
},
1815+
{
1816+
"type": "|",
1817+
"named": false
1818+
},
17991819
{
18001820
"type": "}",
18011821
"named": false
1822+
},
1823+
{
1824+
"type": "~",
1825+
"named": false
18021826
}
18031827
]

0 commit comments

Comments
 (0)