From 33d9de314f6434a4c4618280a8af5155d90459da Mon Sep 17 00:00:00 2001
From: MasterGordon <gologo.x@gmail.com>
Date: Sat, 20 Aug 2022 14:20:06 +0200
Subject: [PATCH] added action menu

---
 lua/plugins.lua           | 6 +++++-
 lua/plugins/formatter.lua | 2 +-
 lua/plugins/icons.lua     | 5 +++++
 lua/plugins/lsp.lua       | 3 +--
 lua/plugins/nvim-tree.lua | 5 ++++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lua/plugins.lua b/lua/plugins.lua
index 07ab0a9..88d8c29 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -129,12 +129,16 @@ return require("packer").startup(
       requires = {
         "jose-elias-alvarez/null-ls.nvim",
         "RishabhRD/popfix",
-        "hood/popui.nvim",
         "onsails/lspkind-nvim",
         "ray-x/lsp_signature.nvim",
         "jose-elias-alvarez/nvim-lsp-ts-utils"
       }
     }
+    use {
+      "weilbith/nvim-code-action-menu",
+      cmd = "CodeActionMenu"
+    }
+
     use {
       "nvim-telescope/telescope.nvim",
       config = function()
diff --git a/lua/plugins/formatter.lua b/lua/plugins/formatter.lua
index 3afd1f2..4c162ab 100644
--- a/lua/plugins/formatter.lua
+++ b/lua/plugins/formatter.lua
@@ -32,7 +32,7 @@ require("formatter").setup(
         function()
           return {
             exe = "rustfmt",
-            args = {"--emit=stdout"},
+            args = {"--emit=stdout", "--edition=2021"},
             stdin = true
           }
         end
diff --git a/lua/plugins/icons.lua b/lua/plugins/icons.lua
index 19994db..ee7d83a 100644
--- a/lua/plugins/icons.lua
+++ b/lua/plugins/icons.lua
@@ -43,5 +43,10 @@ require("nvim-web-devicons").set_icon {
     icon = "",
     color = "#FFFFFF",
     name = "Prisma"
+  },
+  ["jar"] = {
+    icon = "",
+    color = "#FFFFFF",
+    name = "Jar"
   }
 }
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index e37bef2..090bba6 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -1,4 +1,3 @@
-vim.ui.select = require "popui.ui-overrider"
 local util = require "lspconfig.util"
 
 local signError = vim.fn.sign_getdefined("DiagnosticSignError")
@@ -51,7 +50,7 @@ vim.api.nvim_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace
 vim.api.nvim_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
 -- buf_set_keymap("n", "<leader>t", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
 vim.api.nvim_set_keymap("n", "<F2>", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
-vim.api.nvim_set_keymap("n", "<leader>a", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<leader>a", "<cmd>CodeActionMenu<CR>", opts)
 vim.api.nvim_set_keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
 vim.api.nvim_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts)
 vim.api.nvim_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts)
diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua
index dd6ce60..155e5c5 100644
--- a/lua/plugins/nvim-tree.lua
+++ b/lua/plugins/nvim-tree.lua
@@ -66,13 +66,16 @@ require "nvim-tree".setup(
       indent_markers = {
         enable = true,
         icons = {
-          corner = "└ ",
+          corner = "└",
           edge = "│ ",
           none = "  "
         }
       },
       icons = {
         webdev_colors = true,
+        show = {
+          folder_arrow = false
+        },
         glyphs = {
           default = "",
           symlink = "",