fix styling issues (#811)

init.lua

@@ -7,7 +7,7 @@ vim.g.colors_name = O.colorscheme -- Colorscheme must get called after plugins a
 require "lv-utils"
 require "lv-treesitter"
 if O.plugin.dashboard.active then
-    require("lv-dashboard").config()
+  require("lv-dashboard").config()
 end
 -- TODO these gues need to be in language files
 -- require "lsp"

lua/keymappings.lua

@@ -5,19 +5,19 @@ vim.api.nvim_set_keymap("n", "<C-k>", "<C-w>k", { silent = true })
 vim.api.nvim_set_keymap("n", "<C-l>", "<C-w>l", { silent = true })
 
 -- Terminal window navigation
-vim.api.nvim_set_keymap("t", "<C-h>", "<C-\\><C-N><C-w>h", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<C-j>", "<C-\\><C-N><C-w>j", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-h>", "<C-\\><C-N><C-w>h", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-j>", "<C-\\><C-N><C-w>j", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-k>", "<C-\\><C-N><C-w>k", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-l>", "<C-\\><C-N><C-w>l", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("t", "<C-h>", "<C-\\><C-N><C-w>h", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("t", "<C-j>", "<C-\\><C-N><C-w>j", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("i", "<C-h>", "<C-\\><C-N><C-w>h", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("i", "<C-j>", "<C-\\><C-N><C-w>j", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("i", "<C-k>", "<C-\\><C-N><C-w>k", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("i", "<C-l>", "<C-\\><C-N><C-w>l", { silent = true, noremap = true })
+vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", { silent = true, noremap = true })
 
 -- TODO fix this
 -- resize with arrows
-if vim.fn.has("mac") == 1 then
+if vim.fn.has "mac" == 1 then
   vim.api.nvim_set_keymap("n", "<A-Up>", ":resize -2<CR>", { silent = true })
   vim.api.nvim_set_keymap("n", "<A-Down>", ":resize +2<CR>", { silent = true })
   vim.api.nvim_set_keymap("n", "<A-Left>", ":vertical resize -2<CR>", { silent = true })

lua/lsp/angular-ls.lua

@@ -1,6 +1,6 @@
 -- TODO find correct root filetype
 -- :LspInstall angular
-require'lspconfig'.angularls.setup {
-    cmd = {DATA_PATH .. "/lspinstall/angular/node_modules/@angular/language-server/bin/ngserver", "--stdio"},
-    on_attach = require'lsp'.common_on_attach,
+require("lspconfig").angularls.setup {
+  cmd = { DATA_PATH .. "/lspinstall/angular/node_modules/@angular/language-server/bin/ngserver", "--stdio" },
+  on_attach = require("lsp").common_on_attach,
 }

lua/lsp/emmet-ls.lua

@@ -2,22 +2,22 @@
 --   return
 -- end
 
-local nvim_lsp = require'lspconfig'
-local configs = require'lspconfig/configs'
+local nvim_lsp = require "lspconfig"
+local configs = require "lspconfig/configs"
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
 configs.emmet_ls = {
   default_config = {
-    cmd = {'emmet-ls', '--stdio'};
-    filetypes = {'html', 'css', 'javascript', 'typescript'};
+    cmd = { "emmet-ls", "--stdio" },
+    filetypes = { "html", "css", "javascript", "typescript" },
     root_dir = function()
       return vim.loop.cwd()
-    end;
-    settings = {};
-  };
+    end,
+    settings = {},
+  },
 }
 
-nvim_lsp.emmet_ls.setup{
+nvim_lsp.emmet_ls.setup {
   -- on_attach = on_attach;
 }

lua/lsp/init.lua

@@ -1,85 +1,79 @@
 -- TODO figure out why this don't work
 vim.fn.sign_define(
-    "LspDiagnosticsSignError",
-    {texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError"}
+  "LspDiagnosticsSignError",
+  { texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError" }
 )
 vim.fn.sign_define(
-    "LspDiagnosticsSignWarning",
-    {texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning"}
+  "LspDiagnosticsSignWarning",
+  { texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning" }
 )
 vim.fn.sign_define(
-    "LspDiagnosticsSignHint",
-    {texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint"}
+  "LspDiagnosticsSignHint",
+  { texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint" }
 )
 vim.fn.sign_define(
-    "LspDiagnosticsSignInformation",
-    {texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation"}
+  "LspDiagnosticsSignInformation",
+  { texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" }
 )
 
-vim.cmd("nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>")
-vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
-vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
-vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
-vim.cmd("nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>")
+vim.cmd "nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>"
+vim.cmd "nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>"
+vim.cmd "nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>"
+vim.cmd "nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>"
+vim.cmd "nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>"
 -- vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>')
-vim.cmd("nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = O.lsp.popup_border}})<CR>")
-vim.cmd("nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = O.lsp.popup_border}})<CR>")
+vim.cmd "nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = O.lsp.popup_border}})<CR>"
+vim.cmd "nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = O.lsp.popup_border}})<CR>"
 -- scroll down hover doc or scroll in definition preview
 -- scroll up hover doc
-vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()')
+vim.cmd 'command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()'
 
 -- Set Default Prefix.
 -- Note: You can set a prefix per lsp server in the lv-globals.lua file
-vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-  vim.lsp.diagnostic.on_publish_diagnostics, {
-    virtual_text = {
-      prefix = "",
-      spacing = 0,
-    },
-    signs = true,
-    underline = true,
-  }
-)
+vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
+  virtual_text = {
+    prefix = "",
+    spacing = 0,
+  },
+  signs = true,
+  underline = true,
+})
 
-vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
-  vim.lsp.handlers.hover, {
-    border = O.lsp.popup_border
-  }
-)
+vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
+  border = O.lsp.popup_border,
+})
 
-vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
-  vim.lsp.handlers.signature_help, {
-    border = O.lsp.popup_border
-  }
-)
+vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
+  border = O.lsp.popup_border,
+})
 
 -- symbols for autocomplete
 vim.lsp.protocol.CompletionItemKind = {
-    "   (Text) ",
-    "   (Method)",
-    "   (Function)",
-    "   (Constructor)",
-    " ﴲ  (Field)",
-    "[] (Variable)",
-    "   (Class)",
-    " ﰮ  (Interface)",
-    "   (Module)",
-    " 襁 (Property)",
-    "   (Unit)",
-    "   (Value)",
-    " 練 (Enum)",
-    "   (Keyword)",
-    "   (Snippet)",
-    "   (Color)",
-    "   (File)",
-    "   (Reference)",
-    "   (Folder)",
-    "   (EnumMember)",
-    " ﲀ  (Constant)",
-    " ﳤ  (Struct)",
-    "   (Event)",
-    "   (Operator)",
-    "   (TypeParameter)"
+  "   (Text) ",
+  "   (Method)",
+  "   (Function)",
+  "   (Constructor)",
+  " ﴲ  (Field)",
+  "[] (Variable)",
+  "   (Class)",
+  " ﰮ  (Interface)",
+  "   (Module)",
+  " 襁 (Property)",
+  "   (Unit)",
+  "   (Value)",
+  " 練 (Enum)",
+  "   (Keyword)",
+  "   (Snippet)",
+  "   (Color)",
+  "   (File)",
+  "   (Reference)",
+  "   (Folder)",
+  "   (EnumMember)",
+  " ﲀ  (Constant)",
+  " ﳤ  (Struct)",
+  "   (Event)",
+  "   (Operator)",
+  "   (TypeParameter)",
 }
 
 --[[ " autoformat
@@ -90,10 +84,10 @@ autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_sync(nil, 100) ]]
 -- autocmd FileType java nnoremap ca <Cmd>lua require('jdtls').code_action()<CR>
 
 local function documentHighlight(client, bufnr)
-    -- Set autocommands conditional on server_capabilities
-    if client.resolved_capabilities.document_highlight then
-        vim.api.nvim_exec(
-            [[
+  -- Set autocommands conditional on server_capabilities
+  if client.resolved_capabilities.document_highlight then
+    vim.api.nvim_exec(
+      [[
       hi LspReferenceRead cterm=bold ctermbg=red guibg=#464646
       hi LspReferenceText cterm=bold ctermbg=red guibg=#464646
       hi LspReferenceWrite cterm=bold ctermbg=red guibg=#464646
@@ -103,69 +97,68 @@ local function documentHighlight(client, bufnr)
         autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
       augroup END
     ]],
-            false
-        )
-    end
+      false
+    )
+  end
 end
 local lsp_config = {}
 
 if O.document_highlight then
-    function lsp_config.common_on_attach(client, bufnr)
-        documentHighlight(client, bufnr)
-    end
+  function lsp_config.common_on_attach(client, bufnr)
+    documentHighlight(client, bufnr)
+  end
 end
 
 function lsp_config.tsserver_on_attach(client, bufnr)
-    -- lsp_config.common_on_attach(client, bufnr)
-    client.resolved_capabilities.document_formatting = false
-
-    local ts_utils = require("nvim-lsp-ts-utils")
-
-    -- defaults
-    ts_utils.setup {
-        debug = false,
-        disable_commands = false,
-        enable_import_on_completion = false,
-        import_all_timeout = 5000, -- ms
-
-        -- eslint
-        eslint_enable_code_actions = true,
-        eslint_enable_disable_comments = true,
-        eslint_bin = O.lang.tsserver.linter,
-        eslint_config_fallback = nil,
-        eslint_enable_diagnostics = true,
-
-        -- formatting
-        enable_formatting = O.lang.tsserver.autoformat,
-        formatter = O.lang.tsserver.formatter,
-        formatter_config_fallback = nil,
-
-        -- parentheses completion
-        complete_parens = false,
-        signature_help_in_parens = false,
-
-        -- update imports on file move
-        update_imports_on_move = false,
-        require_confirmation_on_move = false,
-        watch_dir = nil,
-    }
-
-    -- required to fix code action ranges
-    ts_utils.setup_client(client)
-
-    -- TODO: keymap these?
-    -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", {silent = true})
-    -- vim.api.nvim_buf_set_keymap(bufnr, "n", "qq", ":TSLspFixCurrent<CR>", {silent = true})
-    -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", ":TSLspRenameFile<CR>", {silent = true})
-    -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", ":TSLspImportAll<CR>", {silent = true})
-end
+  -- lsp_config.common_on_attach(client, bufnr)
+  client.resolved_capabilities.document_formatting = false
+
+  local ts_utils = require "nvim-lsp-ts-utils"
+
+  -- defaults
+  ts_utils.setup {
+    debug = false,
+    disable_commands = false,
+    enable_import_on_completion = false,
+    import_all_timeout = 5000, -- ms
+
+    -- eslint
+    eslint_enable_code_actions = true,
+    eslint_enable_disable_comments = true,
+    eslint_bin = O.lang.tsserver.linter,
+    eslint_config_fallback = nil,
+    eslint_enable_diagnostics = true,
+
+    -- formatting
+    enable_formatting = O.lang.tsserver.autoformat,
+    formatter = O.lang.tsserver.formatter,
+    formatter_config_fallback = nil,
+
+    -- parentheses completion
+    complete_parens = false,
+    signature_help_in_parens = false,
+
+    -- update imports on file move
+    update_imports_on_move = false,
+    require_confirmation_on_move = false,
+    watch_dir = nil,
+  }
 
+  -- required to fix code action ranges
+  ts_utils.setup_client(client)
 
-require('lv-utils').define_augroups({
-    _general_lsp = {
-        {'FileType', 'lspinfo', 'nnoremap <silent> <buffer> q :q<CR>'},
-    }
-})
+  -- TODO: keymap these?
+  -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", {silent = true})
+  -- vim.api.nvim_buf_set_keymap(bufnr, "n", "qq", ":TSLspFixCurrent<CR>", {silent = true})
+  -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", ":TSLspRenameFile<CR>", {silent = true})
+  -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", ":TSLspImportAll<CR>", {silent = true})
+end
+
+require("lv-utils").define_augroups {
+  _general_lsp = {
+    { "FileType", "lspinfo", "nnoremap <silent> <buffer> q :q<CR>" },
+  },
+}
 
 -- Use a loop to conveniently both setup defined servers
 -- and map buffer local keybindings when the language server attaches

lua/lsp/svelte-ls.lua

@@ -1,5 +1,5 @@
 -- TODO what is a svelte filetype
-require'lspconfig'.svelte.setup {
-    cmd = {DATA_PATH .. "/lspinstall/svelte/node_modules/.bin/svelteserver", "--stdio"},
-    on_attach = require'lsp'.common_on_attach
+require("lspconfig").svelte.setup {
+  cmd = { DATA_PATH .. "/lspinstall/svelte/node_modules/.bin/svelteserver", "--stdio" },
+  on_attach = require("lsp").common_on_attach,
 }

lua/lsp/tailwindcss-ls.lua

@@ -1,12 +1,13 @@
 -- TODO what is a tailwindcss filetype
-local lspconfig = require 'lspconfig'
+local lspconfig = require "lspconfig"
 
 lspconfig.tailwindcss.setup {
-    cmd = {
-        "node", DATA_PATH .. "/lspinstall/tailwindcss/tailwindcss-intellisense/extension/dist/server/tailwindServer.js",
-        "--stdio"
-    },
-    filetypes = O.lang.tailwindcss.filetypes,
-    root_dir = require("lspconfig/util").root_pattern("tailwind.config.js", "postcss.config.ts", ".postcssrc"),
-    on_attach = require'lsp'.common_on_attach
+  cmd = {
+    "node",
+    DATA_PATH .. "/lspinstall/tailwindcss/tailwindcss-intellisense/extension/dist/server/tailwindServer.js",
+    "--stdio",
+  },
+  filetypes = O.lang.tailwindcss.filetypes,
+  root_dir = require("lspconfig/util").root_pattern("tailwind.config.js", "postcss.config.ts", ".postcssrc"),
+  on_attach = require("lsp").common_on_attach,
 }

lua/lsp/ts-fmt-lint.lua

@@ -3,35 +3,35 @@
 local M = {}
 
 M.setup = function()
-    local tsserver_args = {}
+  local tsserver_args = {}
 
-    local prettier = {
-        formatCommand = "prettier --stdin-filepath ${INPUT}",
-        formatStdin = true
-    }
-
-    if vim.fn.glob("node_modules/.bin/prettier") ~= "" then
-        prettier = {
-            formatCommand = "./node_modules/.bin/prettier --stdin-filepath ${INPUT}",
-            formatStdin = true
-        }
-    end
+  local prettier = {
+    formatCommand = "prettier --stdin-filepath ${INPUT}",
+    formatStdin = true,
+  }
 
-    require"lspconfig".efm.setup {
-        -- init_options = {initializationOptions},
-        cmd = {DATA_PATH .. "/lspinstall/efm/efm-langserver"},
-        init_options = {documentFormatting = true, codeAction = false},
-        filetypes = {"html", "css", "yaml", "vue", "javascript", "javascriptreact", "typescript", "typescriptreact"},
-        settings = {
-            rootMarkers = {".git/", "package.json"},
-            languages = {
-                html = {prettier},
-                css = {prettier},
-                json = {prettier},
-                yaml = {prettier}
-            }
-        }
+  if vim.fn.glob "node_modules/.bin/prettier" ~= "" then
+    prettier = {
+      formatCommand = "./node_modules/.bin/prettier --stdin-filepath ${INPUT}",
+      formatStdin = true,
     }
+  end
+
+  require("lspconfig").efm.setup {
+    -- init_options = {initializationOptions},
+    cmd = { DATA_PATH .. "/lspinstall/efm/efm-langserver" },
+    init_options = { documentFormatting = true, codeAction = false },
+    filetypes = { "html", "css", "yaml", "vue", "javascript", "javascriptreact", "typescript", "typescriptreact" },
+    settings = {
+      rootMarkers = { ".git/", "package.json" },
+      languages = {
+        html = { prettier },
+        css = { prettier },
+        json = { prettier },
+        yaml = { prettier },
+      },
+    },
+  }
 end
 
 return M

lua/lv-telescope/init.lua

@@ -36,7 +36,7 @@ telescope.setup {
     file_sorter = require("telescope.sorters").get_fzy_sorter,
     file_ignore_patterns = {},
     generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
-    path_display = {"shorten"},
+    path_display = { "shorten" },
     winblend = 0,
     border = {},
     borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },

lua/lv-which-key/init.lua

@@ -21,7 +21,7 @@ which_key.setup {
       z = true, -- bindings for folds, spelling and others prefixed with z
       g = true, -- bindings for prefixed with g
     },
-    spelling = {enabled = true, suggestions = 20}, -- use which-key for spelling hints
+    spelling = { enabled = true, suggestions = 20 }, -- use which-key for spelling hints
   },
   icons = {
     breadcrumb = "»", -- symbol used in the command line area that shows your active key combo
@@ -88,7 +88,7 @@ vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", { noremap = true,
 -- Save
 vim.api.nvim_set_keymap("n", "<leader>w", ":w!<CR>", { noremap = true, silent = true })
 
--- Quit 
+-- Quit
 vim.api.nvim_set_keymap("n", "<leader>q", ":q!<CR>", { noremap = true, silent = true })
 
 -- open lv-config

lua/settings.lua

@@ -11,8 +11,8 @@ cmd "set inccommand=split"
 cmd "set iskeyword+=-"
 cmd "set whichwrap+=<,>,[,],h,l"
 if O.transparent_window then
-    cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
-    cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
+  cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
+  cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
 end
 
 ---  SETTINGS  ---
@@ -21,7 +21,7 @@ opt.backup = false -- creates a backup file
 opt.clipboard = O.clipboard -- allows neovim to access the system clipboard
 opt.cmdheight = O.cmdheight -- more space in the neovim command line for displaying messages
 opt.colorcolumn = "99999" -- fix indentline for now
-opt.completeopt = {"menuone", "noselect"}
+opt.completeopt = { "menuone", "noselect" }
 opt.conceallevel = 0 -- so that `` is visible in markdown files
 opt.fileencoding = "utf-8" -- the encoding written to a file
 opt.guifont = "monospace:h17" -- the font used in graphical neovim applications