style

lua/autocmds.lua

@@ -0,0 +1,40 @@
+local M = {}
+
+local augroup = vim.api.nvim_create_augroup('Format', {})
+
+M.enable_format_on_save = function(_, bufnr)
+  vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+  vim.api.nvim_create_autocmd('BufWritePre', {
+    group = augroup,
+    buffer = bufnr,
+    callback = function()
+      vim.lsp.buf.format({ bufnr = bufnr })
+    end,
+  })
+end
+
+local augroup_lsp_format = vim.api.nvim_create_augroup('LspFormat', {})
+
+M.enable_lsp_format_on_save = function(_, bufnr)
+  vim.api.nvim_clear_autocmds({ group = augroup_lsp_format, buffer = bufnr })
+  vim.api.nvim_create_autocmd('BufWritePre', {
+    group = augroup_lsp_format,
+    buffer = bufnr,
+    callback = function()
+      vim.lsp.buf.format({
+        filter = function(client)
+          return client.name == 'null-ls'
+        end
+      })
+    end
+  })
+end
+
+vim.api.nvim_create_user_command('DisableLspFormat',
+  function()
+    vim.api.nvim_clear_autocmds({ group = augroup_lsp_format, buffer = 0 })
+  end,
+  { nargs = 0 }
+)
+
+return M

lua/config/telescope.lua

@@ -40,15 +40,10 @@ telescope.setup({
 })
 
 map('n', '<leader>ff', function() builtin.find_files() end, 'Find files')
-
 map('n', '<leader>fg', function() builtin.live_grep() end, 'Find in files')
-
 map('n', '<Bslash>', function() builtin.buffers() end, 'Find buffers')
-
 map('n', '<leader>fo', function() builtin.oldfiles() end, 'Find old files')
-
 map('n', '<leader>fr', function() builtin.resume() end, 'Resume telescope')
