refactor: move 0.9 stuff to a compat layer. Cleaner this way

This commit is contained in:
Folke Lemaitre 2024-06-01 20:46:56 +02:00
parent 595069d501
commit 8024201e75
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
5 changed files with 61 additions and 48 deletions

View file

@ -95,8 +95,7 @@ return {
},
-- snippets
vim.fn.has("nvim-0.10") == 1
and {
{
"nvim-cmp",
dependencies = {
{
@ -135,8 +134,7 @@ return {
mode = { "i", "s" },
},
},
}
or { import = "lazyvim.plugins.extras.coding.luasnip", enabled = vim.fn.has("nvim-0.10") == 0 },
},
-- auto pairs
{
@ -168,11 +166,6 @@ return {
"folke/ts-comments.nvim",
event = "VeryLazy",
opts = {},
enabled = vim.fn.has("nvim-0.10") == 1,
},
{
import = "lazyvim.plugins.extras.coding.mini-comment",
enabled = vim.fn.has("nvim-0.10") == 0,
},
-- Better text-objects

View file

@ -0,0 +1,8 @@
return {
{ import = "lazyvim.plugins.extras.coding.luasnip" },
{
"folke/ts-comments.nvim",
enabled = false,
},
{ import = "lazyvim.plugins.extras.coding.mini-comment" },
}

View file

@ -75,7 +75,7 @@ return {
-- mason = false, -- set to false if you don't want this server to be installed with mason
-- Use this to add any additional keymaps
-- for specific lsp servers
---@type LazyKeysSpec[]
-- ---@type LazyKeysSpec[]
-- keys = {},
settings = {
Lua = {

View file

@ -12,9 +12,18 @@ local prios = {
}
---@type string[]
Config.json.data.extras = LazyVim.dedup(Config.json.data.extras)
local extras = LazyVim.dedup(Config.json.data.extras)
table.sort(Config.json.data.extras, function(a, b)
local version = vim.version()
local v = version.major .. "_" .. version.minor
local compat = { "0_9" }
if vim.tbl_contains(compat, v) then
extras[#extras + 1] = "lazyvim.plugins.compat.nvim-" .. v
end
table.sort(extras, function(a, b)
local pa = prios[a] or 10
local pb = prios[b] or 10
if pa == pb then
@ -26,4 +35,4 @@ end)
---@param extra string
return vim.tbl_map(function(extra)
return { import = extra }
end, Config.json.data.extras)
end, extras)

View file

@ -1,4 +1,7 @@
---@meta
---@class LazyVimGlobals
vim.g = {}
_G.lazyvim_docs = true
_G.LazyVim = require("lazyvim.util")