From e035f7172539e12c2264e3b9a39aa006d66f8c30 Mon Sep 17 00:00:00 2001 From: Adam Jeniski Date: Tue, 6 Sep 2022 11:34:24 -0400 Subject: [PATCH] improve commenting and svelte highlighting --- .config/nvim/init.lua | 409 +++++++++++++++++++++++++++++++----------- 1 file changed, 304 insertions(+), 105 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 3a8a390..7f54d1f 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -6,61 +6,71 @@ vim.opt.ignorecase = true vim.o.mouse = "a" vim.o.number = true vim.o.relativenumber = true -vim.o.wrap = true -- wrap lines -vim.o.encoding = "UTF-8" -- set encoding to UTF-8 (default was "latin1") -vim.o.wildmenu = true -- visual autocomplete for command menu -vim.o.lazyredraw = true -- redraw screen only when we need to -vim.o.showmatch = true -- highlight matching parentheses / brackets [{()}] -vim.o.laststatus = 2 -- always show statusline (even with only single window) -vim.o.ruler = true -- show line and column number of the cursor on right side of statusline -vim.o.visualbell = true -- blink cursor on error, instead of beeping -vim.cmd('set invlist') +vim.o.wrap = true -- wrap lines +vim.o.encoding = "UTF-8" -- set encoding to UTF-8 (default was "latin1") +vim.o.wildmenu = true -- visual autocomplete for command menu +vim.o.lazyredraw = true -- redraw screen only when we need to +vim.o.showmatch = true -- highlight matching parentheses / brackets [{()}] +vim.o.laststatus = 2 -- always show statusline (even with only single window) +vim.o.ruler = true -- show line and column number of the cursor on right side of statusline +vim.o.visualbell = true -- blink cursor on error, instead of beeping vim.api.nvim_set_var("toggle_syntax_state", true) -- Plugins local Plug = vim.fn['plug#'] vim.call('plug#begin', '~/.config/nvim/plugged') - -- Editor basics and navigation - Plug 'tpope/vim-sensible' -- some good default configs, we love tpope :) - Plug 'tpope/vim-surround' -- add surround motion (s), example: to change the surrounding double quotes to single quotes type: cs"' - Plug('scrooloose/nerdtree', {on = {'NERDTreeToggle', 'NERDTree'}}) -- file browser - Plug 'junegunn/goyo.vim' -- zen mode - Plug('junegunn/fzf', {['do'] = vim.fn['fzf#install']}) - Plug('nvim-treesitter/nvim-treesitter', {['do'] = vim.fn['TSUpdate']}) -- add support for text objects - Plug 'tiagofumo/vim-nerdtree-syntax-highlight' - -- Plug 'ctrlpvim/ctrlp.vim' -- minimal fuzzyfinder - Plug 'wadackel/vim-dogrun' -- colorscheme - Plug 'tribela/vim-transparent' -- clear background - Plug 'nvim-lua/plenary.nvim' -- testing framework, required for telescope - Plug 'nvim-telescope/telescope.nvim' -- fancy fuzzyfinder - Plug('nvim-telescope/telescope-fzf-native.nvim', { ['do'] = 'make' }) -- faster fzf - Plug 'nvim-telescope/telescope-file-browser.nvim' - Plug 'glepnir/dashboard-nvim' +-- Editor basics and navigation +Plug 'tpope/vim-sensible' -- some good default configs, we love tpope :) +Plug 'tpope/vim-surround' -- add surround motion (s), example: to change the surrounding double quotes to single quotes type: cs"' +Plug 'tpope/vim-repeat' +Plug('scrooloose/nerdtree', { on = { 'NERDTreeToggle', 'NERDTree' } }) -- file browser +Plug 'junegunn/goyo.vim' -- zen mode +Plug('junegunn/fzf', { ['do'] = vim.fn['fzf#install'] }) +Plug('nvim-treesitter/nvim-treesitter', { ['do'] = vim.fn['TSUpdate'] }) -- add support for text objects +Plug 'JoosepAlviste/nvim-ts-context-commentstring' +Plug 'tiagofumo/vim-nerdtree-syntax-highlight' +-- Plug 'ctrlpvim/ctrlp.vim' -- minimal fuzzyfinder +Plug 'wadackel/vim-dogrun' -- colorscheme +Plug 'tribela/vim-transparent' -- clear background +Plug 'nvim-lua/plenary.nvim' -- testing framework, required for telescope +Plug 'nvim-telescope/telescope.nvim' -- fancy fuzzyfinder +Plug('nvim-telescope/telescope-fzf-native.nvim', { ['do'] = 'make' }) -- faster fzf +Plug 'nvim-telescope/telescope-file-browser.nvim' +Plug 'nvim-telescope/telescope-ui-select.nvim' +Plug 'glepnir/dashboard-nvim' +Plug 'kshenoy/vim-signature' +Plug 'phaazon/hop.nvim' +Plug 'terrortylor/nvim-comment' - -- Git Integration - Plug 'airblade/vim-gitgutter' +-- Git Integration +Plug 'airblade/vim-gitgutter' - -- LSP - Plug "williamboman/nvim-lsp-installer" - Plug 'neovim/nvim-lspconfig' - Plug 'hrsh7th/cmp-nvim-lsp' - Plug 'hrsh7th/cmp-buffer' - Plug 'hrsh7th/cmp-path' - Plug 'hrsh7th/cmp-cmdline' - Plug 'hrsh7th/nvim-cmp' - Plug 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp - Plug 'L3MON4D3/LuaSnip' -- Snippets plugin +-- LSP +Plug "williamboman/nvim-lsp-installer" +Plug 'neovim/nvim-lspconfig' +Plug 'hrsh7th/cmp-nvim-lsp' +Plug 'hrsh7th/cmp-buffer' +Plug 'hrsh7th/cmp-path' +Plug 'hrsh7th/cmp-cmdline' +Plug 'hrsh7th/nvim-cmp' +Plug 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp +Plug 'L3MON4D3/LuaSnip' -- Snippets plugin - -- Airline - Plug 'vim-airline/vim-airline' - Plug 'vim-airline/vim-airline-themes' +-- Debugger +Plug 'mfussenegger/nvim-dap' +Plug 'rcarriga/nvim-dap-ui' - -- Lang Support - Plug 'sheerun/vim-polyglot' - Plug 'evanleck/vim-svelte' - Plug 'pantharshit00/vim-prisma' - Plug 'simrat39/rust-tools.nvim' - --Plug 'pangloss/vim-javascript' +-- Airline +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' + +-- Lang Support +Plug 'sheerun/vim-polyglot' +Plug 'pantharshit00/vim-prisma' +Plug 'simrat39/rust-tools.nvim' +Plug 'othree/html5.vim' +Plug 'pangloss/vim-javascript' +Plug('evanleck/vim-svelte', { ['branch'] = 'main' }) vim.call('plug#end') -- set colorscheme @@ -74,14 +84,37 @@ vim.cmd("let g:airline#extensions#tabline#left_alt_sep = '|'") vim.cmd("let g:airline_theme='night_owl'") vim.cmd("let g:airline_section_y = '%{strftime(\"%H:%M\")}'") + +-- setup svelte +vim.cmd("let g:svelte_preprocessor_tags = [ { 'name': 'ts', 'tag': 'script', 'as': 'typescript' } ]") +vim.cmd("let g:svelte_preprocessors = ['ts']") + -- setup TreeSitter -require'nvim-treesitter.configs'.setup { +require 'nvim-treesitter.configs'.setup { ensure_installed = "all", - sync_install = false + sync_install = false, + context_commentstring = { + enable = true + } } +-- setup comments +require('nvim_comment').setup({ + hook = function() + if vim.api.nvim_buf_get_option(0, "filetype") == "svelte" then + require("ts_context_commentstring.internal").update_commentstring() + end + end +}) + +-- setup hop +require 'hop'.setup {} + +-- setup comments +require('nvim_comment').setup() + -- setup dashboard - local home = os.getenv('HOME') +local home = os.getenv('HOME') local db = require('dashboard') db.preview_command = 'cat | lolcat -v 2' db.preview_file_path = home .. '/.config/nvim/static/neovim.bold' @@ -91,9 +124,15 @@ db.session_directory = home .. '/.sessions' db.custom_center = { { icon = '🕑 ', - desc = 'Recently latest session ', + desc = 'Open Most Recent Session ', shortcut = 'sl', - action ='SessionLoad' + action = 'SessionLoad' + }, + { + icon = '🕑 ', + desc = 'Open Default Layout Session ', + shortcut = 'sd', + action = 'source ~/.sessions/default_layout.vim' }, { icon = '🔍 ', @@ -104,7 +143,7 @@ db.custom_center = { { icon = '🌲 ', desc = 'File Browser ', - action = 'Telescope file_browser', + action = 'Telescope file_browser', shortcut = 'fb' }, { @@ -115,34 +154,82 @@ db.custom_center = { }, } --- luasnip setup -local luasnip = require 'luasnip' +-- snippets setup +local ls = require 'luasnip' +local s = ls.s +local i = ls.insert_node +local t = ls.text_node +local fmt = require('luasnip.extras.fmt').fmt + +ls.add_snippets("svelte", { + s("component-svelte", { + t { '', '', '
', '\t' }, + i(2, ''), + t { '', '
', '', '', '' } + }), +}) + +local has_words_before = function() + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil +end + +local cmp = require 'cmp' +if not cmp then + vim.cmd("echo Error cmp not found") + return +end -local cmp = require'cmp' cmp.setup({ snippet = { expand = function(args) - luasnip.lsp_expand(args.body) + ls.lsp_expand(args.body) end, }, window = {}, mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete(), - [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_prev_item(), [''] = cmp.mapping.abort(), [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif ls.expand_or_jumpable() then + ls.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif ls.jumpable(-1) then + ls.jump(-1) + else + fallback() + end + end, { "i", "s" }), }), sources = cmp.config.sources({ { name = 'nvim_lsp' }, + { name = 'luasnip' }, }, { - { name = 'buffer' } + { name = 'buffer' }, }) }) + -- setup LSP -local opts = { noremap=true, silent=true } +local opts = { noremap = true, silent = true } vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) @@ -150,33 +237,35 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer -local on_attach = function(client, bufnr) - -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') +local on_attach = function(_, bufnr) + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap=true, silent=true, buffer=bufnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'f', vim.lsp.buf.formatting, bufopts) + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'gy', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { silent = true, buffer = bufnr }) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'F', vim.lsp.buf.formatting, bufopts) end +-- Auto-exit if it is the last buffer open vim.api.nvim_create_autocmd( { "BufEnter" }, - { pattern = { "*" }, command = "if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif" } + { pattern = { "*" }, + command = "if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif" } ) require("nvim-lsp-installer").setup { @@ -203,24 +292,45 @@ lspconfig.sumneko_lua.setup { }, on_attach = on_attach, } -lspconfig.tsserver.setup{ +lspconfig.tsserver.setup { on_attach = on_attach, } -require('rust-tools').setup{ +require('rust-tools').setup { tools = { -- rust-tools options + executor = require("rust-tools/executors").termopen, + on_initialized = nil, + reload_workspace_from_cargo_toml = true, autoSetHints = true, - hover_with_actions = true, - runnables = { - use_telescope = true + hover_with_actions = false, + hover_actions = { + border = { + { "╭", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╮", "FloatBorder" }, + { "│", "FloatBorder" }, + { "╯", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╰", "FloatBorder" }, + { "│", "FloatBorder" }, + }, + auto_focus = true, }, inlay_hints = { - show_parameter_hints = false, - parameter_hints_prefix = "", - other_hints_prefix = "", + show_parameter_hints = true, + parameter_hints_prefix = "<- ", + other_hints_prefix = "=> ", + current_line_only = false, } }, server = { - on_attach = on_attach, + on_attach = function(_, buffnr) + on_attach(_, buffnr) + local bufopts = { silent = true, buffer = buffnr } + vim.keymap.set('n', 'ca', ':RustCodeAction', bufopts) + vim.keymap.set('n', 'K', ':RustHoverActions', bufopts) + vim.keymap.set('n', 'R', ':RustRunnables', bufopts) + vim.keymap.set('n', 'D', ':RustDebuggables', bufopts) + end, settings = { ["rust-analyzer"] = { checkOnSave = { @@ -228,9 +338,16 @@ require('rust-tools').setup{ } } } - } + }, + dap = { + adapter = { + type = "executable", + command = "lldb-vscode", + name = "rt_lldb", + }, + }, } -require('lspconfig')['svelte'].setup{ +require('lspconfig')['svelte'].setup { on_attach = on_attach, } @@ -254,13 +371,72 @@ telescope.setup({ }) telescope.load_extension('file_browser') telescope.load_extension('fzf') +telescope.load_extension("ui-select") + +-- Debugger +local dap = require('dap') +require("dapui").setup({ + icons = { expanded = "▾", collapsed = "▸" }, + mappings = { + expand = { "", "<2-LeftMouse>" }, + open = "o", + remove = "d", + edit = "e", + repl = "r", + toggle = "t", + }, + expand_lines = vim.fn.has("nvim-0.7"), + layouts = { + { + elements = { + { id = "scopes", size = 0.25 }, + "breakpoints", + "stacks", + "watches", + }, + size = 40, -- 40 columns + position = "left", + }, + { + elements = { + "repl", + "console", + }, + size = 0.25, -- 25% of total lines + position = "bottom", + }, + }, + floating = { + max_height = nil, -- These can be integers or a float between 0 and 1. + max_width = nil, -- Floats will be treated as percentage of your screen. + border = "single", -- Border style. Can be "single", "double" or "rounded" + mappings = { + close = { "q", "" }, + }, + }, + windows = { indent = 1 }, + render = { + max_type_length = nil, -- Can be integer or nil. + } +}) +local dapui = require("dapui") +dap.listeners.after.event_initialized["dapui_config"] = function() + dapui.open {} +end +dap.listeners.before.event_terminated["dapui_config"] = function() + dapui.close {} +end +dap.listeners.before.event_exited["dapui_config"] = function() + dapui.close {} +end -- keymaps -local loud_opts = { noremap=true } +local loud_opts = { noremap = true } vim.keymap.set("n", "", ":wa:echo 'File saved.'", loud_opts) vim.keymap.set("n", "", ":NERDTreeToggle", opts) vim.keymap.set("n", "tt", ":TransparentToggle", opts) -vim.keymap.set("n", "tz", ":Goyo 150", opts) +vim.keymap.set("n", "tzz", ":Goyo", opts) +vim.keymap.set("n", "tzw", ":Goyo 160", opts) vim.keymap.set("n", "tr", ":set relativenumber!") vim.keymap.set("n", "ti", ":set invlist!") vim.keymap.set("n", "gt", ":bn", opts) @@ -268,11 +444,12 @@ vim.keymap.set("n", "gT", ":bp", opts) vim.keymap.set("n", "", ":nohlsearch", opts) vim.keymap.set("n", "ff", ":Telescope find_files", opts) vim.keymap.set('n', 'fk', ':Telescope keymaps', opts) -vim.keymap.set('n', 'fb', ':Telescope file_browser', opts) +vim.keymap.set('n', 'fB', ':Telescope file_browser', opts) +vim.keymap.set('n', 'fb', ':Telescope buffers', opts) vim.keymap.set("n", "", ":Telescope git_files", opts) vim.keymap.set("n", "fc", ":Telescope git") vim.keymap.set("n", "fg", ":Telescope live_grep", opts) -vim.keymap.set("n", "fbc", ":Telescope git_bcommits", opts) +vim.keymap.set("n", "fC", ":Telescope git_bcommits", opts) vim.keymap.set("n", "fc", ":Telescope git_commits", opts) vim.keymap.set("i", "", "", opts) vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) @@ -280,10 +457,32 @@ vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) vim.keymap.set("n", "", ":nohlsearch", opts) -vim.keymap.set("n", "]h", "(GitGutterNextHunk)") -vim.keymap.set("n", "[h", "(GitGutterPrevHunk)") -vim.keymap.set("n", "gd", ":GitGutterDiffOrig") -vim.keymap.set("n", "gf", ":GitGutterFold") -vim.keymap.set("n", "sl", ":SessionLoad") -vim.keymap.set("n", "ss", ":SessionSave") - +vim.keymap.set("n", "]h", "(GitGutterNextHunk)", opts) +vim.keymap.set("n", "[h", "(GitGutterPrevHunk)", opts) +vim.keymap.set("n", "gd", ":GitGutterDiffOrig", opts) +vim.keymap.set("n", "gf", ":GitGutterFold", opts) +vim.keymap.set("n", "sl", ":SessionLoad", opts) +vim.keymap.set("n", "ss", ":SessionSave", opts) +vim.keymap.set("n", "cb", ":%bd|e#:echo closed all other buffers", loud_opts) +vim.keymap.set("n", "P", ":!yarn format") +vim.keymap.set("n", "R", ":source ~/.config/nvim/init.lua") +vim.api.nvim_set_keymap('', 'f', + "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.AFTER_CURSOR, current_line_only = true })" + , {}) +vim.api.nvim_set_keymap('', 'F', + "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, current_line_only = true })" + , {}) +vim.api.nvim_set_keymap('', 't', + "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.AFTER_CURSOR, current_line_only = true, hint_offset = -1 })" + , {}) +vim.api.nvim_set_keymap('', 'T', + "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, current_line_only = true, hint_offset = 1 })" + , {}) +vim.keymap.set("n", "gw", ":HopWord", opts); +vim.keymap.set("n", "gh", ":HopWordCurrentLine", opts) +vim.keymap.set("n", "gl", ":HopLine", opts) +vim.keymap.set("n", "B", dap.toggle_breakpoint) +vim.keymap.set("n", "", dap.continue) +vim.keymap.set("n", "", dap.step_into) +vim.keymap.set("n", "", dap.step_over) +vim.keymap.set("t", "", "", opts)