From ad9eb6ca0a6fe3dc12c93e534e7f7aef055a4860 Mon Sep 17 00:00:00 2001
From: ChristianChiarulli <chris.machine@pm.me>
Date: Thu, 4 Nov 2021 15:37:14 -0400
Subject: feat: (kind, abbr, menu) cmp format

---
 lua/lvim/core/cmp.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lua/lvim/core')

diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index 68c695cb..375f7605 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -169,6 +169,7 @@ M.config = function()
       native_menu = false,
     },
     formatting = {
+      fields = { "kind", "abbr", "menu" },
       kind_icons = {
         Class = " ",
         Color = " ",
-- 
cgit v1.2.3


From f3d9ef138df7f531434ce3ff37fcd379517d8640 Mon Sep 17 00:00:00 2001
From: ChristianChiarulli <chris.machine@pm.me>
Date: Thu, 4 Nov 2021 15:49:41 -0400
Subject: fix: make telescope default mappings overrideable

---
 lua/lvim/core/telescope.lua | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lua/lvim/core')

diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua
index 7911d433..7a5315dd 100644
--- a/lua/lvim/core/telescope.lua
+++ b/lua/lvim/core/telescope.lua
@@ -8,6 +8,7 @@ function M.config()
     on_config_done = nil,
   }
 
+  local actions = require "telescope.actions"
   lvim.builtin.telescope = vim.tbl_extend("force", lvim.builtin.telescope, {
     defaults = {
       prompt_prefix = " ",
@@ -33,6 +34,22 @@ function M.config()
         "--smart-case",
         "--hidden",
       },
+      mappings = {
+        i = {
+          ["<C-n>"] = actions.move_selection_next,
+          ["<C-p>"] = actions.move_selection_previous,
+          ["<C-c>"] = actions.close,
+          ["<C-j>"] = actions.cycle_history_next,
+          ["<C-k>"] = actions.cycle_history_prev,
+          ["<C-q>"] = actions.smart_send_to_qflist + actions.open_qflist,
+          ["<CR>"] = actions.select_default + actions.center,
+        },
+        n = {
+          ["<C-n>"] = actions.move_selection_next,
+          ["<C-p>"] = actions.move_selection_previous,
+          ["<C-q>"] = actions.smart_send_to_qflist + actions.open_qflist,
+        },
+      },
       file_ignore_patterns = {},
       path_display = { shorten = 5 },
       winblend = 0,
-- 
cgit v1.2.3


From 6b3e0574a3d2577f8c0558144202ba12f3978cae Mon Sep 17 00:00:00 2001
From: ChristianChiarulli <chris.machine@pm.me>
Date: Thu, 4 Nov 2021 22:50:19 -0400
Subject: fix: pcall telescope actions

---
 lua/lvim/core/telescope.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lua/lvim/core')

diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua
index 7a5315dd..147c056c 100644
--- a/lua/lvim/core/telescope.lua
+++ b/lua/lvim/core/telescope.lua
@@ -2,13 +2,17 @@ local M = {}
 
 function M.config()
   -- Define this minimal config so that it's available if telescope is not yet available.
+
   lvim.builtin.telescope = {
     ---@usage disable telescope completely [not recommeded]
     active = true,
     on_config_done = nil,
   }
 
-  local actions = require "telescope.actions"
+  local ok, actions = pcall(require, "telescope.actions")
+  if not ok then
+    return
+  end
   lvim.builtin.telescope = vim.tbl_extend("force", lvim.builtin.telescope, {
     defaults = {
       prompt_prefix = " ",
-- 
cgit v1.2.3


From e193d6aed5ef854e613e7044b44be414a085cf03 Mon Sep 17 00:00:00 2001
From: Christian Chiarulli <chris.machine@pm.me>
Date: Fri, 5 Nov 2021 22:15:10 +0000
Subject: feat: enable context commentstring by default (#1904)

---
 lua/lvim/core/treesitter.lua | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'lua/lvim/core')

diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/treesitter.lua
index 9c6c555e..8dbbcacb 100644
--- a/lua/lvim/core/treesitter.lua
+++ b/lua/lvim/core/treesitter.lua
@@ -16,8 +16,17 @@ M.config = function()
       disable = { "latex" },
     },
     context_commentstring = {
-      enable = false,
-      config = { css = "// %s" },
+      enable = true,
+      config = {
+        -- Languages that have a single comment style
+        typescript = "// %s",
+        css = "/* %s */",
+        scss = "/* %s */",
+        html = "<!-- %s -->",
+        svelte = "<!-- %s -->",
+        vue = "<!-- %s -->",
+        json = "",
+      },
     },
     -- indent = {enable = true, disable = {"python", "html", "javascript"}},
     -- TODO seems to be broken
-- 
cgit v1.2.3