diff --git a/lazy-lock.json b/lazy-lock.json index d28b963..82b28c2 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,5 @@ { "Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" }, - "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, @@ -13,8 +12,6 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" }, - "conform.nvim": { "branch": "master", "commit": "60e6fbddbdf37d7790de07dc7420beefaf650e5e" }, - "crates.nvim": { "branch": "main", "commit": "8437522d12a8c523da2aee9db2979d070b2ecc33" }, "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, @@ -24,12 +21,14 @@ "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "56d42be090e8fcc68eda69cfe55af8c5e562300e" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, - "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" }, "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" }, + "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, @@ -37,7 +36,6 @@ "nvim-dap": { "branch": "master", "commit": "5ba8ceace596360321cf33fa4b56d9d46e057ce9" }, "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, - "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "5ad42234d880659dfe9d4ff936c310cd6c5a1610" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, @@ -45,7 +43,7 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "06563ae0c9928a2df42aefe66f2aed2f2943e32e" }, "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "3e535e826da265748b875b18dbfb361bd1a1701c" }, + "nvim-treesitter": { "branch": "master", "commit": "fa19150d0057b22dde98746680162b9a7ab61d1e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, @@ -54,8 +52,6 @@ "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "12b1a1e095d968887a17ef791c2edb78d7595d46" }, "rest.nvim": { "branch": "main", "commit": "91badd46c60df6bd9800c809056af2d80d33da4c" }, - "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, - "rustaceanvim": { "branch": "master", "commit": "d6d7620b66d74b3b16defcf85cbef7b3582795b3" }, "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" }, "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" }, "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 8b489b2..5511be1 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -45,7 +45,7 @@ pcode.format_timeout_ms = 5000 -- https://github.com/mfussenegger/nvim-lint -- https://github.com/stevearc/conform.nvim -- use conform and nvim-lint if set true -pcode.disable_null_ls = true +pcode.disable_null_ls = false pcode.treesitter_ensure_installed = {} pcode.tscontext = false @@ -161,7 +161,7 @@ pcode.rest_client = true pcode.nvim_dap = true -- not support for windows os (auto config mason-nvim-dap) -- conefig special support test & dap -pcode.active_rust_config = true +pcode.active_rust_config = false pcode.active_javascript_config = { active = false, jest_command = "npm test -- ", diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index a9f8000..a6b7f3c 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -1,132 +1,139 @@ -return { - "stevearc/conform.nvim", - enabled = pcode.disable_null_ls or false, - event = { "BufReadPre", "BufNewFile" }, - opts = function(_, opts) - local mason_reg = require("mason-registry") +local M = {} +local disable = pcode.disable_null_ls or false +if require("user.utils.cfgstatus").cheack() then + disable = true +end +if disable then + M = { + "stevearc/conform.nvim", + event = { "BufReadPre", "BufNewFile" }, + opts = function(_, opts) + local mason_reg = require("mason-registry") - opts.formatters = opts.formatters or {} - opts.formatters_by_ft = opts.formatters_by_ft or {} + opts.formatters = opts.formatters or {} + opts.formatters_by_ft = opts.formatters_by_ft or {} - -- add diff langue vs filetype - local keymap = { - ["c++"] = "cpp", - ["c#"] = "cs", - ["jsx"] = "javascriptreact", - } + -- add diff langue vs filetype + local keymap = { + ["c++"] = "cpp", + ["c#"] = "cs", + ["jsx"] = "javascriptreact", + } - -- add diff conform vs mason - local name_map = { - ["cmakelang"] = "cmake_format", - ["deno"] = "deno_fmt", - ["elm-format"] = "elm_format", - ["gdtoolkit"] = "gdformat", - ["nixpkgs-fmt"] = "nixpkgs_fmt", - ["opa"] = "opa_fmt", - ["php-cs-fixer"] = "php_cs_fixer", - ["ruff"] = "ruff_format", - ["sql-formatter"] = "sql_formatter", - ["xmlformatter"] = "xmlformat", - } + -- add diff conform vs mason + local name_map = { + ["cmakelang"] = "cmake_format", + ["deno"] = "deno_fmt", + ["elm-format"] = "elm_format", + ["gdtoolkit"] = "gdformat", + ["nixpkgs-fmt"] = "nixpkgs_fmt", + ["opa"] = "opa_fmt", + ["php-cs-fixer"] = "php_cs_fixer", + ["ruff"] = "ruff_format", + ["sql-formatter"] = "sql_formatter", + ["xmlformatter"] = "xmlformat", + } - -- add new mapping filetype - local addnew = { - ["jsonc"] = "prettier", - ["json"] = "prettier", - ["typescriptreact"] = "prettier", - } + -- add new mapping filetype + local addnew = { + ["jsonc"] = "prettier", + ["json"] = "prettier", + ["typescriptreact"] = "prettier", + } - -- add ignore filetype - local ignore = { - ["php"] = "tlint", - } + -- add ignore filetype + local ignore = { + ["php"] = "tlint", + } - for _, pkg in pairs(mason_reg.get_installed_packages()) do - for _, type in pairs(pkg.spec.categories) do - -- only act upon a formatter - if type == "Formatter" then - -- if formatter doesn't have a builtin config, create our own from a generic template - if not require("conform").get_formatter_config(pkg.spec.name) then - -- the key of the entry to this table - -- is the name of the bare executable - -- the actual value may not be the absolute path - -- in some cases - local bin = next(pkg.spec.bin) - -- this should be replaced by a function - -- that quieries the configured mason install path - local prefix = vim.fn.stdpath("data") .. "/mason/bin/" + for _, pkg in pairs(mason_reg.get_installed_packages()) do + for _, type in pairs(pkg.spec.categories) do + -- only act upon a formatter + if type == "Formatter" then + -- if formatter doesn't have a builtin config, create our own from a generic template + if not require("conform").get_formatter_config(pkg.spec.name) then + -- the key of the entry to this table + -- is the name of the bare executable + -- the actual value may not be the absolute path + -- in some cases + local bin = next(pkg.spec.bin) + -- this should be replaced by a function + -- that quieries the configured mason install path + local prefix = vim.fn.stdpath("data") .. "/mason/bin/" - opts.formatters[pkg.spec.name] = { - command = prefix .. bin, - args = { "$FILENAME" }, - stdin = true, - require_cwd = false, - } - end + opts.formatters[pkg.spec.name] = { + command = prefix .. bin, + args = { "$FILENAME" }, + stdin = true, + require_cwd = false, + } + end - -- local listtest = {} - -- finally add the formatter to it's compatible filetype(s) - for _, ft in pairs(pkg.spec.languages) do - local ftl = string.lower(ft) - -- register only ready installed package - local ready = mason_reg.get_package(pkg.spec.name):is_installed() - if ready then - if keymap[ftl] ~= nil then - ftl = keymap[ftl] - end - if name_map[pkg.spec.name] ~= nil then - pkg.spec.name = name_map[pkg.spec.name] - end + -- local listtest = {} + -- finally add the formatter to it's compatible filetype(s) + for _, ft in pairs(pkg.spec.languages) do + local ftl = string.lower(ft) + -- register only ready installed package + local ready = mason_reg.get_package(pkg.spec.name):is_installed() + if ready then + if keymap[ftl] ~= nil then + ftl = keymap[ftl] + end + if name_map[pkg.spec.name] ~= nil then + pkg.spec.name = name_map[pkg.spec.name] + end - -- if substring(pkg.spec.name, "prettier") then - -- table.insert(listtest, ftl) - -- end + -- if substring(pkg.spec.name, "prettier") then + -- table.insert(listtest, ftl) + -- end - -- add new mapping language - for key, value in pairs(addnew) do - if value == pkg.spec.name then - opts.formatters_by_ft[key] = opts.formatters_by_ft[key] or {} - table.insert(opts.formatters_by_ft[key], pkg.spec.name) + -- add new mapping language + for key, value in pairs(addnew) do + if value == pkg.spec.name then + opts.formatters_by_ft[key] = opts.formatters_by_ft[key] or {} + table.insert(opts.formatters_by_ft[key], pkg.spec.name) + end + end + + if ignore[ftl] ~= pkg.spec.name then + opts.formatters_by_ft[ftl] = opts.formatters_by_ft[ftl] or {} + table.insert(opts.formatters_by_ft[ftl], pkg.spec.name) end end - - if ignore[ftl] ~= pkg.spec.name then - opts.formatters_by_ft[ftl] = opts.formatters_by_ft[ftl] or {} - table.insert(opts.formatters_by_ft[ftl], pkg.spec.name) - end end + -- print(table.concat(listtest, ",")) end - -- print(table.concat(listtest, ",")) end end - end - local onsave = pcode.format_on_save or false - if onsave then - return { - format_on_save = { + local onsave = pcode.format_on_save or false + if onsave then + return { + format_on_save = { + lsp_fallback = true, + timeout_ms = pcode.format_timeout_ms or 5000, + }, + formatters = opts.formatters, + formatters_by_ft = opts.formatters_by_ft, + } + else + return { + formatters = opts.formatters, + formatters_by_ft = opts.formatters_by_ft, + } + end + end, + config = function(_, opts) + local conform = require("conform") + conform.setup(opts) + vim.keymap.set({ "n", "v" }, "lF", function() + conform.format({ lsp_fallback = true, + async = false, timeout_ms = pcode.format_timeout_ms or 5000, - }, - formatters = opts.formatters, - formatters_by_ft = opts.formatters_by_ft, - } - else - return { - formatters = opts.formatters, - formatters_by_ft = opts.formatters_by_ft, - } - end - end, - config = function(_, opts) - local conform = require("conform") - conform.setup(opts) - vim.keymap.set({ "n", "v" }, "lF", function() - conform.format({ - lsp_fallback = true, - async = false, - timeout_ms = pcode.format_timeout_ms or 5000, - }) - end, { desc = "Format file or range (in visual mode)" }) - end, -} + }) + end, { desc = "Format file or range (in visual mode)" }) + end, + } +end +return M diff --git a/lua/plugins/javascript.lua b/lua/plugins/javascript.lua index 14c2ec1..8c90762 100644 --- a/lua/plugins/javascript.lua +++ b/lua/plugins/javascript.lua @@ -20,6 +20,7 @@ if pcode.active_javascript_config.active then "stevearc/conform.nvim", event = "VeryLazy", opts = function(_, opts) + opts.formatters_by_ft = opts.formatters_by_ft or {} local package = "prettier" require("user.utils.masoncfg").try_install(package) opts.formatters_by_ft.javascript = { package } diff --git a/lua/plugins/nonels.lua b/lua/plugins/nonels.lua index 3ef6473..86f28be 100644 --- a/lua/plugins/nonels.lua +++ b/lua/plugins/nonels.lua @@ -1,25 +1,28 @@ -return { - { - "nvimtools/none-ls.nvim", - lazy = true, - enabled = not (pcode.disable_null_ls or false), - dependencies = { - { - "jayp0521/mason-null-ls.nvim", - event = "VeryLazy", - opts = { - ensure_installed = pcode.null_ls_ensure_installed or {}, - automatic_setup = true, - handlers = {}, +local M = {} +if not (pcode.disable_null_ls or false) then + M = { + { + "nvimtools/none-ls.nvim", + lazy = true, + dependencies = { + { + "jayp0521/mason-null-ls.nvim", + event = "VeryLazy", + opts = { + ensure_installed = pcode.null_ls_ensure_installed or {}, + automatic_setup = true, + handlers = {}, + }, + config = function(_, opts) + require("mason-null-ls").setup(opts) + end, }, - config = function(_, opts) - require("mason-null-ls").setup(opts) - end, + "nvimtools/none-ls-extras.nvim", }, - "nvimtools/none-ls-extras.nvim", + event = "InsertEnter", + opts = {}, + config = true, }, - event = "InsertEnter", - opts = {}, - config = true, - }, -} + } +end +return M diff --git a/lua/plugins/nvimlint.lua b/lua/plugins/nvimlint.lua index 5f12624..ecd18e1 100644 --- a/lua/plugins/nvimlint.lua +++ b/lua/plugins/nvimlint.lua @@ -1,126 +1,133 @@ -return { - "mfussenegger/nvim-lint", - enabled = pcode.disable_null_ls or false, - event = { "BufReadPre", "BufNewFile" }, - opts = function(_, opts) - local mason_reg = require("mason-registry") +local M = {} +local disable = pcode.disable_null_ls or false +if require("user.utils.cfgstatus").cheack() then + disable = true +end +if disable then + M = { + "mfussenegger/nvim-lint", + event = { "BufReadPre", "BufNewFile" }, + opts = function(_, opts) + local mason_reg = require("mason-registry") - opts.linters_by_ft = opts.linters_by_ft or {} + opts.linters_by_ft = opts.linters_by_ft or {} - -- add diff langue vs filetype - local keymap = { - ["c++"] = "cpp", - ["c#"] = "cs", - } + -- add diff langue vs filetype + local keymap = { + ["c++"] = "cpp", + ["c#"] = "cs", + } - -- add dif nvim-lint vs mason - local name_map = { - ["actionlint"] = "actionlint", - ["ansible_lint"] = "ansible_lint", - ["buf"] = "buf_lint", - ["buildifier"] = "buildifier", - ["cfn-lint"] = "cfn_lint", - ["checkstyle"] = "checkstyle", - ["clj-kondo"] = "clj_kondo", - ["cmakelint"] = "cmakelint", - ["codespell"] = "codespell", - ["cpplint"] = "cpplint", - ["cspell"] = "cspell", - ["curlylint"] = "curlylint", - ["djlint"] = "djlint", - ["erb-lint"] = "erb_lint", - ["eslint_d"] = "eslint_d", - ["flake8"] = "flake8", - ["gdtoolkit"] = "gdlint", - ["golangci-lint"] = "golangcilint", - ["hadolint"] = "hadolint", - ["jsonlint"] = "jsonlint", - ["ktlint"] = "ktlint", - ["luacheck"] = "luacheck", - ["markdownlint"] = "markdownlint", - ["mypy"] = "mypy", - ["phpcs"] = "phpcs", - ["phpmd"] = "phpmd", - ["phpstan"] = "phpstan", - ["proselint"] = "proselint", - ["pydocstyle"] = "pydocstyle", - ["pylint"] = "pylint", - ["revive"] = "revive", - ["rstcheck"] = "rstcheck", - ["rubocop"] = "rubocop", - ["ruff"] = "ruff", - ["selene"] = "selene", - ["shellcheck"] = "shellcheck", - ["sqlfluff"] = "sqlfluff", - ["standardrb"] = "standardrb", - ["stylelint"] = "stylelint", - ["solhint"] = "solhint", - ["tflint"] = "tflint", - ["tfsec"] = "tfsec", - ["trivy"] = "trivy", - ["vale"] = "vale", - ["vint"] = "vint", - ["vulture"] = "vulture", - ["yamllint"] = "yamllint", - } + -- add dif nvim-lint vs mason + local name_map = { + ["actionlint"] = "actionlint", + ["ansible_lint"] = "ansible_lint", + ["buf"] = "buf_lint", + ["buildifier"] = "buildifier", + ["cfn-lint"] = "cfn_lint", + ["checkstyle"] = "checkstyle", + ["clj-kondo"] = "clj_kondo", + ["cmakelint"] = "cmakelint", + ["codespell"] = "codespell", + ["cpplint"] = "cpplint", + ["cspell"] = "cspell", + ["curlylint"] = "curlylint", + ["djlint"] = "djlint", + ["erb-lint"] = "erb_lint", + ["eslint_d"] = "eslint_d", + ["flake8"] = "flake8", + ["gdtoolkit"] = "gdlint", + ["golangci-lint"] = "golangcilint", + ["hadolint"] = "hadolint", + ["jsonlint"] = "jsonlint", + ["ktlint"] = "ktlint", + ["luacheck"] = "luacheck", + ["markdownlint"] = "markdownlint", + ["mypy"] = "mypy", + ["phpcs"] = "phpcs", + ["phpmd"] = "phpmd", + ["phpstan"] = "phpstan", + ["proselint"] = "proselint", + ["pydocstyle"] = "pydocstyle", + ["pylint"] = "pylint", + ["revive"] = "revive", + ["rstcheck"] = "rstcheck", + ["rubocop"] = "rubocop", + ["ruff"] = "ruff", + ["selene"] = "selene", + ["shellcheck"] = "shellcheck", + ["sqlfluff"] = "sqlfluff", + ["standardrb"] = "standardrb", + ["stylelint"] = "stylelint", + ["solhint"] = "solhint", + ["tflint"] = "tflint", + ["tfsec"] = "tfsec", + ["trivy"] = "trivy", + ["vale"] = "vale", + ["vint"] = "vint", + ["vulture"] = "vulture", + ["yamllint"] = "yamllint", + } - -- add new mapping filetype - local addnew = { - ["typescriptreact"] = "eslint_d", - ["javascriptreact"] = "eslint_d", - ["javascript.jsx"] = "eslint_d", - ["typescript.tsx"] = "eslint_d", - ["vue"] = "eslint_d", - ["sevelte"] = "eslint_d", - ["astro"] = "eslint_d", - } + -- add new mapping filetype + local addnew = { + ["typescriptreact"] = "eslint_d", + ["javascriptreact"] = "eslint_d", + ["javascript.jsx"] = "eslint_d", + ["typescript.tsx"] = "eslint_d", + ["vue"] = "eslint_d", + ["sevelte"] = "eslint_d", + ["astro"] = "eslint_d", + } - local ignore = { - ["php"] = "tlint", - } + local ignore = { + ["php"] = "tlint", + } - -- local listtest = {} - for _, pkg in pairs(mason_reg.get_installed_packages()) do - for _, type in pairs(pkg.spec.categories) do - -- only act upon a Linter - if type == "Linter" then - -- finally add the linter to it's compatible filetype(s) - for _, ft in pairs(pkg.spec.languages) do - local ftl = string.lower(ft) - local ready = mason_reg.get_package(pkg.spec.name):is_installed() - if ready then - if keymap[ftl] ~= nil then - ftl = keymap[ftl] - end - - -- if substring(pkg.spec.name, "eslint") then - -- table.insert(listtest, ftl) - -- end - - if name_map[pkg.spec.name] ~= nil then - pkg.spec.name = name_map[pkg.spec.name] - end - - -- add new mapping language - for key, value in pairs(addnew) do - if value == pkg.spec.name then - opts.linters_by_ft[key] = opts.linters_by_ft[key] or {} - table.insert(opts.linters_by_ft[key], pkg.spec.name) + -- local listtest = {} + for _, pkg in pairs(mason_reg.get_installed_packages()) do + for _, type in pairs(pkg.spec.categories) do + -- only act upon a Linter + if type == "Linter" then + -- finally add the linter to it's compatible filetype(s) + for _, ft in pairs(pkg.spec.languages) do + local ftl = string.lower(ft) + local ready = mason_reg.get_package(pkg.spec.name):is_installed() + if ready then + if keymap[ftl] ~= nil then + ftl = keymap[ftl] end - end - if ignore[ftl] ~= pkg.spec.name then - opts.linters_by_ft[ftl] = opts.linters_by_ft[ftl] or {} - table.insert(opts.linters_by_ft[ftl], pkg.spec.name) + -- if substring(pkg.spec.name, "eslint") then + -- table.insert(listtest, ftl) + -- end + + if name_map[pkg.spec.name] ~= nil then + pkg.spec.name = name_map[pkg.spec.name] + end + + -- add new mapping language + for key, value in pairs(addnew) do + if value == pkg.spec.name then + opts.linters_by_ft[key] = opts.linters_by_ft[key] or {} + table.insert(opts.linters_by_ft[key], pkg.spec.name) + end + end + + if ignore[ftl] ~= pkg.spec.name then + opts.linters_by_ft[ftl] = opts.linters_by_ft[ftl] or {} + table.insert(opts.linters_by_ft[ftl], pkg.spec.name) + end end end end end end - end - -- print(table.concat(listtest, ",")) - end, - config = function(_, opts) - require("lint").linters_by_ft = opts.linters_by_ft - end, -} + -- print(table.concat(listtest, ",")) + end, + config = function(_, opts) + require("lint").linters_by_ft = opts.linters_by_ft + end, + } +end +return M diff --git a/lua/user/utils/cfgstatus.lua b/lua/user/utils/cfgstatus.lua new file mode 100644 index 0000000..14a4289 --- /dev/null +++ b/lua/user/utils/cfgstatus.lua @@ -0,0 +1,23 @@ +local M={} + +M.cheack=function () + local sts= false + if pcode.active_javascript_config.active or false then + sts=true + elseif pcode.active_rust_config or false then + sts=true + elseif pcode.active_php_config or false then + sts=true + elseif pcode.active_golang_config or false then + sts=true + elseif pcode.active_python_config or false then + sts=true + elseif pcode.active_cpp_config or false then + sts=true + elseif pcode.active_java_config.active or false then + sts=true + end + return sts +end + +return M