diff options
| author | kylo252 <[email protected]> | 2022-01-24 13:02:19 +0100 |
|---|---|---|
| committer | kylo252 <[email protected]> | 2022-01-24 13:02:19 +0100 |
| commit | 0cdf7e2e5ddd30fa677fd422ea1052110b42b27d (patch) | |
| tree | d96d137fdfac2c65947fa037e4634362e1456039 /lua/lvim/core | |
| parent | 440324996c37591be74344b17f8450662dac4759 (diff) | |
| parent | 25e8b2234915f7862d1c6fcd9477b0c1b1ea1bf4 (diff) | |
Merge branch 'rolling'
Diffstat (limited to 'lua/lvim/core')
| -rw-r--r-- | lua/lvim/core/autopairs.lua | 20 | ||||
| -rw-r--r-- | lua/lvim/core/log.lua | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/autopairs.lua index 15c17032..4d9f33f4 100644 --- a/lua/lvim/core/autopairs.lua +++ b/lua/lvim/core/autopairs.lua @@ -49,7 +49,6 @@ end M.setup = function() local autopairs = require "nvim-autopairs" local Rule = require "nvim-autopairs.rule" - local cond = require "nvim-autopairs.conds" autopairs.setup { check_ts = lvim.builtin.autopairs.check_ts, @@ -66,25 +65,6 @@ M.setup = function() fast_wrap = lvim.builtin.autopairs.fast_wrap, } - autopairs.add_rule(Rule("$$", "$$", "tex")) - autopairs.add_rules { - Rule("$", "$", { "tex", "latex" }) -- don't add a pair if the next character is % - :with_pair(cond.not_after_regex_check "%%") -- don't add a pair if the previous character is xxx - :with_pair(cond.not_before_regex_check("xxx", 3)) -- don't move right when repeat character - :with_move(cond.none()) -- don't delete if the next character is xx - :with_del(cond.not_after_regex_check "xx") -- disable add newline when press <cr> - :with_cr(cond.none()), - } - autopairs.add_rules { - Rule("$$", "$$", "tex"):with_pair(function(opts) - print(vim.inspect(opts)) - if opts.line == "aa $$" then - -- don't add pair on that line - return false - end - end), - } - require("nvim-treesitter.configs").setup { autopairs = { enable = true } } local ts_conds = require "nvim-autopairs.ts-conds" diff --git a/lua/lvim/core/log.lua b/lua/lvim/core/log.lua index be7930ba..e5a6d5db 100644 --- a/lua/lvim/core/log.lua +++ b/lua/lvim/core/log.lua @@ -36,7 +36,7 @@ function Log:init() { level = structlog.formatters.FormatColorizer.color_level() } ), }), - structlog.sinks.File(Log.levels.TRACE, logfile, { + structlog.sinks.File(log_level, logfile, { processors = { structlog.processors.Namer(), structlog.processors.StackWriter({ "line", "file" }, { max_parents = 3, stack_level = 2 }), |