From 2ba566b0d820977323f48cbdcc2b3b307b882204 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 10:48:15 -0400 Subject: feat: add indentlines (#3056) --- lua/lvim/core/indentlines.lua | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 lua/lvim/core/indentlines.lua (limited to 'lua/lvim/core/indentlines.lua') diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua new file mode 100644 index 00000000..5d51a313 --- /dev/null +++ b/lua/lvim/core/indentlines.lua @@ -0,0 +1,43 @@ +local M = {} + +M.config = function() + vim.g.indent_blankline_buftype_exclude = { "terminal", "nofile" } + vim.g.indent_blankline_filetype_exclude = { + "help", + "startify", + "dashboard", + "packer", + "neogitstatus", + "NvimTree", + "Trouble", + "text", + } + vim.g.indentLine_enabled = 1 + vim.g.indent_blankline_char = "▏" + vim.g.indent_blankline_show_trailing_blankline_indent = false + vim.g.indent_blankline_show_first_indent_level = true + vim.g.indent_blankline_use_treesitter = false + vim.g.indent_blankline_show_current_context = true + lvim.builtin.indentlines = { + active = true, + on_config_done = nil, + options = { + show_current_context = true, + }, + } +end + +M.setup = function() + local status_ok, indent_blankline = pcall(require, "indent_blankline") + if not status_ok then + return + end + + indent_blankline.configure(lvim.builtin.indentlines.options) + + if lvim.builtin.indentlines.on_config_done then + lvim.builtin.indentlines.on_config_done() + end +end + +return M -- cgit v1.2.3 From 03156e42acde5b2e40c5245b8720450a4c5d25ba Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 11:09:11 -0400 Subject: Indentlines (#3057) --- lua/lvim/core/indentlines.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/core/indentlines.lua') diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua index 5d51a313..3039dd77 100644 --- a/lua/lvim/core/indentlines.lua +++ b/lua/lvim/core/indentlines.lua @@ -33,7 +33,7 @@ M.setup = function() return end - indent_blankline.configure(lvim.builtin.indentlines.options) + indent_blankline.setup(lvim.builtin.indentlines.options) if lvim.builtin.indentlines.on_config_done then lvim.builtin.indentlines.on_config_done() -- cgit v1.2.3 From 538fbd6f686905547c3fa26354611221429715f8 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Wed, 21 Sep 2022 23:14:08 +0430 Subject: fix(indentblankline): make sure to use the new syntax for all options (#3058) --- lua/lvim/core/indentlines.lua | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'lua/lvim/core/indentlines.lua') diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua index 3039dd77..37be1e22 100644 --- a/lua/lvim/core/indentlines.lua +++ b/lua/lvim/core/indentlines.lua @@ -1,27 +1,26 @@ local M = {} M.config = function() - vim.g.indent_blankline_buftype_exclude = { "terminal", "nofile" } - vim.g.indent_blankline_filetype_exclude = { - "help", - "startify", - "dashboard", - "packer", - "neogitstatus", - "NvimTree", - "Trouble", - "text", - } - vim.g.indentLine_enabled = 1 - vim.g.indent_blankline_char = "▏" - vim.g.indent_blankline_show_trailing_blankline_indent = false - vim.g.indent_blankline_show_first_indent_level = true - vim.g.indent_blankline_use_treesitter = false - vim.g.indent_blankline_show_current_context = true lvim.builtin.indentlines = { active = true, on_config_done = nil, options = { + enabled = true, + buftype_exclude = { "terminal", "nofile" }, + filetype_exclude = { + "help", + "startify", + "dashboard", + "packer", + "neogitstatus", + "NvimTree", + "Trouble", + "text", + }, + char = "▏", + show_trailing_blankline_indent = false, + show_first_indent_level = false, + use_treesitter = true, show_current_context = true, }, } -- cgit v1.2.3 From 4b0a60e23c0554b1dfa14e80f1e19feffd0204a5 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 14:47:50 -0400 Subject: feat(indentblankline): show first indent level --- lua/lvim/core/indentlines.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/core/indentlines.lua') diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua index 37be1e22..3485f348 100644 --- a/lua/lvim/core/indentlines.lua +++ b/lua/lvim/core/indentlines.lua @@ -19,7 +19,7 @@ M.config = function() }, char = "▏", show_trailing_blankline_indent = false, - show_first_indent_level = false, + show_first_indent_level = true, use_treesitter = true, show_current_context = true, }, -- cgit v1.2.3 From 1c03ac80529d90c7a824a581172b6e41e6ae237b Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Mon, 3 Oct 2022 00:56:23 +0000 Subject: feat: reload and lir color update (#3123) --- lua/lvim/core/indentlines.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/core/indentlines.lua') diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua index 3485f348..ab316a9b 100644 --- a/lua/lvim/core/indentlines.lua +++ b/lua/lvim/core/indentlines.lua @@ -27,7 +27,7 @@ M.config = function() end M.setup = function() - local status_ok, indent_blankline = pcall(require, "indent_blankline") + local status_ok, indent_blankline = pcall(reload, "indent_blankline") if not status_ok then return end -- cgit v1.2.3 From 8767a17b5e6087153494a5cd30e5ae0c5165c9af Mon Sep 17 00:00:00 2001 From: Philippe Richard Date: Sun, 2 Oct 2022 23:48:23 -0400 Subject: feat: move icons to a single icons file (#3115) --- lua/lvim/core/indentlines.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/core/indentlines.lua') diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua index ab316a9b..dc4a72ba 100644 --- a/lua/lvim/core/indentlines.lua +++ b/lua/lvim/core/indentlines.lua @@ -17,7 +17,7 @@ M.config = function() "Trouble", "text", }, - char = "▏", + char = lvim.icons.ui.LineLeft, show_trailing_blankline_indent = false, show_first_indent_level = true, use_treesitter = true, -- cgit v1.2.3