From c137431c14481ac784af7c70d287e42a4579f198 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 8 Jan 2023 15:07:07 +0100
Subject: [PATCH] refactor!: use new `opts` property

---
 lua/plugins/editor.lua     |  2 +-
 lua/plugins/lsp.lua        | 56 ++++++++++++++++++++++----------------
 lua/plugins/treesitter.lua | 36 ++++++++++++------------
 3 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index ac60690..df46fd0 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -8,7 +8,7 @@ return {
   -- change trouble config
   -- {
   --   "folke/trouble.nvim",
-  --   config = { use_diagnostic_signs = true },
+  --   opts = { use_diagnostic_signs = true },
   -- },
 
   -- add symbols-outline
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 6a7506b..342d408 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -3,39 +3,49 @@ return {
   -- uncomment and add lsp servers with their config to servers below
   {
     "neovim/nvim-lspconfig",
-    -- you can do any additional lsp server setup here
-    -- return true if you don't want this server to be setup with lspconfig
-    ---@param server string lsp server name
-    ---@param opts _.lspconfig.options any options set for the server
-    -- setup_server = function(server, opts)
-    --   return false
-    -- end,
-    ---@type lspconfig.options
-    -- servers = {
-    --   jsonls = {},
-    --   sumneko_lua = {
-    --     settings = {
-    --       Lua = {
-    --         workspace = {
-    --           checkThirdParty = false,
-    --         },
-    --         completion = {
-    --           callSnippet = "Replace",
+    -- ---@class PluginLspOpts
+    -- opts = {
+    --   ---@type lspconfig.options
+    --   servers = {
+    --     jsonls = {},
+    --     sumneko_lua = {
+    --       settings = {
+    --         Lua = {
+    --           workspace = {
+    --             checkThirdParty = false,
+    --           },
+    --           completion = {
+    --             callSnippet = "Replace",
+    --           },
     --         },
     --       },
     --     },
     --   },
+    --   -- you can do any additional lsp server setup here
+    --   -- return true if you don't want this server to be setup with lspconfig
+    --   ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
+    --   setup = {
+    --     -- example to setup with typescript.nvim
+    --     -- tsserver = function(_, opts)
+    --     --   require("typescript").setup({ server = opts })
+    --     --   return true
+    --     -- end,
+    --     -- Specify * to use this function as a fallback for any server
+    --     -- ["*"] = function(server, opts) end,
+    --   },
     -- },
   },
 
   -- uncomment and add tools to ensure_installed below
   {
     "williamboman/mason.nvim",
-    -- ensure_installed = {
-    --   "stylua",
-    --   "shellcheck",
-    --   "shfmt",
-    --   "flake8",
+    -- opts = {
+    --   ensure_installed = {
+    --     "stylua",
+    --     "shellcheck",
+    --     "shfmt",
+    --     "flake8",
+    --   },
     -- },
   },
 }
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 6797338..38279ca 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -3,22 +3,24 @@ return {
   -- treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    ensure_installed = {
-      "bash",
-      "help",
-      "html",
-      "javascript",
-      "json",
-      "lua",
-      "markdown",
-      "markdown_inline",
-      "python",
-      "query",
-      "regex",
-      "tsx",
-      "typescript",
-      "vim",
-      "yaml",
-    },
+    -- opts = {
+    --   ensure_installed = {
+    --     "bash",
+    --     "help",
+    --     "html",
+    --     "javascript",
+    --     "json",
+    --     "lua",
+    --     "markdown",
+    --     "markdown_inline",
+    --     "python",
+    --     "query",
+    --     "regex",
+    --     "tsx",
+    --     "typescript",
+    --     "vim",
+    --     "yaml",
+    --   },
+    -- },
   },
 }