From ff62c20795459afda890c3eb64d453759a814fbb Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Fri, 5 Jul 2024 07:59:12 +0700 Subject: [PATCH] enc: migrate to auto-lint and auto-conform --- lazy-lock.json | 10 +++++----- lua/custom/default.lua | 2 +- lua/plugins/autolint.lua | 30 +++++++++--------------------- lua/plugins/cppcfg.lua | 4 ++-- lua/plugins/deno.lua | 8 ++++---- lua/plugins/gocfg.lua | 8 ++++---- lua/plugins/javascript.lua | 4 ++-- lua/plugins/kotlin.lua | 8 ++++---- lua/plugins/phpcfg.lua | 6 ++---- lua/plugins/python.lua | 9 +++------ lua/plugins/rust.lua | 4 ++-- 11 files changed, 38 insertions(+), 55 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 3ba9271..dc40243 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,7 +4,7 @@ "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-conform.nvim": { "branch": "main", "commit": "8d2fbcbd8b8dfd44e1bc2edffc3fe7372b5b520e" }, - "auto-lint.nvim": { "branch": "main", "commit": "52bf448e3b13fca21d91b39c6e23e5e309ae094a" }, + "auto-lint.nvim": { "branch": "main", "commit": "aff13cb8eaa055e66e940d43b7d83166397e5413" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -31,7 +31,7 @@ "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" }, - "neotest-java": { "branch": "main", "commit": "320f31c71b183f2c584198f33f93542fd0e5a768" }, + "neotest-gtest": { "branch": "main", "commit": "b44c8afc26cea75ffc80617ce07b4e745a56e589" }, "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, @@ -40,7 +40,7 @@ "nvim-dap": { "branch": "master", "commit": "5ba8ceace596360321cf33fa4b56d9d46e057ce9" }, "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-dap-vscode-js": { "branch": "main", "commit": "e7c05495934a658c8aa10afd995dacd796f76091" }, "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "01d95380c6c643d663f8d3cf8a7b274ece6da389" }, @@ -49,7 +49,7 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "f2f828c5e995af156106a4aa5647463e49fff66a" }, + "nvim-treesitter": { "branch": "master", "commit": "f0dbe180004d3566a994b1093e3a37893cc141c1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe" }, @@ -59,7 +59,6 @@ "rainbow-delimiters.nvim": { "branch": "master", "commit": "12b1a1e095d968887a17ef791c2edb78d7595d46" }, "rest.nvim": { "branch": "main", "commit": "91badd46c60df6bd9800c809056af2d80d33da4c" }, "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" }, - "symbols-outline.nvim": { "branch": "master", "commit": "964c5902243446124417a3a9e9454f5ef032cc36" }, "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" }, "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, @@ -67,6 +66,7 @@ "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "525521677deb8401b62054bbbbc9b17f8486de3d" }, "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" }, + "vscode-js-debug": { "branch": "main", "commit": "5b0f41dbe845d693a541c1fae30cec04c878216f" }, "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" }, "yanky.nvim": { "branch": "main", "commit": "9268018e92d02650a94e39dd5f5903c542f7ea11" } } \ No newline at end of file diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 4c984b3..0a126e1 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -173,7 +173,7 @@ pcode.active_golang_config = false pcode.active_python_config = false pcode.active_cpp_config = false pcode.active_java_config = { - active = true, + active = false, project = "gradle", -- gradle or maven use_nvim_jdtls = true, -- mfussenegger/nvim-jdtls } diff --git a/lua/plugins/autolint.lua b/lua/plugins/autolint.lua index afda660..adc41ec 100644 --- a/lua/plugins/autolint.lua +++ b/lua/plugins/autolint.lua @@ -10,27 +10,15 @@ if disable then "mfussenegger/nvim-lint", }, event = "VeryLazy", - config = function() - require("auto-lint").setup({ - map_lang = { - -- ["c++"] = "cpp", - -- ["c#"] = "cs", - }, - map_name = { - -- ["actionlint"] = "actionlint", - -- ["ansible_lint"] = "ansible_lint", - }, - add_new = { - -- ["typescriptreact"] = { "eslint_d" }, - -- ["javascriptreact"] = { "eslint_d" }, - }, - ignore = { - -- ["php"] = { "tlint" }, - }, - ensure_installed = { - -- "eslint_d", - }, - }) + opts = function(_, opts) + opts.map_lang = opts.map_lang or {} + opts.map_name = opts.map_name or {} + opts.add_new = opts.add_new or {} + opts.ignore = opts.ignore or {} + opts.ensure_installed = opts.ensure_installed or {} + end, + config = function(_, opts) + require("auto-lint").setup(opts) end, } end diff --git a/lua/plugins/cppcfg.lua b/lua/plugins/cppcfg.lua index cf8b598..da8ed88 100644 --- a/lua/plugins/cppcfg.lua +++ b/lua/plugins/cppcfg.lua @@ -28,11 +28,11 @@ if pcode.active_cpp_config then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-conform.nvim", event = "VeryLazy", opts = function(_, opts) local package = "clang-format" - require("user.utils.masoncfg").try_install(package) + vim.list_extend(opts.ensure_installed, { package }) opts.formatters_by_ft.cpp = { package } opts.formatters_by_ft.c = { package } end, diff --git a/lua/plugins/deno.lua b/lua/plugins/deno.lua index 9e55383..afe2e65 100644 --- a/lua/plugins/deno.lua +++ b/lua/plugins/deno.lua @@ -16,20 +16,20 @@ if pcode.active_deno_config or false then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-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) + vim.list_extend(opts.ensure_installed, { package }) opts.formatters_by_ft.javascript = { package } end, }, { - "mfussenegger/nvim-lint", + "pojokcodeid/auto-lint.nvim", opts = function(_, opts) opts.linters_by_ft = opts.linters_by_ft or {} - require("user.utils.masoncfg").try_install("eslint_d") + vim.list_extend(opts.ensure_installed, { "eslint_d" }) opts.linters_by_ft.javascript = { "eslint_d" } end, }, diff --git a/lua/plugins/gocfg.lua b/lua/plugins/gocfg.lua index 1f9ea92..79f693d 100644 --- a/lua/plugins/gocfg.lua +++ b/lua/plugins/gocfg.lua @@ -18,19 +18,19 @@ if pcode.active_golang_config then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-conform.nvim", event = "VeryLazy", opts = function(_, opts) local package = "gofumpt" - require("user.utils.masoncfg").try_install(package) + vim.list_extend(opts.ensure_installed, { package }) opts.formatters_by_ft.python = { package } end, }, { - "mfussenegger/nvim-lint", + "pojokcodeid/auto-lint.nvim", opts = function(_, opts) opts.linters_by_ft = opts.linters_by_ft or {} - require("user.utils.masoncfg").try_install("ast-grep") + vim.list_extend(opts.ensure_installed, { "ast-grep" }) opts.linters_by_ft.php = { "ast-grep" } end, }, diff --git a/lua/plugins/javascript.lua b/lua/plugins/javascript.lua index a26f787..0e8a79e 100644 --- a/lua/plugins/javascript.lua +++ b/lua/plugins/javascript.lua @@ -17,12 +17,12 @@ if pcode.active_javascript_config.active then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-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) + vim.list_extend(opts.ensure_installed, { package }) opts.formatters_by_ft.javascript = { package } end, }, diff --git a/lua/plugins/kotlin.lua b/lua/plugins/kotlin.lua index ae0511b..0072178 100644 --- a/lua/plugins/kotlin.lua +++ b/lua/plugins/kotlin.lua @@ -17,21 +17,21 @@ if pcode.active_kotlin_config or false then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-conform.nvim", event = "VeryLazy", opts = function(_, opts) opts.formatters_by_ft = opts.formatters_by_ft or {} local package = "ktfmt" - require("user.utils.masoncfg").try_install(package) + vim.list_extend(opts.ensure_installed, { package }) opts.formatters_by_ft.kotlin = { package } end, }, { - "mfussenegger/nvim-lint", + "pojokcodeid/auto-lint.nvim", optional = true, opts = function(_, opts) opts.linters_by_ft = opts.linters_by_ft or {} - require("user.utils.masoncfg").try_install("ktlint") + vim.list_extend(opts.ensure_installed, { "ktlint" }) opts.linters_by_ft.kotlin = { "ktlint" } end, }, diff --git a/lua/plugins/phpcfg.lua b/lua/plugins/phpcfg.lua index 87a8484..0bf6b51 100644 --- a/lua/plugins/phpcfg.lua +++ b/lua/plugins/phpcfg.lua @@ -16,12 +16,10 @@ if pcode.active_php_config then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-conform.nvim", event = "VeryLazy", opts = function(_, opts) - local package = "php-cs-fixer" - require("user.utils.masoncfg").try_install(package) - require("user.utils.masoncfg").try_install("blade-formatter") + vim.list_extend(opts.ensure_installed, { "php-cs-fixer", "blade-formatter" }) opts.formatters_by_ft.php = { "easy-coding-standard" } opts.formatters_by_ft.blade = { "blade-formatter" } end, diff --git a/lua/plugins/python.lua b/lua/plugins/python.lua index 9a1ed40..9b8f0cb 100644 --- a/lua/plugins/python.lua +++ b/lua/plugins/python.lua @@ -117,14 +117,11 @@ if pcode.active_python_config then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-conform.nvim", event = "VeryLazy", opts = function(_, opts) - local package = "black" - require("user.utils.masoncfg").try_install("flake8") - require("user.utils.masoncfg").try_install("black") - require("user.utils.masoncfg").try_install("debugpy") - opts.formatters_by_ft.python = { package } + vim.list_extend(opts.ensure_installed, { "flake8", "black", "debugpy" }) + opts.formatters_by_ft.python = { "black" } end, }, } diff --git a/lua/plugins/rust.lua b/lua/plugins/rust.lua index eb33171..9e39df9 100644 --- a/lua/plugins/rust.lua +++ b/lua/plugins/rust.lua @@ -18,11 +18,11 @@ if pcode.active_rust_config then end, }, { - "stevearc/conform.nvim", + "pojokcodeid/auto-conform.nvim", event = "VeryLazy", opts = function(_, opts) local package = "ast-grep" - require("user.utils.masoncfg").try_install(package) + vim.list_extend(opts.ensure_installed, { package }) opts.formatters_by_ft.rust = { package } end, },