Skip to content

Commit

Permalink
Merge pull request #12 from dundargoc/fix/typos
Browse files Browse the repository at this point in the history
fix!: typo
  • Loading branch information
dlvandenberg authored Mar 4, 2024
2 parents f70aa7a + b6fa5b4 commit a1b5ff4
Show file tree
Hide file tree
Showing 6 changed files with 173 additions and 225 deletions.
8 changes: 4 additions & 4 deletions corpus/interpolation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Grouping
(tag_name)
)
(interpolation
(concatination_expression
(concatenation_expression
(group
(expression
(member_expression
Expand Down Expand Up @@ -251,7 +251,7 @@ Combined
)

====================
String concatination
String concatenation
====================

<span>{{ 'Hello ' + firstName + ', how are you?' }}</span>
Expand All @@ -264,7 +264,7 @@ String concatination
(tag_name)
)
(interpolation
(concatination_expression
(concatenation_expression
(string)
(expression
(identifier)
Expand All @@ -288,7 +288,7 @@ String concat with pipes

(fragment
(interpolation
(concatination_expression
(concatenation_expression
(string)
(expression
(member_expression
Expand Down
4 changes: 2 additions & 2 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,11 @@ module.exports = grammar(HTML, {
interpolation: ($) =>
seq(
alias($._interpolation_start, '{{'),
choice($._any_expression, $.concatination_expression),
choice($._any_expression, $.concatenation_expression),
alias($._interpolation_end, '}}'),
),

concatination_expression: ($) =>
concatenation_expression: ($) =>
prec(
2,
seq($._primitive, '+', $.expression, optional(repeat(seq('+', $._primitive)))),
Expand Down
4 changes: 2 additions & 2 deletions src/grammar.json
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@
},
{
"type": "SYMBOL",
"name": "concatination_expression"
"name": "concatenation_expression"
}
]
},
Expand All @@ -1793,7 +1793,7 @@
}
]
},
"concatination_expression": {
"concatenation_expression": {
"type": "PREC",
"value": 2,
"content": {
Expand Down
4 changes: 2 additions & 2 deletions src/node-types.json
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@
}
},
{
"type": "concatination_expression",
"type": "concatenation_expression",
"named": true,
"fields": {},
"children": {
Expand Down Expand Up @@ -1960,7 +1960,7 @@
"named": true
},
{
"type": "concatination_expression",
"type": "concatenation_expression",
"named": true
},
{
Expand Down
Loading

0 comments on commit a1b5ff4

Please sign in to comment.