From d56367bc73d77219766cdba0bdc0595431323195 Mon Sep 17 00:00:00 2001
From: Toby Vincent <tobyv13@gmail.com>
Date: Sun, 27 Nov 2022 20:18:23 -0600
Subject: feat(treesitter): improve keymaps and add custom rust queries

---
 .../nvim/after/queries/rust/textobjects.scm        |  5 +++++
 .../nvim/lua/tobyvin/plugins/treesitter.lua        | 26 +++++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 nvim/.config/nvim/after/queries/rust/textobjects.scm

(limited to 'nvim/.config')

diff --git a/nvim/.config/nvim/after/queries/rust/textobjects.scm b/nvim/.config/nvim/after/queries/rust/textobjects.scm
new file mode 100644
index 0000000..c754bfe
--- /dev/null
+++ b/nvim/.config/nvim/after/queries/rust/textobjects.scm
@@ -0,0 +1,5 @@
+; extends
+
+(let_declaration
+    pattern: (_)
+    value: (_) @statement.inner) @statment.outer
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
index 00139f3..fb2e6ad 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
@@ -25,30 +25,24 @@ treesitter.setup({
 			enable = true,
 			lookahead = true,
 			keymaps = {
-				["ia"] = "@attribute.inner",
-				["aa"] = "@attribute.outer",
 				["ib"] = "@block.inner",
 				["ab"] = "@block.outer",
+				["ie"] = "@call.inner",
+				["ae"] = "@call.outer",
 				["ic"] = "@class.inner",
 				["ac"] = "@class.outer",
-				["ie"] = "@statement.inner",
-				["ae"] = "@statement.outer",
-				["if"] = "@function.inner",
-				["af"] = "@function.outer",
-				["iF"] = "@frame.inner",
-				["aF"] = "@frame.outer",
+				["i/"] = "@comment.inner",
+				["a/"] = "@comment.outer",
 				["ii"] = "@conditional.inner",
 				["ai"] = "@conditional.outer",
+				["if"] = "@function.inner",
+				["af"] = "@function.outer",
 				["il"] = "@loop.inner",
 				["al"] = "@loop.outer",
-				["in"] = "@scopename.inner",
-				["an"] = "@scopename.outer",
-				["ix"] = "@call.inner",
-				["ax"] = "@call.outer",
-				["iv"] = "@parameter.inner",
-				["av"] = "@parameter.outer",
-				["i/"] = "@comment.inner",
-				["a/"] = "@comment.outer",
+				["ia"] = "@parameter.inner",
+				["aa"] = "@parameter.outer",
+				["iv"] = "@statement.inner",
+				["av"] = "@statement.outer",
 			},
 		},
 	},
-- 
cgit v1.2.3-70-g09d2