From 83274014adb99c5d27f35bebd6ded47afc7acbd1 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Thu, 10 Mar 2022 14:35:44 +0100
Subject: [PATCH] Adding Comments.nvim

---
 nvim/nvim/config/new/lua/lsp/handlers.lua     |  8 +++---
 nvim/nvim/config/new/lua/plugins.lua          |  6 +++--
 nvim/nvim/config/new/lua/settings.lua         |  9 ++++---
 .../config/new/lua/treesitter/comments.lua    | 26 +++++++++++++++++++
 nvim/nvim/config/new/lua/treesitter/init.lua  |  1 +
 .../nvim/config/new/lua/windows/telescope.lua |  6 +++--
 nvim/nvim/config/new/lua/windows/trouble.lua  |  1 +
 7 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 nvim/nvim/config/new/lua/treesitter/comments.lua

diff --git a/nvim/nvim/config/new/lua/lsp/handlers.lua b/nvim/nvim/config/new/lua/lsp/handlers.lua
index 04cc8ff..668e042 100644
--- a/nvim/nvim/config/new/lua/lsp/handlers.lua
+++ b/nvim/nvim/config/new/lua/lsp/handlers.lua
@@ -2,10 +2,10 @@ local M = {}
 
 M.setup = function()
 	local signs = {
-		{ name = "DiagnosticSignError", text = "" },
-		{ name = "DiagnosticSignWarn", text = "" },
-		{ name = "DiagnosticSignInfo", text = "" },
-		{ name = "DiagnosticSignHint", text = "" },
+		{ name = "DiagnosticSignError", text = "" },
+		{ name = "DiagnosticSignWarn", text = "" },
+		{ name = "DiagnosticSignHint", text = "" },
+		{ name = "DiagnosticSignInfo", text =  "" },
 	}
 	for _, sign in ipairs(signs) do
 		vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
diff --git a/nvim/nvim/config/new/lua/plugins.lua b/nvim/nvim/config/new/lua/plugins.lua
index c72c640..1f2ef7a 100644
--- a/nvim/nvim/config/new/lua/plugins.lua
+++ b/nvim/nvim/config/new/lua/plugins.lua
@@ -44,7 +44,6 @@ return packer.startup(function(use)
 
 	use "tpope/vim-surround"
 	use "tpope/vim-unimpaired"
-	use "tpope/vim-commentary"
 	use "tpope/vim-speeddating"
 	use "tpope/vim-repeat"
 
@@ -63,7 +62,6 @@ return packer.startup(function(use)
 		'neovim/nvim-lspconfig',
 		'williamboman/nvim-lsp-installer',
 	}
-	use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }
 	use {
 		"hrsh7th/cmp-nvim-lsp",
 		"hrsh7th/cmp-buffer",
@@ -73,6 +71,10 @@ return packer.startup(function(use)
 		"L3MON4D3/LuaSnip",
 	}
 
+	use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }
+	use "numToStr/Comment.nvim"
+	use "JoosepAlviste/nvim-ts-context-commentstring"
+
 	use { "lukas-reineke/virt-column.nvim", config = function() require("virt-column").setup() end }
 	use "lukas-reineke/indent-blankline.nvim"
 
diff --git a/nvim/nvim/config/new/lua/settings.lua b/nvim/nvim/config/new/lua/settings.lua
index ad3ca90..183924d 100644
--- a/nvim/nvim/config/new/lua/settings.lua
+++ b/nvim/nvim/config/new/lua/settings.lua
@@ -53,12 +53,13 @@ keymap("v", "<", "<gv", opts)
 keymap("v", ">", ">gv", opts)
 
 -- Move in insert mode --
-keymap("i", "<C-j>", "<Down>", opts)
-keymap("i", "<C-k>", "<Up>", opts)
-keymap("i", "<C-h>", "<Left>", opts)
-keymap("i", "<C-l>", "<Right>", opts)
+keymap("i", "<A-j>", "<Down>", opts)
+keymap("i", "<A-k>", "<Up>", opts)
+keymap("i", "<A-h>", "<Left>", opts)
+keymap("i", "<A-l>", "<Right>", opts)
 
 keymap("i", "<C-BS>", "<C-w>", opts)
+keymap("i", "<C-H>", "<C-w>", opts) -- Keymap for CTRL-BACKSPACE on some termial emulators.
 
 vim.cmd [[ augroup highlight_yank
 	autocmd!
diff --git a/nvim/nvim/config/new/lua/treesitter/comments.lua b/nvim/nvim/config/new/lua/treesitter/comments.lua
new file mode 100644
index 0000000..7df1076
--- /dev/null
+++ b/nvim/nvim/config/new/lua/treesitter/comments.lua
@@ -0,0 +1,26 @@
+local status_ok, comment = pcall(require, "Comment")
+if not status_ok then
+	return
+end
+
+comment.setup({
+	pre_hook = function(ctx)
+		local U = require "Comment.utils"
+
+		local location = nil
+		if ctx.ctype == U.ctype.block then
+			location = require("ts_context_commentstring.utils").get_cursor_location()
+		elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then
+			location = require("ts_context_commentstring.utils").get_visual_start_location()
+		end
+
+		return require("ts_context_commentstring.internal").calculate_commentstring {
+			key = ctx.ctype == U.ctype.line and "__default" or "__multiline",
+			location = location,
+		}
+	end,
+	ignore = '^$',
+	padding = true,
+	sticky = true,
+})
+
diff --git a/nvim/nvim/config/new/lua/treesitter/init.lua b/nvim/nvim/config/new/lua/treesitter/init.lua
index 6b02ecc..f618346 100644
--- a/nvim/nvim/config/new/lua/treesitter/init.lua
+++ b/nvim/nvim/config/new/lua/treesitter/init.lua
@@ -1,3 +1,4 @@
 require "treesitter.treesitter"
 require "treesitter.indent-line"
+require "treesitter.comments"
 
diff --git a/nvim/nvim/config/new/lua/windows/telescope.lua b/nvim/nvim/config/new/lua/windows/telescope.lua
index 9fb8de3..f229a8b 100644
--- a/nvim/nvim/config/new/lua/windows/telescope.lua
+++ b/nvim/nvim/config/new/lua/windows/telescope.lua
@@ -19,10 +19,12 @@ telescope.setup({
 		path_display = { "truncate" },
 		mappings = {
 			i = {
-				["<CR>"] = actions.file_edit
+				["<CR>"] = actions.file_edit,
+				["<A-k>"] = actions.move_selection_previous,
+				["<A-j>"] = actions.move_selection_next,
 			},
 			n = {
-				["<CR>"] = actions.file_edit
+				["<CR>"] = actions.file_edit,
 			},
 		},
 	},
diff --git a/nvim/nvim/config/new/lua/windows/trouble.lua b/nvim/nvim/config/new/lua/windows/trouble.lua
index e8cebbe..7df40fc 100644
--- a/nvim/nvim/config/new/lua/windows/trouble.lua
+++ b/nvim/nvim/config/new/lua/windows/trouble.lua
@@ -12,6 +12,7 @@ wk.register({
 	l = {
 		d = { "<cmd>Trouble document_diagnostics<cr>", "Document Diagnostics" },
 		w = { "<cmd>Trouble workspace_diagnostics<cr>", "Workspace Diagnostics" },
+		t = { "<cmd>TroubleToggle<CR>", "Toogle trouble window" },
 	},
 }, {
 	prefix = "<leader>",