vim indenting and code range
This commit is contained in:
parent
3490407647
commit
4273b7612e
2 changed files with 56 additions and 49 deletions
|
|
@ -36,22 +36,23 @@ nvim_lsp.rust_analyzer.setup({
|
|||
}
|
||||
})
|
||||
nvim_lsp.gopls.setup({
|
||||
on_attach = function (client, bufnr)
|
||||
client.server_capabilities.semanticTokensProvider = {
|
||||
full = true,
|
||||
legend = {
|
||||
--tokenTypes = { 'namespace', 'type', 'class', 'enum', 'interface', 'struct', 'typeParameter', 'parameter', 'variable', 'property', 'enumMember', 'event', 'function', 'method', 'macro', 'keyword', 'modifier', 'comment', 'string', 'number', 'regexp', 'operator', 'decorator', },
|
||||
tokenTypes = { 'namespace' },
|
||||
tokenModifiers = { 'declaration', 'definition', 'readonly', 'static', 'deprecated', 'abstract', 'async', 'modification', 'documentation', 'defaultLibrary',
|
||||
},
|
||||
}
|
||||
}
|
||||
end,
|
||||
settings = {
|
||||
gopls = {
|
||||
semanticTokens = true,
|
||||
},
|
||||
},
|
||||
on_attach = function(client, bufnr)
|
||||
client.server_capabilities.semanticTokensProvider = {
|
||||
full = true,
|
||||
legend = {
|
||||
--tokenTypes = { 'namespace', 'type', 'class', 'enum', 'interface', 'struct', 'typeParameter', 'parameter', 'variable', 'property', 'enumMember', 'event', 'function', 'method', 'macro', 'keyword', 'modifier', 'comment', 'string', 'number', 'regexp', 'operator', 'decorator', },
|
||||
tokenTypes = { 'namespace' },
|
||||
tokenModifiers = { 'declaration', 'definition', 'readonly', 'static', 'deprecated', 'abstract', 'async',
|
||||
'modification', 'documentation', 'defaultLibrary',
|
||||
},
|
||||
}
|
||||
}
|
||||
end,
|
||||
settings = {
|
||||
gopls = {
|
||||
semanticTokens = true,
|
||||
},
|
||||
},
|
||||
})
|
||||
nvim_lsp.pyright.setup({ on_attach = on_attach })
|
||||
|
||||
|
|
@ -67,7 +68,7 @@ nvim_lsp.hls.setup {
|
|||
}
|
||||
|
||||
nvim_lsp.svelte.setup {
|
||||
cmd = { "/home/barak/.yarn/bin/svelteserver", "--stdio" }
|
||||
cmd = { "/home/barak/.bun/bin/bunx", "svelteserver", "--stdio" }
|
||||
}
|
||||
|
||||
local runtime_path = vim.split(package.path, ';')
|
||||
|
|
@ -143,31 +144,31 @@ nvim_lsp.efm.setup {
|
|||
-- Enable diagnostics
|
||||
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
|
||||
vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
update_in_insert = false,
|
||||
}
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
update_in_insert = false,
|
||||
}
|
||||
)
|
||||
|
||||
-- Compe setup
|
||||
require 'compe'.setup {
|
||||
enabled = true;
|
||||
autocomplete = true;
|
||||
debug = false;
|
||||
min_length = 1;
|
||||
preselect = 'disable';
|
||||
throttle_time = 80;
|
||||
source_timeout = 200;
|
||||
incomplete_delay = 400;
|
||||
max_abbr_width = 100;
|
||||
max_kind_width = 100;
|
||||
max_menu_width = 100;
|
||||
documentation = true;
|
||||
enabled = true,
|
||||
autocomplete = true,
|
||||
debug = false,
|
||||
min_length = 1,
|
||||
preselect = 'disable',
|
||||
throttle_time = 80,
|
||||
source_timeout = 200,
|
||||
incomplete_delay = 400,
|
||||
max_abbr_width = 100,
|
||||
max_kind_width = 100,
|
||||
max_menu_width = 100,
|
||||
documentation = true,
|
||||
|
||||
source = {
|
||||
path = true;
|
||||
nvim_lsp = true;
|
||||
};
|
||||
path = true,
|
||||
nvim_lsp = true,
|
||||
},
|
||||
}
|
||||
|
||||
--signature_cfg = {
|
||||
|
|
@ -282,17 +283,17 @@ require('trouble').setup {
|
|||
jump = { "o", "<tab>" }, -- jump to the diagnostic or open / close folds
|
||||
--open_split = { "<c-x>" }, -- open buffer in new split
|
||||
--open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
|
||||
open_tab = {}, -- open buffer in new tab
|
||||
jump_close = { "<cr>" }, -- jump to the diagnostic and close the list
|
||||
toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
|
||||
toggle_preview = "P", -- toggle auto_preview
|
||||
hover = "K", -- opens a small popup with the full multiline message
|
||||
preview = "p", -- preview the diagnostic location
|
||||
open_tab = {}, -- open buffer in new tab
|
||||
jump_close = { "<cr>" }, -- jump to the diagnostic and close the list
|
||||
toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
|
||||
toggle_preview = "P", -- toggle auto_preview
|
||||
hover = "K", -- opens a small popup with the full multiline message
|
||||
preview = "p", -- preview the diagnostic location
|
||||
close_folds = { "zM", "zm" }, -- close all folds
|
||||
open_folds = { "zR", "zr" }, -- open all folds
|
||||
open_folds = { "zR", "zr" }, -- open all folds
|
||||
toggle_fold = { "zA", "za" }, -- toggle fold of current file
|
||||
previous = "k", -- previous item
|
||||
next = "j" -- next item
|
||||
previous = "k", -- previous item
|
||||
next = "j" -- next item
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -454,7 +455,7 @@ require 'nvim-treesitter.configs'.setup {
|
|||
playground = {
|
||||
enable = true,
|
||||
disable = {},
|
||||
updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
|
||||
updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
|
||||
persist_queries = false, -- Whether the query persists across vim sessions
|
||||
keybindings = {
|
||||
toggle_query_editor = 'o',
|
||||
|
|
|
|||
12
.vimrc
12
.vimrc
|
|
@ -113,7 +113,6 @@ Plug 'chrisbra/NrrwRgn'
|
|||
"Plug 'tpope/vim-fireplace', {'for': 'clojure'}
|
||||
""Plug 'terryma/vim-multiple-cursors'
|
||||
"Plug 'ambv/black'
|
||||
Plug 'kana/vim-textobj-user'
|
||||
|
||||
|
||||
" Plugins I wish I used more
|
||||
|
|
@ -126,7 +125,6 @@ Plug 'tpope/vim-unimpaired'
|
|||
Plug 'b4winckler/vim-angry'
|
||||
Plug 'tpope/vim-surround'
|
||||
Plug 'junegunn/vim-easy-align'
|
||||
Plug 'bps/vim-textobj-python'
|
||||
|
||||
" Plugins I NEED
|
||||
Plug 'scrooloose/nerdcommenter'
|
||||
|
|
@ -230,6 +228,8 @@ Plug 'kristijanhusak/defx-icons'
|
|||
|
||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||
Plug 'nvim-treesitter/playground'
|
||||
Plug 'nvim-treesitter/nvim-treesitter-textobjects'
|
||||
|
||||
|
||||
"Plug 'ggandor/lightspeed.nvim'
|
||||
"Plug 'justinmk/vim-sneak'
|
||||
|
|
@ -280,7 +280,7 @@ nnoremap <silent> gW <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
|
|||
"nnoremap <silent> gd <cmd>lua vim.lsp.buf.declaration()<CR>
|
||||
nnoremap <silent> ga <cmd>lua vim.lsp.buf.code_action()<CR>
|
||||
"nnoremap <silent> ga <cmd>lua require('telescope.builtin').lsp_code_actions({initial_mode = "normal"})<cr>
|
||||
vnoremap <silent> ga <cmd>lua vim.lsp.buf.range_code_action()<CR>
|
||||
vnoremap <silent> ga <cmd>lua vim.lsp.buf.code_action()<CR>
|
||||
"vnoremap <silent> ga :<C-U>lua require('telescope.builtin').lsp_range_code_actions({initial_mode = "normal"})<cr>
|
||||
"nnoremap <silent> ge <cmd>lua vim.lsp.diagnostic.show_line_diagnostics({show_header = false, focusable = false})<CR>
|
||||
"nnoremap <silent> ge <cmd>lua vim.diagnostic.open_float({focusable = false})<CR>
|
||||
|
|
@ -1083,3 +1083,9 @@ map <F10> command! -nargs=0 Syn call Syn()
|
|||
" Final hi links for TreeSitter
|
||||
|
||||
hi link @type.rust TSCSecondaryTypeParam
|
||||
|
||||
let s:gptool_temp = expand($HOME . '/src/gptool/bindings.vim')
|
||||
if filereadable(s:gptool_temp)
|
||||
exec ':so ' . s:gptool_temp
|
||||
endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue