From 6b9d409af998080db50e5fb240f67a42ae0e460d Mon Sep 17 00:00:00 2001
From: MasterGordon <gologo.x@gmail.com>
Date: Sun, 5 Sep 2021 01:38:04 +0200
Subject: [PATCH] fixed auto pair

---
 lua/plugins.lua     | 30 ++++++++++++++----------------
 lua/plugins/lsp.lua |  9 ++++++++-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lua/plugins.lua b/lua/plugins.lua
index 3eca251..fc633d7 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -65,26 +65,22 @@ return require("packer").startup(
       "nvim-treesitter/nvim-treesitter",
       run = ":TSUpdate",
       config = function()
-        require("nvim-autopairs").setup(
+        local npairs = require("nvim-autopairs")
+        npairs.setup(
           {
+            check_ts = true,
             enable_check_bracket_line = true
           }
         )
-        local remap = vim.api.nvim_set_keymap
-        local npairs = require("nvim-autopairs")
 
-        -- skip it, if you use another global object
-        _G.MUtils = {}
+        require("nvim-autopairs.completion.compe").setup(
+          {
+            map_cr = true, --  map <CR> on insert mode
+            map_complete = true, -- it will auto insert `(` after select function or method item
+            auto_select = false -- auto select first item
+          }
+        )
 
-        MUtils.completion_confirm = function()
-          if vim.fn.pumvisible() ~= 0 then
-            return npairs.esc("<cr>")
-          else
-            return npairs.autopairs_cr()
-          end
-        end
-
-        remap("i", "<CR>", "v:lua.MUtils.completion_confirm()", {expr = true, noremap = true})
         require "nvim-treesitter.configs".setup {
           context_commentstring = {
             enable = true,
@@ -101,7 +97,8 @@ return require("packer").startup(
           },
           autotag = {
             enable = true
-          }
+          },
+          autopairs = {enable = true}
         }
       end,
       requires = {"JoosepAlviste/nvim-ts-context-commentstring", "windwp/nvim-ts-autotag", "windwp/nvim-autopairs"}
@@ -131,7 +128,8 @@ return require("packer").startup(
         "RishabhRD/nvim-lsputils",
         "onsails/lspkind-nvim",
         "ray-x/lsp_signature.nvim",
-        "jose-elias-alvarez/nvim-lsp-ts-utils"
+        "jose-elias-alvarez/nvim-lsp-ts-utils",
+        "jose-elias-alvarez/null-ls.nvim"
       }
     }
     use {
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 55d32a8..0d2e16f 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -50,6 +50,10 @@ local eslint = {
   }
 }
 
+--- ESLINT Actions
+require("null-ls").config {}
+require("lspconfig")["null-ls"].setup {}
+
 require "lspconfig".efm.setup {
   init_options = {documentFormatting = true},
   filetypes = {"javascript", "typescript", "javascriptreact", "typescriptreact"},
@@ -111,7 +115,10 @@ require "lspconfig".tsserver.setup {
   on_attach = function(client, bufnr)
     local ts_utils = require("nvim-lsp-ts-utils")
 
-    ts_utils.setup {}
+    ts_utils.setup {
+      eslint_bin = "eslint_d",
+      eslint_enable_diagnostics = false
+    }
     ts_utils.setup_client(client)
     on_attach(client, bufnr)
   end,