diff --git a/package-lock.json b/package-lock.json
index a51613f..0a1c586 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,14 +10,14 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@ast-grep/cli": "^0.16.1",
+        "@ast-grep/cli": "^0.17.0",
         "tree-sitter-cli": "^0.20.8"
       }
     },
     "node_modules/@ast-grep/cli": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli/-/cli-0.16.1.tgz",
-      "integrity": "sha512-d1e45ZJqyHPXlZbA9buBSnmF5gubOSVuxyLRcGacz4ViTDLneUtUxgcoQPF+PRkaUZcxDqQ9lIGIPh7eyahZ8A==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli/-/cli-0.17.0.tgz",
+      "integrity": "sha512-V/wzq7DYziefAHQF4kO36Zz+9Nynrhun/UxP5hSVNndmvHZ/W86ykEYK5qsjMkHX9q+XtXkN6hGi46azoplmvA==",
       "hasInstallScript": true,
       "dependencies": {
         "detect-libc": "2.0.2"
@@ -30,19 +30,19 @@
         "node": ">= 12.0.0"
       },
       "optionalDependencies": {
-        "@ast-grep/cli-darwin-arm64": "0.16.1",
-        "@ast-grep/cli-darwin-x64": "0.16.1",
-        "@ast-grep/cli-linux-arm64-gnu": "0.16.1",
-        "@ast-grep/cli-linux-x64-gnu": "0.16.1",
-        "@ast-grep/cli-win32-arm64-msvc": "0.16.1",
-        "@ast-grep/cli-win32-ia32-msvc": "0.16.1",
-        "@ast-grep/cli-win32-x64-msvc": "0.16.1"
+        "@ast-grep/cli-darwin-arm64": "0.17.0",
+        "@ast-grep/cli-darwin-x64": "0.17.0",
+        "@ast-grep/cli-linux-arm64-gnu": "0.17.0",
+        "@ast-grep/cli-linux-x64-gnu": "0.17.0",
+        "@ast-grep/cli-win32-arm64-msvc": "0.17.0",
+        "@ast-grep/cli-win32-ia32-msvc": "0.17.0",
+        "@ast-grep/cli-win32-x64-msvc": "0.17.0"
       }
     },
     "node_modules/@ast-grep/cli-darwin-arm64": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli-darwin-arm64/-/cli-darwin-arm64-0.16.1.tgz",
-      "integrity": "sha512-t0vcOluH5NxwALDwiyIjcXXUX8BHrXlbTDIUBpJR/GLLTivtmQx2MgIhAhLxWntG5tBqbE8PdatCL7XqwCQCKA==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli-darwin-arm64/-/cli-darwin-arm64-0.17.0.tgz",
+      "integrity": "sha512-2vjUmg3bfi5KHXHK9NYjKaNa7wcNOuHQXJvUNFQMlg1f+f8KzO+XFcuAQMMt1curYEKLOutXEPAbFN6ZqE00EA==",
       "cpu": [
         "arm64"
       ],
@@ -55,9 +55,9 @@
       }
     },
     "node_modules/@ast-grep/cli-darwin-x64": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli-darwin-x64/-/cli-darwin-x64-0.16.1.tgz",
-      "integrity": "sha512-rGOzEo9c59uIuf4He5nafDDWzaQ/Oef4i9YqKgerWKDsxx+X51bQx5r4HZzIhC0GikMdQqHeUPl+51y2RuKF1Q==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli-darwin-x64/-/cli-darwin-x64-0.17.0.tgz",
+      "integrity": "sha512-+DN5SOFflxSmVqT3rOr5/RU7f9+jIVzChwLQmFTbL1AdpLj2R01Iltn1LcqWjUYMBszy+nqD/ExcZAu9HCzy1A==",
       "cpu": [
         "x64"
       ],
@@ -70,9 +70,9 @@
       }
     },
     "node_modules/@ast-grep/cli-linux-arm64-gnu": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-0.16.1.tgz",
