annotate dot_config/nvim/config.lua @ 350:a9910306741c

Disable highlighting with treesitter
author Zeger Van de Vannet <zegervdv@me.com>
date Fri, 19 Feb 2021 16:16:41 +0100
parents 3d01318e4743
children 678cb3fdb667
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
1 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
2 -- Neovim dotfiles
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
3 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
4 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
5
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
6 local execute = vim.api.nvim_command
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
7 local fn = vim.fn
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
8
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
9 -- Bootstrap package manager
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
10 local install_path = fn.stdpath('data')..'/site/pack/packer/opt/packer.nvim'
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
11
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
12 if fn.empty(fn.glob(install_path)) > 0 then
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
13 execute('!git clone https://github.com/wbthomason/packer.nvim '..install_path)
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
14 end
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
15
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
16 -- Packer configuration is compiled and only needs to be loaded on changes
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
17 function packer_enable()
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
18 vim.cmd "packadd packer.nvim"
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
19
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
20 require('packer').startup(function()
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
21 use {'wbthomason/packer.nvim', opt = true}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
22
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
23 -- General plugins
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
24 use {'tpope/vim-sensible'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
25 use {'tpope/vim-repeat'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
26 use {'tpope/vim-rsi'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
27 use {'sgur/vim-editorconfig'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
28 use {'ShikChen/osc52.vim'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
29 use {'einfachtoll/didyoumean'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
30
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
31 use {'tpope/vim-obsession'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
32 use {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
33 'tpope/vim-eunuch',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
34 cmd = {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
35 'Remove',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
36 'Unlink',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
37 'Move',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
38 'Rename',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
39 'Mkdir',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
40 'Chmod',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
41 'Find',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
42 'Locate',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
43 'SudoEdit',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
44 'SudoWrite'
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
45 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
46 }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
47
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
48 use {'psliwka/vim-smoothie'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
49
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
50 -- Spelling/autocorrection
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
51 use {'tpope/vim-abolish'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
52
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
53 -- Git/VCS
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
54 use {'vim-scripts/gitignore'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
55 use {'sjl/splice.vim', opt = true, cmd = {'SpliceInit'}}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
56 use {'tpope/vim-git'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
57
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
58 -- Comments
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
59 use {'tpope/vim-commentary'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
60
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
61 -- Undoing
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
62 use {'sjl/gundo.vim', cmd = {'GundoToggle'}}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
63
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
64 -- Parentheses etc
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
65 use {'tpope/vim-surround'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
66 use {'raimondi/delimitMate'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
67
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
68 -- Moving around within lines
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
69 use {'wellle/targets.vim', event = 'InsertEnter *'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
70
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
71 -- Searching
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
72 use {'mhinz/vim-grepper', cmd = {'Grepper'}}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
73
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
74 -- Indent lines
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
75 use {'Yggdroot/indentline'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
76 use {'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
77
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
78 -- Tmux
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
79 function test_tmux()
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
80 return os.getenv('TMUX') ~= nil
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
81 end
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
82 use {'christoomey/vim-tmux-navigator'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
83 use {'tmux-plugins/vim-tmux-focus-events', cond = test_tmux}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
84
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
85 -- Completion/snippets/LSP
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
86 use {'neovim/nvim-lspconfig'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
87 use {
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
88 'hrsh7th/nvim-compe',
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
89 config = function ()
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
90 require'compe'.setup {
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
91 enabled = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
92 autocomplete = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
93 debug = false;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
94 min_length = 1;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
95 preselect = 'enable';
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
96 throttle_time = 80;
349
3d01318e4743 Tweak settings for compe
Zeger Van de Vannet <zegervdv@me.com>
parents: 346
diff changeset
97 source_timeout = 2000;
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
98 incomplete_delay = 400;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
99 max_abbr_width = 100;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
100 max_kind_width = 100;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
101 max_menu_width = 100;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
102
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
103 source = {
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
104 path = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
105 buffer = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
106 calc = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
107 nvim_lsp = true;
349
3d01318e4743 Tweak settings for compe
Zeger Van de Vannet <zegervdv@me.com>
parents: 346
diff changeset
108 nvim_lua = true;
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
109 spell = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
110 ultisnips = true;
349
3d01318e4743 Tweak settings for compe
Zeger Van de Vannet <zegervdv@me.com>
parents: 346
diff changeset
111 treesitter = true;
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
112 };
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
113 }
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
114
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
115 vim.cmd [[ inoremap <silent><expr> <TAB> compe#complete() ]]
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
116 vim.cmd [[ inoremap <silent><expr> <CR> compe#confirm({ 'keys': "\<Plug>delimitMateCR", 'mode': '' }) ]]
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
117 vim.cmd [[ inoremap <silent><expr> <C-e> compe#close('<C-e>') ]]
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
118 end
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
119 }
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
120 use {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
121 'nvim-treesitter/nvim-treesitter',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
122 'nvim-treesitter/nvim-treesitter-refactor',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
123 'nvim-treesitter/nvim-treesitter-textobjects',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
124 {'nvim-treesitter/playground', opt = true}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
125 }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
126 use {'SirVer/ultisnips'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
127 use {
342
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
128 'glepnir/lspsaga.nvim',
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
129 config = function()
350
a9910306741c Disable highlighting with treesitter
Zeger Van de Vannet <zegervdv@me.com>
parents: 349
diff changeset
130 require 'lspsaga'.init_lsp_saga {}
342
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
131 end
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
132 }
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
133 use {
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
134 'nvim-telescope/telescope.nvim',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
135 requires = {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
136 'nvim-lua/popup.nvim',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
137 'nvim-lua/plenary.nvim'
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
138 }
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
139 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
140
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
141 -- File navigation
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
142 use {'justinmk/vim-dirvish'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
143
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
144 -- Colorscheme
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
145 use {'zegervdv/nvcode-color-schemes.vim'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
146
338
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
147 -- Terminal
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
148 use {'akinsho/nvim-toggleterm.lua'}
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
149
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
150 end)
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
151 end
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
152
338
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
153 require'toggleterm'.setup {
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
154 size = 20,
343
01f52891b497 Use F12 to toggle terminal
zegervdv <zegervdv@me.com>
parents: 342
diff changeset
155 open_mapping = [[<F12>]],
338
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
156 shade_filetypes = {},
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
157 shade_terminals = true,
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
158 persist_size = true,
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
159 direction = 'horizontal',
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
160 }
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
161
336
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
162 -- This came from https://github.com/tjdevries/config_manager/blob/master/xdg_config/nvim/lua/lsp_config.lua
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
163 local mapper = function(mode, key, result, noremap)
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
164 if noremap == nil then
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
165 noremap = true
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
166 end
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
167 vim.fn.nvim_buf_set_keymap(0, mode, key, result, {noremap=noremap, silent=true})
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
168 end
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
169
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
170 -- LSP and Treesitter config
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
171
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
172 local lsp = require'lspconfig'
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
173 local lsputil = require'lspconfig.util'
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
174
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
175 require "nvim-treesitter.highlight"
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
176
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
177 require'nvim-treesitter.configs'.setup {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
178 highlight = {
350
a9910306741c Disable highlighting with treesitter
Zeger Van de Vannet <zegervdv@me.com>
parents: 349
diff changeset
179 enable = false,
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
180 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
181 incremental_selection = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
182 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
183 keymaps = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
184 init_selection = "gnn",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
185 node_incremental = "grn",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
186 scope_incremental = "grc",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
187 node_decremental = "grm",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
188 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
189 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
190 refactor = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
191 highlight_definitions = { enable = true },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
192 smart_rename = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
193 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
194 keymaps = {
328
855380bb5a3b Fix overlapping mappings for treesitter rename and find references
Zeger Van de Vannet <zegervdv@me.com>
parents: 327
diff changeset
195 smart_rename = "gsr",
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
196 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
197 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
198 navigation = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
199 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
200 keymaps = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
201 goto_definition = "gnd",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
202 list_definitions = "gnD",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
203 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
204 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
205 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
206 textobjects = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
207 move = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
208 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
209 goto_next_start = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
210 ["]]"] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
211 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
212 goto_previous_start = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
213 ["[["] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
214 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
215 goto_next_end = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
216 ["]["] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
217 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
218 goto_previous_end = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
219 ["[]"] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
220 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
221 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
222 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
223 playground = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
224 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
225 disable = {},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
226 updatetime = 25,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
227 persist_queries = false
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
228 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
229 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
230
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
231 local chain_complete_list = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
232 default = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
233 default = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
234 {complete_items = {'lsp'}},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
235 {complete_items = {'lsp', 'snippet', 'ts', 'buffer'}},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
236 {complete_items = {'path'}, triggered_only = {'/'}},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
237 {complete_items = {'ts'}},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
238 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
239 string = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
240 {complete_items = {'path'}, triggered_only = {'/'}},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
241 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
242 comment = {},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
243 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
244 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
245
330
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
246 -- Copied and modified from https://github.com/chengzeyi/.vim_runtime/blob/8a47981c81d31f88d1138211908e58fd58e4decc/lua/lsp_ext.lua
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
247
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
248 function preview_location(location, context, before_context)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
249 -- location may be LocationLink or Location (more useful for the former)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
250 context = context or 15
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
251 before_context = before_context or 0
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
252 local uri = location.targetUri or location.uri
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
253 if uri == nil then
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
254 return
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
255 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
256 local bufnr = vim.uri_to_bufnr(uri)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
257 if not vim.api.nvim_buf_is_loaded(bufnr) then
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
258 vim.fn.bufload(bufnr)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
259 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
260 local range = location.targetRange or location.range
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
261 local contents =
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
262 vim.api.nvim_buf_get_lines(bufnr, range.start.line - before_context, range['end'].line + 1 + context, false)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
263 local filetype = vim.api.nvim_buf_get_option(bufnr, 'filetype')
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
264 return vim.lsp.util.open_floating_preview(contents, filetype)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
265 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
266
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
267 function preview_location_callback(_, method, result)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
268 local context = 15
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
269 if result == nil or vim.tbl_isempty(result) then
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
270 return nil
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
271 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
272 if vim.tbl_islist(result) then
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
273 preview_location(result[1], context, 5)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
274 else
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
275 preview_location(result, context, 5)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
276 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
277 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
278
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
279 function peek_declaration()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
280 local params = vim.lsp.util.make_position_params()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
281 return vim.lsp.buf_request(0, 'textDocument/declaration', params, preview_location_callback)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
282 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
283
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
284 function peek_definition()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
285 local params = vim.lsp.util.make_position_params()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
286 return vim.lsp.buf_request(0, 'textDocument/definition', params, preview_location_callback)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
287 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
288
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
289 function peek_type_definition()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
290 local params = vim.lsp.util.make_position_params()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
291 return vim.lsp.buf_request(0, 'textDocument/typeDefinition', params, preview_location_callback)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
292 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
293
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
294 function peek_implementation()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
295 local params = vim.lsp.util.make_position_params()
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
296 return vim.lsp.buf_request(0, 'textDocument/implementation', params, preview_location_callback)
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
297 end
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
298
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
299 local on_attach = function(client)
328
855380bb5a3b Fix overlapping mappings for treesitter rename and find references
Zeger Van de Vannet <zegervdv@me.com>
parents: 327
diff changeset
300 mapper('n', '<CR>', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({show_header=false})<CR>')
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
301 mapper('n', 'gd', '<cmd>lua vim.lsp.buf.declaration()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
302 mapper('n', '<c-]>', '<cmd>lua vim.lsp.buf.definition()<CR>')
345
9360c61c5732 Update lspsaga config and mapping for hover
zegervdv <zegervdv@me.com>
parents: 343
diff changeset
303 mapper('n', 'K', '<cmd>lua require"lspsaga.hover".render_hover_doc()<CR>')
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
304 mapper('n', 'gD', '<cmd>lua vim.lsp.buf.implementation()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
305 mapper('n', '1gD', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
335
cd9a31235699 Add mapping to show references in quickfix list
zegervdv <zegervdv@me.com>
parents: 333
diff changeset
306 mapper('n', 'gr', "<cmd>lua vim.lsp.buf.references()<CR>")
cd9a31235699 Add mapping to show references in quickfix list
zegervdv <zegervdv@me.com>
parents: 333
diff changeset
307 mapper('n', 'tgr', "<cmd>lua require'telescope.builtin'.lsp_references()<CR>")
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
308 mapper('n', 'g0', '<cmd>lua vim.lsp.buf.document_symbol()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
309 mapper('i', '<c-l>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
310 mapper('n', '<leader>f', '<cmd>lua vim.lsp.buf.code_action()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
311 mapper('n', '<c-p>', '<cmd>lua vim.lsp.buf.formatting()<CR>')
330
471701051c92 Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents: 329
diff changeset
312 mapper("n", "gp", "<cmd>lua peek_definition()<CR>")
345
9360c61c5732 Update lspsaga config and mapping for hover
zegervdv <zegervdv@me.com>
parents: 343
diff changeset
313 -- mapper("n", "gp", "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>")
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
314 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
315
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
316
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
317 vim.lsp.handlers["textDocument/formatting"] = function(err, _, result, _, bufnr)
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
318 if err ~= nil or result == nil then
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
319 return
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
320 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
321 if not vim.api.nvim_buf_get_option(bufnr, "modified") then
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
322 local view = vim.fn.winsaveview()
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
323 vim.lsp.util.apply_text_edits(result, bufnr)
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
324 -- Fix to reload Treesitter
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
325 -- vim.api.nvim_command("edit")
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
326 vim.fn.winrestview(view)
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
327 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
328 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
329
333
a3a0de56b0eb Switch to pyright LSP for python
zegervdv <zegervdv@me.com>
parents: 332
diff changeset
330 lsp.pyright.setup{
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
331 on_attach = on_attach;
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
332 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
333
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
334 if (vim.fn.executable('efm-langserver') == 1) then
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
335 require 'efm/python'
322
deb606f02fc4 Test if flake8, black are available before adding
zegervdv <zegervdv@me.com>
parents: 321
diff changeset
336
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
337 -- May not be installed, use pcall to handle errors
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
338 pcall(require, 'efm/systemverilog')
327
3b191bcd4e0d Add efm config
zegervdv <zegervdv@me.com>
parents: 326
diff changeset
339 pcall(require, 'efm/flp')
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
340
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
341 local language_cfg = require'efm/languages'
322
deb606f02fc4 Test if flake8, black are available before adding
zegervdv <zegervdv@me.com>
parents: 321
diff changeset
342
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
343 lsp.efm.setup{
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
344 on_attach = on_attach;
321
aa0a095f8759 Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents: 319
diff changeset
345 init_options = {documentFormatting = true};
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
346 root_dir = lsputil.root_pattern('.git', '.hg');
321
aa0a095f8759 Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents: 319
diff changeset
347 settings = {
aa0a095f8759 Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents: 319
diff changeset
348 rootMarkers = {".git/", ".hg/"},
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
349 languages = language_cfg
321
aa0a095f8759 Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents: 319
diff changeset
350 };
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
351 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
352 end
332
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
353
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
354 -- Try importing local config
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
355 local ok, localconfig = pcall(require, 'localconfig')
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
356 if ok then
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
357 localconfig.setup {on_attach=on_attach}
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
358 end