Merge branch 'main' into bump-brave-version

home/features/neovim/lua/plugins/editor.lua

@@ -27,41 +27,6 @@ return {
 			})
 		end,
 	},
-	{
-		"nvim-neo-tree/neo-tree.nvim",
-		cmd = "Neotree",
-		keys = {},
-		opts = {
-			close_if_last_window = false,
-			popup_border_style = "solid",
-			enable_git_status = true,
-			enable_diagnostics = true,
-			sort_case_insensitive = false,
-			window = {
-				position = "float",
-			},
-			use_libuv_file_watcher = true,
-			filesystem = {
-				filtered_items = {
-					hide_by_name = {
-						"node_modules",
-						"vendor",
-					},
-				},
-			},
-			buffers = {
-				follow_current_file = true,
-			},
-		},
-		config = function(_, opts)
-			require("neo-tree").setup(opts)
-			vim.g.neo_tree_remove_legacy_commands = 1
-			vim.fn.sign_define("DiagnosticSignError", { text = " ", texthl = "DiagnosticSignError" })
-			vim.fn.sign_define("DiagnosticSignWarn", { text = " ", texthl = "DiagnosticSignWarn" })
-			vim.fn.sign_define("DiagnosticSignInfo", { text = " ", texthl = "DiagnosticSignInfo" })
-			vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
-		end,
-	},
 	{
 		"lewis6991/gitsigns.nvim",
 		event = "BufReadPre",
@@ -119,6 +84,7 @@ return {
 								["<C-s>"] = fb_actions.toggle_all,
 								["<C-h>"] = fb_actions.toggle_hidden,
 								["<C-g>"] = fb_actions.goto_parent_dir,
+								["<C-f>"] = fb_actions.toggle_browser,
 							},
 						},
 					},
@@ -161,9 +127,7 @@ return {
 			},
 			{
 				"<leader>fe",
-				function()
-					require("telescope").extensions.file_browser.file_browser()
-				end,
+				":Telescope file_browser path=%:p:h select_buffer=true<CR>",
 				desc = "File browser",
 			},
 		},
@@ -239,31 +203,31 @@ return {
 		opts = {},
 		keys = {
 			{
-				"<leader>gn",
+				"<leader>sn",
 				mode = { "n", "x", "o" },
 				function()
 					require("flash").jump()
 				end,
 				desc = "Jump",
 			},
 			{
-				"<leader>gt",
+				"<leader>st",
 				mode = { "n", "o", "x" },
 				function()
 					require("flash").treesitter()
 				end,
 				desc = "Jump to treesitter node",
 			},
 			{
-				"<leader>gm",
+				"<leader>sm",
 				mode = "o",
 				function()
 					require("flash").remote()
 				end,
 				desc = "Remote operator",
 			},
 			{
-				"<leader>gr",
+				"<leader>sr",
 				mode = { "n", "o", "x" },
 				function()
 					require("flash").treesitter_search()

home/features/neovim/lua/plugins/lsp.lua

@@ -1,9 +1,9 @@
-function on_attach(on_attach)
+function on_attach(fn)
 	vim.api.nvim_create_autocmd("LspAttach", {
 		callback = function(args)
 			local buffer = args.buf
 			local client = vim.lsp.get_client_by_id(args.data.client_id)
-			on_attach(client, buffer)
+			fn(client, buffer)
 		end,
 	})
 end
@@ -131,8 +131,6 @@ return {
 				if client.server_capabilities.documentSymbolProvider then
 					require("nvim-navic").attach(client, buf)
 				end
-
-				vim.cmd([[cabbrev wq execute "Format sync" <bar> wq]])
 			end)
 
 			for server, server_opts in pairs(opts.servers) do

home/features/neovim/lua/plugins/treesitter.lua

@@ -39,15 +39,39 @@ return {
 		},
 		incremental_selection = {
 			enable = true,
-			keymaps = {
-				init_selection = "<leader>ss",
-				node_incremental = "<leader>sn",
-				scope_incremental = "<leader>sc",
-				node_decremental = "<leader>sd",
-			},
 		},
 	},
 	config = function(_, opts)
 		require("nvim-treesitter.configs").setup(opts)
 	end,
+	keys = {
+		{
+			"<leader>ss",
+			function()
+				require("nvim-treesitter.incremental_selection").init_selection()
+			end,
+			desc = "Start incremental selection",
+		},
+		{
+			"<leader>si",
+			function()
+				require("nvim-treesitter.incremental_selection").node_incremental()
+			end,
+			desc = "Incremental selection for node",
+		},
+		{
+			"<leader>sc",
+			function()
+				require("nvim-treesitter.incremental_selection").scope_incremental()
+			end,
+			desc = "Incremental selection for scope",
+		},
+		{
+			"<leader>sd",
+			function()
+				require("nvim-treesitter.incremental_selection").node_decremental()
+			end,
+			desc = "Decremental selection for node",
+		},
+	},
 }