pleshevskiy
/
tree-sitter-d2
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

grammar: add support of referencing connection 

Closes #18
This commit is contained in:
Dmitriy Pleshevskiy 2023-06-22 02:12:18 +03:00
parent 731be00903
commit e7507ddd98
Signed by: pleshevskiy
GPG Key ID: 79C4487B44403985
6 changed files with 328 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
grammar.js
View File

@ -69,6 +69,7 @@ module.exports = grammar({
[$.class_list],
[$.attr_value_list],
[$._text_block_attrs],
[$._identifier],
],
rules: {
@ -93,12 +94,24 @@ module.exports = grammar({
connection: ($) =>
seq(
$._connection_path,
repeat1(seq($.arrow, $._connection_path)),
choice(
$._full_connection_path,
alias($._referencing_full_connection_path, $.referencing)
),
optional(seq($._colon, optional($.label))),
optional(seq(alias($._connection_block, $.block)))
),
_referencing_full_connection_path: ($) =>
seq("(", $._full_connection_path, $._referencing_end, optional($.index)),
_referencing_end: ($) => token(prec(PREC.IDENTIFIER + 1, ")")),
index: ($) => seq("[", $.integer, "]"),
_full_connection_path: ($) =>
seq($._connection_path, repeat1(seq($.arrow, $._connection_path))),
_connection_path: ($) =>
seq(
repeat(
@ -201,11 +214,17 @@ module.exports = grammar({
repeat(
choice(
$.escape_sequence,
token(prec(PREC.IDENTIFIER, /[\w\d'"$(),]+/)),
token(prec(PREC.IDENTIFIER, /( +|-)[\w\d'"$()]+/))
token(prec(PREC.IDENTIFIER, /[\w\d'"$(,]+/)),
token(prec(PREC.IDENTIFIER, /( +|-)[\w\d'"$(]+/)),
token(prec(PREC.IDENTIFIER, ")"))
)
),
optional(
choice(
token(prec(PREC.IDENTIFIER, /[\w\d'"$(]+/)),
token(prec(PREC.IDENTIFIER + 1, ")"))
)
),
optional(token(prec(PREC.IDENTIFIER, /[\w\d'"$()]+/))),
optional($._dash)
),

162
src/grammar.json
View File

@ -69,24 +69,22 @@
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_connection_path"
},
{
"type": "REPEAT1",
"content": {
"type": "SEQ",
"members": [
{
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "_full_connection_path"
},
{
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "arrow"
"name": "_referencing_full_connection_path"
},
{
"type": "SYMBOL",
"name": "_connection_path"
}
]
}
"named": true,
"value": "referencing"
}
]
},
{
"type": "CHOICE",
@ -141,6 +139,88 @@
}
]
},
"_referencing_full_connection_path": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "("
},
{
"type": "SYMBOL",
"name": "_full_connection_path"
},
{
"type": "SYMBOL",
"name": "_referencing_end"
},
{
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "index"
},
{
"type": "BLANK"
}
]
}
]
},
"_referencing_end": {
"type": "TOKEN",
"content": {
"type": "PREC",
"value": 1,
"content": {
"type": "STRING",
"value": ")"
}
}
},
"index": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "["
},
{
"type": "SYMBOL",
"name": "integer"
},
{
"type": "STRING",
"value": "]"
}
]
},
"_full_connection_path": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_connection_path"
},
{
"type": "REPEAT1",
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "arrow"
},
{
"type": "SYMBOL",
"name": "_connection_path"
}
]
}
}
]
},
"_connection_path": {
"type": "SEQ",
"members": [
@ -893,7 +973,7 @@
"value": 0,
"content": {
"type": "PATTERN",
"value": "[\\w\\d'\"$(),]+"
"value": "[\\w\\d'\"$(,]+"
}
}
},
@ -904,7 +984,18 @@
"value": 0,
"content": {
"type": "PATTERN",
"value": "( +|-)[\\w\\d'\"$()]+"
"value": "( +|-)[\\w\\d'\"$(]+"
}
}
},
{
"type": "TOKEN",
"content": {
"type": "PREC",
"value": 0,
"content": {
"type": "STRING",
"value": ")"
}
}
}
@ -915,15 +1006,31 @@
"type": "CHOICE",
"members": [
{
"type": "TOKEN",
"content": {
"type": "PREC",
"value": 0,
"content": {
"type": "PATTERN",
"value": "[\\w\\d'\"$()]+"
"type": "CHOICE",
"members": [
{
"type": "TOKEN",
"content": {
"type": "PREC",
"value": 0,
"content": {
"type": "PATTERN",
"value": "[\\w\\d'\"$(]+"
}
}
},
{
"type": "TOKEN",
"content": {
"type": "PREC",
"value": 1,
"content": {
"type": "STRING",
"value": ")"
}
}
}
}
]
},
{
"type": "BLANK"
@ -2287,6 +2394,9 @@
],
[
"_text_block_attrs"
],
[
"_identifier"
]
],
"precedences": [],

60
src/node-types.json
View File

@ -261,7 +261,7 @@
"fields": {},
"children": {
"multiple": true,
"required": true,
"required": false,
"types": [
{
"type": "arrow",
@ -283,6 +283,10 @@
"type": "label",
"named": true
},
{
"type": "referencing",
"named": true
},
{
"type": "shape_key",
"named": true
@ -348,6 +352,21 @@
]
}
},
{
"type": "index",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "integer",
"named": true
}
]
}
},
{
"type": "label",
"named": true,
@ -367,6 +386,37 @@
]
}
},
{
"type": "referencing",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "arrow",
"named": true
},
{
"type": "container_key",
"named": true
},
{
"type": "dot",
"named": true
},
{
"type": "index",
"named": true
},
{
"type": "shape_key",
"named": true
}
]
}
},
{
"type": "reserved",
"named": true,
@ -511,6 +561,14 @@
"type": "'",
"named": false
},
{
"type": "(",
"named": false
},
{
"type": ")",
"named": false
},
{
"type": "3d",
"named": false

BIN
src/parser.c
View File

Binary file not shown.

110
test/corpus/connection.txt
View File

@ -248,7 +248,7 @@ Connection with espaced key fragments
================================================================================
Connection with espaced key fragments
Diclare a connection with espaced key fragments
================================================================================
\#hello\[\] -- \[world\]
@ -268,3 +268,111 @@ Connection with espaced key fragments
)
)
)
================================================================================
Declare a referencing connection
================================================================================
(x() -> y())
(x() -> y())[0]
--------------------------------------------------------------------------------
(source_file
(connection
(referencing
(shape_key)
(arrow)
(shape_key)
)
)
(connection
(referencing
(shape_key)
(arrow)
(shape_key)
(index (integer))
)
)
)
================================================================================
Declare a referencing connection with label
================================================================================
(x -> y): label
(x -> y)[0]: label
--------------------------------------------------------------------------------
(source_file
(connection
(referencing
(shape_key)
(arrow)
(shape_key)
)
(label)
)
(connection
(referencing
(shape_key)
(arrow)
(shape_key)
(index (integer))
)
(label)
)
)
================================================================================
Declare a referencing connection with block
================================================================================
(x() -> y()): {
style.stroke: \#ff0000
}
(x -> y)[0]: {
style.stroke: \#ff0000
}
--------------------------------------------------------------------------------
(source_file
(connection
(referencing
(shape_key)
(arrow)
(shape_key)
)
(block
(attribute
(keyword_style)
(dot)
(attribute
(attr_key)
(attr_value
(escape_sequence)
)
)
)
)
)
(connection
(referencing
(shape_key)
(arrow)
(shape_key)
(index (integer))
)
(block
(attribute
(keyword_style)
(dot)
(attribute
(attr_key)
(attr_value
(escape_sequence)
)
)
)
)
)
)

BIN
tree-sitter-d2.wasm
View File

Binary file not shown.