diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index bfe6d6b1e791..edec26e2e760 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -67,7 +67,7 @@
 | hare | ✓ |  |  |  |
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | haskell-persistent | ✓ |  |  |  |
-| hcl | ✓ |  | ✓ | `terraform-ls` |
+| hcl | ✓ | ✓ | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
 | hocon | ✓ |  | ✓ |  |
 | hoon | ✓ |  |  |  |
diff --git a/runtime/queries/hcl/textobjects.scm b/runtime/queries/hcl/textobjects.scm
new file mode 100644
index 000000000000..1e65058760dd
--- /dev/null
+++ b/runtime/queries/hcl/textobjects.scm
@@ -0,0 +1,6 @@
+(comment) @comment.inside
+(comment)+ @comment.around
+
+(function_arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+