From 3da566d1c3785ff1fc1911dc4127c8463b08ff90 Mon Sep 17 00:00:00 2001 From: Akshay Date: Wed, 17 Feb 2021 17:24:27 +0530 Subject: fix indents, scheme ftplugin --- ftplugin/scheme.vim | 10 ---------- lua/lsp.lua | 48 ++++++++++++++++++++++++------------------------ lua/treesitter.lua | 2 +- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim index 4af180c..784bf29 100644 --- a/ftplugin/scheme.vim +++ b/ftplugin/scheme.vim @@ -5,13 +5,3 @@ setlocal expandtab setlocal autoindent setlocal smarttab setlocal formatoptions=croql - -setlocal makeprg=guile-lint - -augroup SchemeLint - autocmd! - autocmd BufWritePost *.scm silent make! | silent redraw - autocmd QuickFixCmdPost [^l]* cwindow -augroup END - -CocDisable diff --git a/lua/lsp.lua b/lua/lsp.lua index f921c70..bc33afd 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -1,36 +1,36 @@ local nvim_lsp = require('lspconfig') local on_attach = function(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 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 } - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) - buf_set_keymap('n', '[g', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']g', 'lua vim.lsp.diagnostic.goto_next()', opts) - buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) + -- Mappings. + local opts = { noremap=true, silent=true } + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) + buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) + buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) + buf_set_keymap('n', '[g', 'lua vim.lsp.diagnostic.goto_prev()', opts) + buf_set_keymap('n', ']g', 'lua vim.lsp.diagnostic.goto_next()', opts) + buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - -- Set some keybinds conditional on server capabilities - if client.resolved_capabilities.document_formatting then - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) - elseif client.resolved_capabilities.document_range_formatting then - buf_set_keymap("n", "f", "lua vim.lsp.buf.range_formatting()", opts) - end + -- Set some keybinds conditional on server capabilities + if client.resolved_capabilities.document_formatting then + buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) + elseif client.resolved_capabilities.document_range_formatting then + buf_set_keymap("n", "f", "lua vim.lsp.buf.range_formatting()", opts) + end end local servers = { "hls", "rnix", "bashls", "pyls" } for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { on_attach = on_attach } + nvim_lsp[lsp].setup { on_attach = on_attach } end local capabilities = vim.lsp.protocol.make_client_capabilities() diff --git a/lua/treesitter.lua b/lua/treesitter.lua index d503b46..5027de5 100644 --- a/lua/treesitter.lua +++ b/lua/treesitter.lua @@ -1,7 +1,7 @@ require'nvim-treesitter.configs'.setup { highlight = { enable = true, - + -- disable = { "c"}, }, incremental_selection = { enable = true, -- cgit v1.2.3