-      "integrity": "sha512-M5EHFqKFiRwg2eFJNwszjWnMtN7gWWWK7uyzN83ariP/aS9VYxij3TjUpXYtw1hYAT9yyHAiOli/KZAubsVefw==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-0.17.0.tgz",
+      "integrity": "sha512-Zf2LKEJIRuwK+xY4pkvtNbZsYgpjb/amH88CVL5aiglWidF3R/N4Ara/NPHkhzFInbAbvUD2uzUNFeYFMDotwg==",
       "cpu": [
         "arm64"
       ],
@@ -85,9 +85,9 @@
       }
     },
     "node_modules/@ast-grep/cli-linux-x64-gnu": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli-linux-x64-gnu/-/cli-linux-x64-gnu-0.16.1.tgz",
-      "integrity": "sha512-kJ8TsC/9HfxJD8KWmxD+K1WJDCDj7UYgEmDrny84UP67wi9cQS+aiUo8PWRVbbQHariKHH8GSADjd9zpqFxkBQ==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli-linux-x64-gnu/-/cli-linux-x64-gnu-0.17.0.tgz",
+      "integrity": "sha512-tGmD6H948Xw7bLUXRCHi9b124JNI/oWvO1DqD9+wMR3yTCABdLKSblzmI+lO157Dc6LhlCQ9E9SYFQ6HSBGQDw==",
       "cpu": [
         "x64"
       ],
@@ -100,9 +100,9 @@
       }
     },
     "node_modules/@ast-grep/cli-win32-arm64-msvc": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-0.16.1.tgz",
-      "integrity": "sha512-UHSH0hGYpwOddYobW6JDCjCBFbaEfGoCcyGAqK5Juoaf244lKw4NlCodenmqIm0YeMvWujIX/NCaGUgXNccDGg==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-0.17.0.tgz",
+      "integrity": "sha512-5HRQtcdDcXXg3NSjN1L2JiGbY4fvq5O2Bg0Nhfib0e0NHXFXx0ENCGI4SswrWjMxJkZ9cWsmDuH738ji3MSceg==",
       "cpu": [
         "arm64"
       ],
@@ -115,9 +115,9 @@
       }
     },
     "node_modules/@ast-grep/cli-win32-ia32-msvc": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-0.16.1.tgz",
-      "integrity": "sha512-U2o2sZzOlWJLBBTrc0mSvWqoyGB69aOuzbhpYgYnTy0UVqULDHG73u4oa6UAQ8SRco7sk3bSBE0GVffeAH8TLQ==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-0.17.0.tgz",
+      "integrity": "sha512-86EzfXTUk9/tpisEZWX9RwKXHw6vKBQBB84+jwVUnTilTyXEBrpQDVYGPlVV4tz/fwpgkimrjvgdcz9Kp3FPrA==",
       "cpu": [
         "ia32"
       ],
@@ -130,9 +130,9 @@
       }
     },
     "node_modules/@ast-grep/cli-win32-x64-msvc": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@ast-grep/cli-win32-x64-msvc/-/cli-win32-x64-msvc-0.16.1.tgz",
-      "integrity": "sha512-93W+C4dgx2o8Pp/2uqzvHgNTzJDjW8x1lLiluQK5E4JZ6InT8PS5w4FqSdQ6VV2hE3cukhUK+touklRaFaxEUQ==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/cli-win32-x64-msvc/-/cli-win32-x64-msvc-0.17.0.tgz",
+      "integrity": "sha512-APhymJLj4Q6cMUhrfLIDqDjysE1sY9or7eh/tvOgzOd/SBT5HfPsF0l6PgnldejdcgjnZHYAqNyMD1xktKjGfA==",
       "cpu": [
         "x64"
       ],
diff --git a/package.json b/package.json
index 7e2048e..19fd159 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "linter"
   ],
   "dependencies": {
-    "@ast-grep/cli": "^0.16.1",
+    "@ast-grep/cli": "^0.17.0",
     "tree-sitter-cli": "^0.20.8"
   },
   "scripts": {
diff --git a/tree-sitter-spicy b/tree-sitter-spicy
index 98dced7..e07c6d9 160000
--- a/tree-sitter-spicy
+++ b/tree-sitter-spicy
@@ -1 +1 @@
-Subproject commit 98dced7b402efbcefcf822b207d28ce09b88b5b9
+Subproject commit e07c6d90c3d406612648659a7d414d3801bc88b0