@@ -89,8 +89,10 @@ Plug 'janko/vim-test'
89
89
90
90
" language server
91
91
if has (' nvim' )
92
+ " Order matters: https://github.com/williamboman/mason-lspconfig.nvim
93
+ Plug ' williamboman/mason.nvim'
94
+ Plug ' williamboman/mason-lspconfig.nvim'
92
95
Plug ' neovim/nvim-lspconfig'
93
- Plug ' williamboman/nvim-lsp-installer'
94
96
else
95
97
Plug ' prabirshrestha/vim-lsp'
96
98
Plug ' mattn/vim-lsp-settings'
@@ -136,27 +138,31 @@ Plug 'petobens/poet-v', {'for': 'python'}
136
138
" Solidity
137
139
Plug ' tomlion/vim-solidity'
138
140
141
+ " Terraform
142
+ Plug ' hashivim/vim-terraform'
143
+
139
144
" Go (order matters?)
140
- let has_go = system (" which go" )
141
- if ! v: shell_error && ! (has (' win32' ) || has (' win64' ))
142
- Plug ' fatih/vim-go' , { ' for' : ' go' , ' do' : ' :GoUpdateBinaries' }
143
- Plug ' buoto/gotests-vim' , { ' for' : ' go' }
144
- if has (' nvim' )
145
- Plug ' mdempsky/gocode' , {
146
- \ ' for' : ' go' ,
147
- \ ' rtp' : ' nvim' ,
148
- \ ' do' : ' ~/.vim/plugged/gocode/nvim/symlink.sh'
149
- \ }
150
- Plug ' zchee/deoplete-go' , { ' for' : ' go' , ' do' : ' make' }
151
- Plug ' sebdah/vim-delve' , { ' for' : ' go' }
152
- else
153
- Plug ' mdempsky/gocode' , {
154
- \ ' for' : ' go' ,
155
- \ ' rtp' : ' vim' ,
156
- \ ' do' : ' ~/.vim/plugged/gocode/vim/symlink.sh'
157
- \ }
158
- endif
159
- endif
145
+ " let has_go = system("which go")
146
+ " if !v:shell_error && !(has('win32') || has ('win64'))
147
+ " " Fixme remove the update binaries step
148
+ " Plug 'fatih/vim-go', { 'for': 'go', 'do': ':GoUpdateBinaries' }
149
+ " Plug 'buoto/gotests-vim', { 'for': 'go' }
150
+ " if has('nvim')
151
+ " Plug 'mdempsky/gocode', {
152
+ " \ 'for': 'go',
153
+ " \ 'rtp': 'nvim',
154
+ " \ 'do': '~/.vim/plugged/gocode/nvim/symlink.sh'
155
+ " \ }
156
+ " Plug 'zchee/deoplete-go', { 'for': 'go', 'do': 'make' }
157
+ " Plug 'sebdah/vim-delve', { 'for': 'go' }
158
+ " else
159
+ " Plug 'mdempsky/gocode', {
160
+ " \ 'for': 'go',
161
+ " \ 'rtp': 'vim',
162
+ " \ 'do': '~/.vim/plugged/gocode/vim/symlink.sh'
163
+ " \ }
164
+ " endif
165
+ " endif
160
166
161
167
" PHP
162
168
if ! (has (' win32' ) || has (' win64' ))
0 commit comments