Merge branch 'rolling'

This commit is contained in:
kylo252 2022-01-24 13:02:19 +01:00
commit 0cdf7e2e5d
9 changed files with 26 additions and 47 deletions

View file

@ -33,10 +33,10 @@ body:
- type: input - type: input
id: nvim-version id: nvim-version
attributes: attributes:
label: Neovim version (>= 0.6) label: Neovim version (>= 0.6.1)
description: "Output of `nvim --version`" description: "Output of `nvim --version`"
placeholder: | placeholder: |
NVIM v0.6.0-dev+209-g0603eba6e NVIM v0.7-dev+209-g0603eba6e
Build type: Release Build type: Release
LuaJIT 2.1.0-beta3 LuaJIT 2.1.0-beta3
validations: validations:

View file

@ -27,10 +27,10 @@ body:
- type: input - type: input
id: nvim-version id: nvim-version
attributes: attributes:
label: Neovim version (>= 0.6) label: Neovim version (>= 0.6.1)
description: "Output of `nvim --version`" description: "Output of `nvim --version`"
placeholder: | placeholder: |
NVIM v0.6.0-dev+209-g0603eba6e NVIM v0.7-dev+209-g0603eba6e
Build type: Release Build type: Release
LuaJIT 2.1.0-beta3 LuaJIT 2.1.0-beta3
validations: validations:

View file

