Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 40 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "tree-sitter-angular"
name = "tree-sitter-angular-codemod"
description = "Angular grammar for tree-sitter"
version = "0.5.0"
version = "0.5.6"
keywords = ["incremental", "parsing", "angular"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/tree-sitter/tree-sitter-angular"
Expand All @@ -19,8 +19,9 @@ include = [
path = "bindings/rust/lib.rs"

[dependencies]
tree-sitter = "~0.22.5"
tree-sitter-html = "~0.20.3"
tree-sitter-language = "0.1.0"
tree-sitter = "~0.24.5"
tree-sitter-html = "~0.23.0"

[build-dependencies]
cc = "1.0"
2 changes: 1 addition & 1 deletion bindings/rust/build.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 4 additions & 9 deletions bindings/rust/lib.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 27 additions & 5 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ module.exports = grammar(HTML, {
alias('for', $.control_keyword),
'(',
field('declaration', $.for_declaration),
optional(field('reference', $.for_reference)),
optional(seq(';', field('reference', $.for_reference))),
')',
field('body', $.statement_block),
),
Expand All @@ -209,12 +209,11 @@ module.exports = grammar(HTML, {
field('value', $.expression),
';',
alias('track', $.special_keyword),
field('track', $.expression),
field('track', $._any_expression),
),

for_reference: ($) =>
seq(
';',
alias('let', $.special_keyword),
field('alias', $.assignment_expression),
repeat(seq(choice(';', ','), field('alias', $.assignment_expression))),
Expand Down Expand Up @@ -502,11 +501,34 @@ module.exports = grammar(HTML, {
// Identifier
identifier: () => /[a-zA-Z_0-9\-\$]+/,

_escape_sequence: (_) =>
token.immediate(
seq(
'\\',
choice(
/[^xu0-7]/,
/[0-7]{1,3}/,
/x[0-9a-fA-F]{2}/,
/u[0-9a-fA-F]{4}/,
/u\{[0-9a-fA-F]+\}/,
/[\r?][\n\u2028\u2029]/,
),
),
),

// String
string: ($) =>
choice(
seq($._double_quote, repeat(token.immediate(/[^"]/)), $._double_quote),
seq($._single_quote, repeat(token.immediate(/[^']/)), $._single_quote),
seq(
$._double_quote,
repeat(choice(token.immediate(/[^"]/), $._escape_sequence)),
$._double_quote,
),
seq(
$._single_quote,
repeat(choice(token.immediate(/[^']/), $._escape_sequence)),
$._single_quote,
),
),

// Number
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 4 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tree-sitter-angular",
"version": "0.5.0",
"name": "@codemod.com/tree-sitter-angular",
"version": "0.5.6",
"description": "Tree-sitter grammar for the Angular framework",
"main": "bindings/node",
"types": "bindings/node",
Expand Down Expand Up @@ -58,13 +58,5 @@
"tree_sitter": {
"optional": true
}
},
"tree-sitter": [
{
"scope": "source.angular",
"file-types": [
"component.html"
]
}
]
}
}
}
Loading