lazy load lspconfig :D

3 years ago · 0e9b3832ae
parent 2f238742d2
commit 0e9b3832ae
3 changed files with 115 additions and 108 deletions
--- a/init.lua
+++ b/init.lua
@ -5,9 +5,6 @@ require "misc-utils"
 require "top-bufferline"
 require "statusline"

-- lsp stuff
-require "nvim-lspconfig"
-
 local cmd = vim.cmd
 local g = vim.g

--- a/lua/nvim-lspconfig.lua
+++ b/lua/nvim-lspconfig.lua
@ -1,90 +1,94 @@
-function on_attach(client, bufnr)
-    local function buf_set_keymap(...)
-        vim.api.nvim_buf_set_keymap(bufnr, ...)
-    end
-    local function buf_set_option(...)
-        vim.api.nvim_buf_set_option(bufnr, ...)
-    end
+local M = {}
+
+M.config = function()
+    function on_attach(client, bufnr)
+        local function buf_set_keymap(...)
+            vim.api.nvim_buf_set_keymap(bufnr, ...)
+        end
+        local function buf_set_option(...)
+            vim.api.nvim_buf_set_option(bufnr, ...)
+        end

-    buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
+        buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")

-    -- Mappings.
-    local opts = {noremap = true, silent = true}
+        -- Mappings.
+        local opts = {noremap = true, silent = true}

