diff --git a/lua/dotvim/pkgs/base/setup/autocmds.lua b/lua/dotvim/pkgs/base/setup/autocmds.lua
index 1fd031eb..68066a6f 100644
--- a/lua/dotvim/pkgs/base/setup/autocmds.lua
+++ b/lua/dotvim/pkgs/base/setup/autocmds.lua
@@ -132,6 +132,24 @@ return function()
     end,
   })
 
+  -- special case for `neo-tree`
+  vim.api.nvim_create_autocmd("FileType", {
+    pattern = "neo-tree",
+    callback = function(event)
+      vim.bo[event.buf].buflisted = false
+      local buf = event.buf
+      vim.api.nvim_buf_set_keymap(event.buf, "n", "q", "", {
+        noremap = true,
+        callback = function()
+          vim.api.nvim_win_close(0, true)
+          if vim.api.nvim_buf_is_valid(buf) then
+            vim.api.nvim_buf_delete(buf, { force = true })
+          end
+        end,
+      })
+    end,
+  })
+
   vim.api.nvim_create_autocmd({ "InsertLeave", "WinEnter" }, {
     pattern = "*",
     callback = function(event)
diff --git a/queries/typescript/textobjects.scm b/queries/typescript/textobjects.scm
new file mode 100644
index 00000000..063c59fa
--- /dev/null
+++ b/queries/typescript/textobjects.scm
@@ -0,0 +1,10 @@
+; extends
+
+((named_imports
+   . (import_specifier) @parameter.inner . ","? @_end)
+  (#make-range! "parameter.outer" @parameter.inner @_end))
+((named_imports
+   "," @_start . (import_specifier) @parameter.inner . ","? @_end)
+  (#make-range! "parameter.outer" @parameter.inner @_end))
+
+