mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-20 18:45:08 +02:00
Merge branch 'rolling'
This commit is contained in:
commit
a1ffa3c945
5 changed files with 10 additions and 26 deletions
|
@ -22,20 +22,6 @@ local function feedkeys(key, mode)
|
|||
end
|
||||
M.methods.feedkeys = feedkeys
|
||||
|
||||
---checks if emmet_ls is available and active in the buffer
|
||||
---@return boolean true if available, false otherwise
|
||||
local is_emmet_active = function()
|
||||
local clients = vim.lsp.buf_get_clients()
|
||||
|
||||
for _, client in pairs(clients) do
|
||||
if client.name == "emmet_ls" then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
M.methods.is_emmet_active = is_emmet_active
|
||||
|
||||
---when inside a snippet, seeks to the nearest luasnip field if possible, and checks if it is jumpable
|
||||
---@param dir number 1 for forward, -1 for backward; defaults to 1
|
||||
---@return boolean true if a jumpable luasnip field is found while inside a snippet
|
||||
|
@ -257,7 +243,6 @@ M.config = function()
|
|||
["<C-j>"] = cmp.mapping.select_next_item(),
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
-- TODO: potentially fix emmet nonsense
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
|
@ -267,8 +252,6 @@ M.config = function()
|
|||
luasnip.jump(1)
|
||||
elseif check_backspace() then
|
||||
fallback()
|
||||
elseif is_emmet_active() then
|
||||
return vim.fn["cmp#complete"]()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
|
|
|
@ -68,9 +68,10 @@ function M.config()
|
|||
indent_markers = {
|
||||
enable = false,
|
||||
icons = {
|
||||
corner = "└ ",
|
||||
edge = "│ ",
|
||||
none = " ",
|
||||
corner = "└",
|
||||
edge = "│",
|
||||
item = "│",
|
||||
none = " ",
|
||||
},
|
||||
},
|
||||
icons = {
|
||||
|
|
|
@ -41,7 +41,10 @@ function M.config()
|
|||
end
|
||||
|
||||
function M.setup()
|
||||
local project = require "project_nvim"
|
||||
local status_ok, project = pcall(require, "project_nvim")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
|
||||
project.setup(lvim.builtin.project)
|
||||
if lvim.builtin.project.on_config_done then
|
||||
|
|
|
@ -37,9 +37,9 @@ end
|
|||
-- which seems to occur only when attaching to single-files
|
||||
local function client_is_configured(server_name, ft)
|
||||
ft = ft or vim.bo.filetype
|
||||
local active_autocmds = vim.split(vim.fn.execute("autocmd FileType " .. ft), "\n")
|
||||
local active_autocmds = vim.api.nvim_get_autocmds { event = "FileType", pattern = ft }
|
||||
for _, result in ipairs(active_autocmds) do
|
||||
if result:match(server_name) then
|
||||
if result.command:match(server_name) then
|
||||
Log:debug(string.format("[%q] is already configured", server_name))
|
||||
return true
|
||||
end
|
||||
|
|
|
@ -217,9 +217,6 @@ function setup_lvim() {
|
|||
$exampleConfig = "$env:LUNARVIM_BASE_DIR\utils\installer\config_win.example.lua"
|
||||
Copy-Item -Force "$exampleConfig" "$env:LUNARVIM_CONFIG_DIR\config.lua"
|
||||
|
||||
# FIXME: this has never worked
|
||||
# Invoke-Expression "$INSTALL_PREFIX\bin\lvim.ps1 --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'"
|
||||
|
||||
Write-Host "Make sure to run `:PackerSync` at first launch" -ForegroundColor Green
|
||||
|
||||
create_alias
|
||||
|
|
Loading…
Reference in a new issue