-
 map('n', '<leader>fb', function()
   telescope.extensions.file_browser.file_browser({
     path = '%:p:h',

lua/lsp/lspconfig.lua

@@ -1,4 +1,5 @@
 local nvim_lsp = require('lspconfig')
+local enable_format_on_save = require('autocmds').enable_format_on_save
 
 local map = require('utils').map
 local fmt = function(cmd) return function(str) return cmd:format(str) end end
@@ -18,16 +19,7 @@ local on_attach = function(client, bufnr)
   -- buf_set_keymap('n', ']d', diagnostic 'goto_next()')
 
   map('n', 'gd', '<cmd>Telescope lsp_definitions<CR>', opts, 'LSP definition')
-
   map('n', '<leader>f', lsp 'format()', opts, 'LSP format')
-
-  if (client.name == 'tsserver') then
-    map('n', '<leader>to', function()
-      local typescript = require('typescript')
-      typescript.actions.addMissingImports()
-      typescript.actions.organizeImports()
-    end, opts, 'Typescript organize imports')
-  end
 end
 
 -- Set up completion using nvim_cmp with LSP source
@@ -51,18 +43,6 @@ local lsp_setup = function(server_name, options)
   })
 end
 
-local augroup_format = vim.api.nvim_create_augroup('Format', { clear = true })
-local enable_format_on_save = function(_, bufnr)
-  vim.api.nvim_clear_autocmds({ group = augroup_format, buffer = bufnr })
-  vim.api.nvim_create_autocmd('BufWritePre', {
-    group = augroup_format,
-    buffer = bufnr,
-    callback = function()
-      vim.lsp.buf.format({ bufnr = bufnr })
-    end,
-  })
-end
-
 lsp_setup('bashls')
 lsp_setup('html')
 lsp_setup('cssls')
@@ -104,7 +84,15 @@ local ts_status, ts = pcall(require, 'typescript')
 if ts_status then
   ts.setup({
     server = {
-      on_attach = on_attach,
+      on_attach = function(client, bufnr)
+        on_attach(client, bufnr)
+
+        map('n', '<leader>to', function()
+          local actions = require('typescript').actions
+          actions.addMissingImports()
+          actions.organizeImports()
+        end, { buffer = bufnr }, 'Typescript organize imports')
+      end,
       capabilities = capabilities
     }
   })

lua/lsp/lspsaga.lua

@@ -18,9 +18,7 @@ map('n', 'gr', '<cmd>Lspsaga lsp_finder<CR>')
 map('n', 'gpd', '<cmd>Lspsaga peek_definition<CR>')
 map('n', 'ga', '<cmd>Lspsaga code_action<CR>')
 map('n', 'rn', '<cmd>Lspsaga rename<CR>')
-
 map('n', '[e', function() saga_diagnostic.goto_prev(goto_opts) end, 'Goto previous error')
 map('n', ']e', function() saga_diagnostic.goto_next(goto_opts) end, 'Goto next error')
-
 map('n', '[d', function() saga_diagnostic.goto_prev() end, 'Goto previous diagnostic')
 map('n', ']d', function() saga_diagnostic.goto_next() end, 'Goto next diagnostic')

lua/lsp/null-ls.lua

@@ -1,11 +1,10 @@
 local null_ls = require('null-ls')
+local enable_lsp_format_on_save = require('autocmds').enable_lsp_format_on_save
 
 local formatting = null_ls.builtins.formatting
 local diagnostics = null_ls.builtins.diagnostics
 local code_actions = null_ls.builtins.code_actions
 
-local augroup = vim.api.nvim_create_augroup('LspFormatting', {})
-
 local has_file_condition = function(files)
   return function(utils)
     return utils.root_has_file(files)
@@ -37,14 +36,14 @@ null_ls.setup({
       filter = function(d) return d.code ~= 'prettier/prettier' end,
       condition = eslint_condition
     }),
-    code_actions.eslint_d.with({
-      condition = eslint_condition
-    }),
     formatting.eslint_d.with({
       condition = function(utils)
         return eslint_condition(utils) and not prettier_condition(utils)
       end
     }),
+    code_actions.eslint_d.with({
+      condition = eslint_condition
+    }),
 
     -- CSpell
     diagnostics.cspell.with({
@@ -58,18 +57,7 @@ null_ls.setup({
   },
   on_attach = function(client, bufnr)
     if client.supports_method('textDocument/formatting') then
-      vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-      vim.api.nvim_create_autocmd('BufWritePre', {
-        group = augroup,
-        buffer = bufnr,
-        callback = function()
-          vim.lsp.buf.format({
-            filter = function(client)
-              return client.name == 'null-ls'
-            end
-          })
-        end
-      })
+      enable_lsp_format_on_save(client, bufnr)
     end
 
     vim.diagnostic.config({
@@ -82,10 +70,3 @@ null_ls.setup({
     })
   end
 })
-
-vim.api.nvim_create_user_command('DisableLspFormatting',
-  function()
-    vim.api.nvim_clear_autocmds({ group = augroup, buffer = 0 })
-  end,
-  { nargs = 0 }
-)

lua/maps.lua

@@ -34,6 +34,8 @@ map('v', 'y', 'myy`y')
 map('n', '<leader>o', 'o<Esc>')
 map('n', '<leader>O', 'O<Esc>')
 
+map('n', '<Tab>', '%', { remap = true })
+
 -- Save file
 map('n', '<leader>s', ':w<CR>')
 

lua/utils.lua

@@ -1,6 +1,6 @@
-local U = {}
+local M = {}
 
-function U.map(mode, lhs, rhs, opts, desc)
+function M.map(mode, lhs, rhs, opts, desc)
   local options = { noremap = true, silent = true }
 
   if type(opts) == 'string' then
@@ -11,16 +11,16 @@ function U.map(mode, lhs, rhs, opts, desc)
   if opts then
     options = vim.tbl_extend('force', options, opts)
   end
-  
+
   if desc then
     options.desc = desc
   end
 
   vim.keymap.set(mode, lhs, rhs, options)
 end
 
-function U.merge(a, b)
+function M.merge(a, b)
   return vim.tbl_deep_extend('force', {}, a, b)
 end
 
-return U
+return M