From 22202bc11b928bd973caa0d96ee1beb4d045083b Mon Sep 17 00:00:00 2001
From: "asep.komarudin" <asep.komarudin@dataon.com>
Date: Sat, 29 Jun 2024 13:31:00 +0700
Subject: [PATCH] add: default rust analizer config

---
 lazy-lock.json                    |  8 ++++----
 lua/custom/default.lua            |  4 ++--
 lua/plugins/rust.lua              | 30 ++++++++++++++++++++++++++++++
 lua/plugins/themes/_globalvar.lua | 10 +++++-----
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index ad4257b..d28b963 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -14,12 +14,13 @@
   "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" },
   "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
   "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "ec95702ae617308df35f35ad93c469c86d47346f" },
+  "lazy.nvim": { "branch": "main", "commit": "cece2a9b4a649ee5fa45fe83590a6dd11c5d4eb7" },
   "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
@@ -28,7 +29,6 @@
   "mini.indentscope": { "branch": "main", "commit": "56d42be090e8fcc68eda69cfe55af8c5e562300e" },
   "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" },
   "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" },
-  "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
   "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
   "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
@@ -37,7 +37,6 @@
   "nvim-dap": { "branch": "master", "commit": "5ba8ceace596360321cf33fa4b56d9d46e057ce9" },
   "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
-  "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": "5ad42234d880659dfe9d4ff936c310cd6c5a1610" },
@@ -55,6 +54,8 @@
   "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" },
@@ -63,7 +64,6 @@
   "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" },
   "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" },
   "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 7206267..8b489b2 100644
--- a/lua/custom/default.lua
+++ b/lua/custom/default.lua
@@ -161,9 +161,9 @@ 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 = false
+pcode.active_rust_config = true
 pcode.active_javascript_config = {
-  active = true,
+  active = false,
   jest_command = "npm test -- ",
   jest_config = "jest.config.mjs",
 }
diff --git a/lua/plugins/rust.lua b/lua/plugins/rust.lua
index 7270c28..eb33171 100644
--- a/lua/plugins/rust.lua
+++ b/lua/plugins/rust.lua
@@ -1,6 +1,36 @@
 local M = {}
 if pcode.active_rust_config then
   M = {
+    {
+      "nvim-treesitter/nvim-treesitter",
+      opts = function(_, opts)
+        opts.ensure_installed = opts.ensure_installed or {}
+        vim.list_extend(opts.ensure_installed, { "rust" })
+      end,
+    },
+    {
+      "williamboman/mason-lspconfig.nvim",
+      opts = function(_, opts)
+        opts.skip_config = opts.skip_config or {}
+        opts.ensure_installed = opts.ensure_installed or {}
+        vim.list_extend(opts.ensure_installed, { "rust_analyzer" })
+        vim.list_extend(opts.skip_config, { "rust_analyzer" })
+      end,
+    },
+    {
+      "stevearc/conform.nvim",
+      event = "VeryLazy",
+      opts = function(_, opts)
+        local package = "ast-grep"
+        require("user.utils.masoncfg").try_install(package)
+        opts.formatters_by_ft.rust = { package }
+      end,
+    },
+    -- disable none-ls
+    {
+      "nvimtools/none-ls.nvim",
+      enabled = false,
+    },
     {
       "rust-lang/rust.vim",
       ft = "rust",
diff --git a/lua/plugins/themes/_globalvar.lua b/lua/plugins/themes/_globalvar.lua
index 39a8f04..8144808 100644
--- a/lua/plugins/themes/_globalvar.lua
+++ b/lua/plugins/themes/_globalvar.lua
@@ -52,11 +52,11 @@ _G.unique_list = function(list)
 end
 
 -- run if rust config true
-if pcode.active_rust_config then
-  table.insert(pcode.mason_ensure_installed, "rust_analyzer")
-  table.insert(pcode.unregister_lsp, "rust_analyzer")
-  table.insert(pcode.treesitter_ensure_installed, "rust")
-end
+-- if pcode.active_rust_config then
+-- table.insert(pcode.mason_ensure_installed, "rust_analyzer")
+-- table.insert(pcode.unregister_lsp, "rust_analyzer")
+-- table.insert(pcode.treesitter_ensure_installed, "rust")
+-- end
 -- run if javascript config true
 -- if pcode.active_javascript_config.active then
 -- local lst_ts = { "html", "javascript", "typescript", "tsx", "css", "json", "jsonc" }