diff --git a/lazy-lock.json b/lazy-lock.json index 577d0d3..4ad0d0a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,7 +27,7 @@ "mini.indentscope": { "branch": "main", "commit": "56d42be090e8fcc68eda69cfe55af8c5e562300e" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" }, - "neotest-phpunit": { "branch": "main", "commit": "baae8dfa0a3aaacd9f0bb6845d6348f5bcdc48bb" }, + "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" }, "noice.nvim": { "branch": "main", "commit": "8f1d9966762e62fa8788e5fb1a5f6a86784221d9" }, "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" }, "none-ls.nvim": { "branch": "main", "commit": "f1b438ab1709cf9d8875843559d20265013ac755" }, @@ -37,7 +37,7 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "5ba8ceace596360321cf33fa4b56d9d46e057ce9" }, "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" }, - "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, + "nvim-dap-vscode-js": { "branch": "main", "commit": "e7c05495934a658c8aa10afd995dacd796f76091" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "2f1d6333bbec2e787774193c9fc7b447b878069a" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, @@ -62,7 +62,7 @@ "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" }, "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" }, - "vscode-php-debug": { "branch": "main", "commit": "3025d1f01b5b7725e7c1c213d63f3de45f0534b3" }, + "vscode-js-debug": { "branch": "main", "commit": "9fd0efd39d534304cffd970263148923b627be20" }, "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 112753d..c6f0227 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -152,11 +152,11 @@ pcode.nvim_dap = false -- not support for windows os (auto config mason-nvim-dap -- conefig special support test & dap pcode.active_rust_config = false pcode.active_javascript_config = { - status = false, + active = true, jest_command = "npm test -- ", jest_config = "jest.config.mjs", } -pcode.active_php_config = true +pcode.active_php_config = false pcode.active_golang_config = false pcode.active_python_config = false pcode.active_cpp_config = false diff --git a/lua/plugins/themes/_globalvar.lua b/lua/plugins/themes/_globalvar.lua index 37bd3e1..919bc28 100644 --- a/lua/plugins/themes/_globalvar.lua +++ b/lua/plugins/themes/_globalvar.lua @@ -35,7 +35,7 @@ if pcode.active_rust_config then table.insert(pcode.treesitter_ensure_installed, "rust") end -- run if javascript config true -if pcode.active_javascript_config.status then +if pcode.active_javascript_config.active then local lst_ts = { "html", "javascript", "typescript", "tsx", "css", "json", "jsonc" } for _, ts in pairs(lst_ts) do table.insert(pcode.treesitter_ensure_installed, ts) @@ -43,6 +43,7 @@ if pcode.active_javascript_config.status then for _, lsp in pairs({ "html", "cssls", "emmet_ls", "eslint", "jsonls", "tsserver" }) do table.insert(pcode.mason_ensure_installed, lsp) end + table.insert(pcode.null_ls_ensure_installed, "prettier") end -- run if php config true if pcode.active_php_config then @@ -84,7 +85,7 @@ if pcode.active_cpp_config then pcode.nvim_dap = true end -- run if java config true -if pcode.active_java_config then +if pcode.active_java_config.active then table.insert(pcode.treesitter_ensure_installed, "java") table.insert(pcode.mason_ensure_installed, "jdtls") table.insert(pcode.dap_ensure_installed, "javadbg")