@ -26,7 +26,7 @@ You can find all the documentation for LunarVim at [lunarvim.org](https://www.lu
## Install In One Command! ## Install In One Command!
Make sure you have the release version of Neovim (0.6). Make sure you have the release version of Neovim (0.6.1+).
```bash ```bash
bash <(curl -s https://raw.githubusercontent.com/lunarvim/lunarvim/master/utils/installer/install.sh) bash <(curl -s https://raw.githubusercontent.com/lunarvim/lunarvim/master/utils/installer/install.sh)

View file

@ -1,7 +1,7 @@
local M = {} local M = {}
if vim.fn.has "nvim-0.6" ~= 1 then if vim.fn.has "nvim-0.6.1" ~= 1 then
vim.notify("Please upgrade your Neovim base installation. Lunarvim requires v0.6+", vim.log.levels.WARN) vim.notify("Please upgrade your Neovim base installation. Lunarvim requires v0.6.1+", vim.log.levels.WARN)
vim.wait(5000, function() vim.wait(5000, function()
return false return false
end) end)

View file

@ -49,7 +49,6 @@ end
M.setup = function() M.setup = function()
local autopairs = require "nvim-autopairs" local autopairs = require "nvim-autopairs"
local Rule = require "nvim-autopairs.rule" local Rule = require "nvim-autopairs.rule"
local cond = require "nvim-autopairs.conds"
autopairs.setup { autopairs.setup {
check_ts = lvim.builtin.autopairs.check_ts, check_ts = lvim.builtin.autopairs.check_ts,
@ -66,25 +65,6 @@ M.setup = function()
fast_wrap = lvim.builtin.autopairs.fast_wrap, 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 } } require("nvim-treesitter.configs").setup { autopairs = { enable = true } }
local ts_conds = require "nvim-autopairs.ts-conds" local ts_conds = require "nvim-autopairs.ts-conds"

View file

@ -36,7 +36,7 @@ function Log:init()
{ level = structlog.formatters.FormatColorizer.color_level() } { level = structlog.formatters.FormatColorizer.color_level() }
), ),
}), }),
structlog.sinks.File(Log.levels.TRACE, logfile, { structlog.sinks.File(log_level, logfile, {
processors = { processors = {
structlog.processors.Namer(), structlog.processors.Namer(),
structlog.processors.StackWriter({ "line", "file" }, { max_parents = 3, stack_level = 2 }), structlog.processors.StackWriter({ "line", "file" }, { max_parents = 3, stack_level = 2 }),

View file

@ -73,6 +73,7 @@ return {
"emmet_ls", "emmet_ls",
"eslint", "eslint",
"eslintls", "eslintls",
"golangci_lint_ls",
"grammarly", "grammarly",
"graphql", "graphql",
"jedi_language_server", "jedi_language_server",

View file

@ -8,32 +8,32 @@ local commit = {
dapinstall = "568d946a99edb6780912cb39ca68c368516cd853", dapinstall = "568d946a99edb6780912cb39ca68c368516cd853",
dashboard_nvim = "d82ddae95fd4dc4c3b7bbe87f09b1840fbf20ecb", dashboard_nvim = "d82ddae95fd4dc4c3b7bbe87f09b1840fbf20ecb",
fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e", fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e",
friendly_snippets = "d4f5c0507cfe4c67024f58c84ba982f7f5c71a7a", friendly_snippets = "a8efb538f4be58b4f4586bc964f9f10496c05e31",
gitsigns = "f4648dcc055a10573f36e83343592824155ab466", gitsigns = "f43cee333fdfeb27aae86bab73a38c5885d5c7f4",
lua_dev = "03a44ec6a54b0a025a633978e8541584a02e46d9", lua_dev = "a0ee77789d9948adce64d98700cc90cecaef88d5",
lualine = "70691ae350fdbe1f15758e3b8e2973742a7967a9", lualine = "70691ae350fdbe1f15758e3b8e2973742a7967a9",
luasnip = "0222ee63c9e4b80e6000d064f8efd8edcc6d0c48", luasnip = "0222ee63c9e4b80e6000d064f8efd8edcc6d0c48",
nlsp_settings = "3a3942b5d1da30e3ca0dc431aada3191c5952054", nlsp_settings = "3a3942b5d1da30e3ca0dc431aada3191c5952054",
null_ls = "afd9a999fa29077e12b7284cf11dff37972fbce5", null_ls = "0adceda4fb3fdd25ff015e68ebe176268b12bb2c",
nvim_autopairs = "97e454ce9b1371373105716d196c1017394bc947", nvim_autopairs = "97e454ce9b1371373105716d196c1017394bc947",
nvim_cmp = "4c0a6512a0f8a235213959badf70031b9fa0220a", nvim_cmp = "7cb14b0c0f926e3cd5ac4d2e19634f82534c9d3c",
nvim_dap = "08349ab5da2148965deb2e778065017059bff584", nvim_dap = "c9a58267524f560112ecb6faa36ab2b5bc2f78a3",
nvim_lsp_installer = "9894db12783fdd02be909cdd60e6d0fc20b9e46e", nvim_lsp_installer = "cc34adb58de9e5a42af730c97ec04fc500bb5e63",
nvim_lspconfig = "09130804eb27fd31539922967d14c28388765ae4", nvim_lspconfig = "ea29110765cb42e842dc8372c793a6173d89b0c4",
nvim_notify = "15f52efacd169ea26b0f4070451d3ea53f98cd5a", nvim_notify = "15f52efacd169ea26b0f4070451d3ea53f98cd5a",
nvim_tree = "0a2f6b0b6ba558a88c77a6b262af647760e6eca8", nvim_tree = "0a2f6b0b6ba558a88c77a6b262af647760e6eca8",
nvim_treesitter = "723d91e8217ae66ea75f809f404d801ed939f497", nvim_treesitter = "9e90866bcea3e392126c4eb90fde56b1c0b56b69",
nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f", nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f",
nvim_web_devicons = "ac71ca88b1136e1ecb2aefef4948130f31aa40d1", nvim_web_devicons = "634e26818f2bea9161b7efa76735746838971824",
packer = "851c62c5ecd3b5adc91665feda8f977e104162a5", packer = "7182f0ddbca2dd6f6723633a84d47f4d26518191",
plenary = "563d9f6d083f0514548f2ac4ad1888326d0a1c66", plenary = "563d9f6d083f0514548f2ac4ad1888326d0a1c66",
popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac", popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac",
project = "71d0e23dcfc43cfd6bb2a97dc5a7de1ab47a6538", project = "cef52b8da07648b750d7f1e8fb93f12cb9482988",
structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1", structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1",
telescope = "0011b1148d3975600f5a9f0be8058cdaac4e30d9", telescope = "0011b1148d3975600f5a9f0be8058cdaac4e30d9",
telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954", telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954",
toggleterm = "f23866b8fbb0703be4e15d50c814ffe496242a67", toggleterm = "f23866b8fbb0703be4e15d50c814ffe496242a67",
which_key = "387fd676d3f9b419d38890820f6e262dc0fadb46", which_key = "28d2bd129575b5e9ebddd88506601290bb2bb221",
} }
return { return {
@ -120,11 +120,9 @@ return {
commit = commit.cmp_path, commit = commit.cmp_path,
}, },
{ {
-- "folke/lua-dev.nvim", "folke/lua-dev.nvim",
"kylo252/lua-dev.nvim",
branch = "fix-on-new-config",
module = "lua-dev", module = "lua-dev",
-- commit = commit.lua_dev, commit = commit.lua_dev,
}, },
-- Autopairs -- Autopairs

View file

@ -171,11 +171,11 @@ function print_missing_dep_msg() {
} }
function check_neovim_min_version() { function check_neovim_min_version() {
local verify_version_cmd='if !has("nvim-0.6.0") | cquit | else | quit | endif' local verify_version_cmd='if !has("nvim-0.6.1") | cquit | else | quit | endif'
# exit with an error if min_version not found # exit with an error if min_version not found
if ! nvim --headless -u NONE -c "$verify_version_cmd"; then if ! nvim --headless -u NONE -c "$verify_version_cmd"; then
echo "[ERROR]: LunarVim requires at least Neovim v0.6.0 or higher" echo "[ERROR]: LunarVim requires at least Neovim v0.6.1 or higher"
exit 1 exit 1
fi fi
} }