Merge pull request #1 from codemod-com/string-expr-escape-seq

String expr escape seq

Author: mohebifar

.github/workflows/publish.yml

@@ -16,3 +16,5 @@ jobs:
     uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main
     secrets:
       CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_TOKEN}}
+    with:
+      allow_dirty: true

Cargo.lock

@@ -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"
@@ -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"

Cargo.toml

@@ -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),
         ),
@@ -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))),
@@ -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

bindings/rust/build.rs

@@ -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",
@@ -17,6 +17,9 @@
     "type": "git",
     "url": "git+https://github.com/dlvandenberg/tree-sitter-angular.git"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "keywords": [
     "Treesitter",
     "Angular",
@@ -58,13 +61,5 @@
     "tree_sitter": {
       "optional": true
     }
-  },
-  "tree-sitter": [
-    {
-      "scope": "source.angular",
-      "file-types": [
-        "component.html"
-      ]
-    }
-  ]
+  }
 }