-    buf_set_keymap("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
-    buf_set_keymap("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts)
-    buf_set_keymap("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
-    buf_set_keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
-    buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-    buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
-    buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
-    buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
-    buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
-    buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
-    buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
-    buf_set_keymap("n", "<space>e", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", opts)
-    buf_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
-    buf_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
-    buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
+        buf_set_keymap("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
+        buf_set_keymap("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts)
+        buf_set_keymap("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
+        buf_set_keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
+        buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
+        buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
+        buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
+        buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
+        buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
+        buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
+        buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
+        buf_set_keymap("n", "<space>e", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", opts)
+        buf_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
+        buf_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
+        buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)

-    -- Set some keybinds conditional on server capabilities
-    if client.resolved_capabilities.document_formatting then
-        buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
-    elseif client.resolved_capabilities.document_range_formatting then
-        buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
+        -- Set some keybinds conditional on server capabilities
+        if client.resolved_capabilities.document_formatting then
+            buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
+        elseif client.resolved_capabilities.document_range_formatting then
+            buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
+        end
    end
-end

-- lspInstall + lspconfig stuff
+    -- lspInstall + lspconfig stuff

-local function setup_servers()
-    require "lspinstall".setup()
+    local function setup_servers()
+        require "lspinstall".setup()

-    local lspconf = require("lspconfig")
-    local servers = require "lspinstall".installed_servers()
+        local lspconf = require("lspconfig")
+        local servers = require "lspinstall".installed_servers()

-    for _, lang in pairs(servers) do
-        if lang ~= "lua" then
-            lspconf[lang].setup {
-                on_attach = on_attach,
-                root_dir = vim.loop.cwd
-            }
-        elseif lang == "lua" then
-            lspconf[lang].setup {
-                root_dir = function()
-                    return vim.loop.cwd()
-                end,
-                settings = {
-                    Lua = {
-                        diagnostics = {
-                            globals = {"vim"}
-                        },
-                        workspace = {
-                            library = {
-                                [vim.fn.expand("$VIMRUNTIME/lua")] = true,
-                                [vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true
+        for _, lang in pairs(servers) do
+            if lang ~= "lua" then
+                lspconf[lang].setup {
+                    on_attach = on_attach,
+                    root_dir = vim.loop.cwd
+                }
+            elseif lang == "lua" then
+                lspconf[lang].setup {
+                    root_dir = vim.loop.cwd,
+                    settings = {
+                        Lua = {
+                            diagnostics = {
+                                globals = {"vim"}
+                            },
+                            workspace = {
+                                library = {
+                                    [vim.fn.expand("$VIMRUNTIME/lua")] = true,
+                                    [vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true
+                                }
+                            },
+                            telemetry = {
+                                enable = false
                            }
-                        },
-                        telemetry = {
-                            enable = false
                        }
                    }
                }
-            }
+            end
        end
    end
-end

-setup_servers()
+    setup_servers()
+
+    -- Automatically reload after `:LspInstall <server>` so we don't have to restart neovim
+    require "lspinstall".post_install_hook = function()
+        setup_servers() -- reload installed servers
+        vim.cmd("bufdo e") -- triggers FileType autocmd that starts the server
+    end

-- Automatically reload after `:LspInstall <server>` so we don't have to restart neovim
-require "lspinstall".post_install_hook = function()
-    setup_servers() -- reload installed servers
-    vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server
+    -- replace the default lsp diagnostic letters with prettier symbols
+    vim.fn.sign_define("LspDiagnosticsSignError", {text = "", numhl = "LspDiagnosticsDefaultError"})
+    vim.fn.sign_define("LspDiagnosticsSignWarning", {text = "", numhl = "LspDiagnosticsDefaultWarning"})
+    vim.fn.sign_define("LspDiagnosticsSignInformation", {text = "", numhl = "LspDiagnosticsDefaultInformation"})
+    vim.fn.sign_define("LspDiagnosticsSignHint", {text = "", numhl = "LspDiagnosticsDefaultHint"})
 end

-- replace the default lsp diagnostic letters with prettier symbols
-vim.fn.sign_define("LspDiagnosticsSignError", {text = "", numhl = "LspDiagnosticsDefaultError"})
-vim.fn.sign_define("LspDiagnosticsSignWarning", {text = "", numhl = "LspDiagnosticsDefaultWarning"})
-vim.fn.sign_define("LspDiagnosticsSignInformation", {text = "", numhl = "LspDiagnosticsDefaultInformation"})
-vim.fn.sign_define("LspDiagnosticsSignHint", {text = "", numhl = "LspDiagnosticsDefaultHint"})
+return M
--- a/lua/pluginList.lua
+++ b/lua/pluginList.lua
@ -5,9 +5,11 @@ return packer.startup(
    function()
        use "wbthomason/packer.nvim"

+        use "akinsho/nvim-bufferline.lua"
+        use "glepnir/galaxyline.nvim"
+
        -- color related stuff
        use "siduck76/nvim-base16.lua"
-
        use {
            "norcalli/nvim-colorizer.lua",
            event = "BufRead",
@ -16,7 +18,7 @@ return packer.startup(
            end
        }

-        -- lang stuff
+        -- language related plugins
        use {
            "nvim-treesitter/nvim-treesitter",
            event = "BufRead",
@ -25,17 +27,16 @@ return packer.startup(
            end
        }

-        use "neovim/nvim-lspconfig"
-
-        -- load compe in insert mode only
        use {
-            "hrsh7th/nvim-compe",
-            event = "InsertEnter",
+            "neovim/nvim-lspconfig",
+            event = "BufRead",
            config = function()
-                require("compe-completion").config()
+                require("nvim-lspconfig").config()
            end
        }

+        use "kabouzeid/nvim-lspinstall"
+
        use {
            "onsails/lspkind-nvim",
            event = "BufRead",
@ -44,14 +45,44 @@ return packer.startup(
            end
        }

+        -- load compe in insert mode only
+        use {
+            "hrsh7th/nvim-compe",
+            event = "InsertEnter",
+            config = function()
+                require("compe-completion").config()
+            end
+        }
+
        use {
            "sbdchd/neoformat",
            cmd = "Neoformat"
        }

        use "nvim-lua/plenary.nvim"
-        use "kabouzeid/nvim-lspinstall"

+        -- snippet support
+        use {
+            "hrsh7th/vim-vsnip",
+            event = "InsertCharPre"
+        }
+        use "rafamadriz/friendly-snippets"
+
+        -- file managing , picker etc
+        use {
+            "kyazdani42/nvim-tree.lua",
+            cmd = "NvimTreeToggle",
+            config = function()
+                require("nvimTree").config()
+            end
+        }
+
+        use "kyazdani42/nvim-web-devicons"
+        use "nvim-telescope/telescope.nvim"
+        use "nvim-telescope/telescope-media-files.nvim"
+        use "nvim-lua/popup.nvim"
+
+        -- misc plugins
        use {
            "lewis6991/gitsigns.nvim",
            event = "BufRead",
@ -60,9 +91,6 @@ return packer.startup(
            end
        }

-        use "akinsho/nvim-bufferline.lua"
-        use "glepnir/galaxyline.nvim"
-
        use {
            "windwp/nvim-autopairs",
            event = "InsertEnter",
@ -84,28 +112,6 @@ return packer.startup(
            end
        }

-        -- snippet support
-        use {
-            "hrsh7th/vim-vsnip",
-            event = "InsertCharPre"
-        }
-        use "rafamadriz/friendly-snippets"
-
-        -- file managing , picker etc
-        use {
-            "kyazdani42/nvim-tree.lua",
-            cmd = "NvimTreeToggle",
-            config = function()
-                require("nvimTree").config()
-            end
-        }
-
-        use "kyazdani42/nvim-web-devicons"
-        use "nvim-telescope/telescope.nvim"
-        use "nvim-telescope/telescope-media-files.nvim"
-        use "nvim-lua/popup.nvim"
-
-        -- misc
        use {
            "glepnir/dashboard-nvim",
            cmd = {