From c81e64dd0f0502f79b14fe2430d7d442f347fd85 Mon Sep 17 00:00:00 2001 From: wongxy Date: Mon, 20 May 2024 17:20:05 +0800 Subject: [PATCH] refactor(lua): move autocmds,filetype to runtime/modules (#1990) --- runtime/lua/vscode-neovim.lua | 4 ---- runtime/lua/vscode-neovim/autocmds.lua | 13 ------------- runtime/lua/vscode-neovim/filetype.lua | 20 -------------------- runtime/modules/filetype.lua | 14 ++++++++++++++ runtime/modules/integrations.lua | 10 ++++++++++ 5 files changed, 24 insertions(+), 37 deletions(-) delete mode 100644 runtime/lua/vscode-neovim/autocmds.lua delete mode 100644 runtime/lua/vscode-neovim/filetype.lua create mode 100644 runtime/modules/filetype.lua create mode 100644 runtime/modules/integrations.lua diff --git a/runtime/lua/vscode-neovim.lua b/runtime/lua/vscode-neovim.lua index 0ad3e6c3d..551131258 100644 --- a/runtime/lua/vscode-neovim.lua +++ b/runtime/lua/vscode-neovim.lua @@ -3,15 +3,11 @@ local api = require("vscode-neovim.api") local default_optons = require("vscode-neovim.default-options") local cursor = require("vscode-neovim.cursor") local highlight = require("vscode-neovim.highlight") -local filetype = require("vscode-neovim.filetype") -local autocmds = require("vscode-neovim.autocmds") local sync_options = require("vscode-neovim.sync-options") default_optons.setup() cursor.setup() highlight.setup() -filetype.setup() -autocmds.setup() sync_options.setup() local vscode = { diff --git a/runtime/lua/vscode-neovim/autocmds.lua b/runtime/lua/vscode-neovim/autocmds.lua deleted file mode 100644 index 3bd27f358..000000000 --- a/runtime/lua/vscode-neovim/autocmds.lua +++ /dev/null @@ -1,13 +0,0 @@ -local function setup() - local group = vim.api.nvim_create_augroup("VSCodeCloseCompletionWidgets", { clear = true }) - vim.api.nvim_create_autocmd("InsertLeave", { - group = group, - callback = function() - vim.fn.VSCodeNotify("hideSuggestWidget") - vim.fn.VSCodeNotify("closeParameterHints") - vim.fn.VSCodeNotify("editor.action.inlineSuggest.hide") - end, - }) -end - -return { setup = setup } diff --git a/runtime/lua/vscode-neovim/filetype.lua b/runtime/lua/vscode-neovim/filetype.lua deleted file mode 100644 index ff83ade3f..000000000 --- a/runtime/lua/vscode-neovim/filetype.lua +++ /dev/null @@ -1,20 +0,0 @@ -local M = {} - -function M.setup() - vim.filetype.add({ - pattern = { - -- To ensure that the user's fallback pattern is not overridden. - [".*.*.*"] = { - priority = -math.huge, - function(_, bufnr) - local name = vim.api.nvim_buf_get_name(bufnr) - if name:match("vscode%-notebook%-cell") then - return "python" - end - end, - }, - }, - }) -end - -return M diff --git a/runtime/modules/filetype.lua b/runtime/modules/filetype.lua new file mode 100644 index 000000000..2f53d6522 --- /dev/null +++ b/runtime/modules/filetype.lua @@ -0,0 +1,14 @@ +vim.filetype.add({ + pattern = { + -- To ensure that the user's fallback pattern is not overridden. + [".*.*.*"] = { + priority = -math.huge, + function(_, bufnr) + local name = vim.api.nvim_buf_get_name(bufnr) + if name:match("vscode%-notebook%-cell") then + return "python" + end + end, + }, + }, +}) diff --git a/runtime/modules/integrations.lua b/runtime/modules/integrations.lua new file mode 100644 index 000000000..dbfd70fde --- /dev/null +++ b/runtime/modules/integrations.lua @@ -0,0 +1,10 @@ +local code = require("vscode-neovim") + +vim.api.nvim_create_autocmd("InsertLeave", { + group = vim.api.nvim_create_augroup("VSCodeCloseCompletionWidgets", { clear = true }), + callback = function() + code.action("hideSuggestWidget") + code.action("closeParameterHints") + code.action("editor.action.inlineSuggest.hide") + end, +})