36d19874ac8fdf2c897130414b7354131fcc39f3

Author
Pavle Portic <pavle.portic@tilda.center>
Committer
Pavle Portic <pavle.portic@tilda.center>
Date

Message

Update spacevim to use LSP for completion

Diff

 1diff --git a/dot_spacevim b/dot_spacevim
 2index 610471a22d8551a98bf27af738de718ac0e1b8b0..8aac3e6f36ea909377224329cdbfe4f1fd9190c3 100644
 3--- a/dot_spacevim
 4+++ b/dot_spacevim
 5@@ -2,43 +2,44 @@
 6 " Use exclude option if you don't want the full Layer,
 7 " e.g., Layer 'better-defaults', { 'exclude': 'itchyny/vim-cursorword' }
 8 function! Layers()
 9+	let g:spacevim_lsp_engine = 'coc'
10 
11+	Layer 'airline'
12 	Layer 'better-defaults', {'exclude': [
13 				\ 'kshenoy/vim-signature',
14 				\ 'google/vim-searchindex',
15 				\ 'mhinz/vim-startify',
16 				\ ] }
17-	Layer 'unite'
18-	Layer 'airline'
19-	Layer 'programming', {'exclude': ['luochen1990/rainbow']}
20+	" Layer 'deoplete', {'exclude': [
21+	"       \ 'eagletmt/neco-ghc',
22+	"       \ 'sebastianmarkow/deoplete-rust',
23+	"       \ 'zchee/deoplete-go',
24+	"       \ ]}
25+	Layer 'docker'
26 	Layer 'editing'
27 	Layer 'fzf'
28 	Layer 'git'
29-	Layer 'syntax-checking'
30-	Layer 'deoplete', {'exclude': [
31-				\ 'eagletmt/neco-ghc',
32-				\ 'sebastianmarkow/deoplete-rust',
33-				\ 'zchee/deoplete-go',
34-				\ ]}
35-	Layer 'c-c++'
36-	Layer 'docker'
37+	Layer 'lsp'
38 	Layer 'markdown'
39+	Layer 'programming', {'exclude': ['luochen1990/rainbow']}
40+	Layer 'unite'
41+	Layer 'syntax-checking'
42 
43 endfunction
44 
45 function! UserInit()
46 
47-	Plug 'morhetz/gruvbox'
48-	Plug 'chr4/nginx.vim'
49-	Plug 'Firef0x/PKGBUILD.vim'
50-	Plug 'aperezdc/vim-template'
51 	Plug 'andymass/vim-matchup'
52 	Plug 'tpope/vim-repeat'
53+	Plug 'pappasam/coc-jedi', { 'do': 'yarn install --frozen-lockfile && yarn build' }
54+	" Plug 'zchee/deoplete-jedi', { 'for': 'python' }
55+	" Plug 'davidhalter/jedi-vim', { 'for': 'python' }
56+	Plug 'chr4/nginx.vim'
57+	Plug 'Firef0x/PKGBUILD.vim'
58 	Plug 'elzr/vim-json', { 'for': 'json' }
59-	Plug 'zchee/deoplete-jedi', { 'for': 'python' }
60-	Plug 'davidhalter/jedi-vim', { 'for': 'python' }
61 	Plug 'TheEdgeOfRage/vim-pythonsense', { 'for': 'python' }
62 	Plug 'hashivim/vim-terraform'
63+	Plug 'morhetz/gruvbox'
64 
65 endfunction
66 
67@@ -191,6 +192,9 @@ function! UserConfig()
68 	let g:user_emmet_mode='nv'
69 	let g:user_emmet_leader_key='<Leader>e'
70 
71+	" LSP configuration
72+	let g:spacevim_lsp_engine = 'coc'
73+
74 	" Per filetype indentation settings
75 	let g:jsx_ext_required = 1
76 	augroup filetypeDefinitions
77@@ -250,7 +254,7 @@ function! UserConfig()
78 		\ 'c': ['gcc'],
79 		\ 'cpp': ['gcc'],
80 		\ 'javascript': ['eslint'],
81-		\ 'python': ['flake8', 'mypy'],
82+		\ 'python': ['pyright'],
83 		\ }
84 	let g:ale_lint_on_insert_leave = 1
85 	let g:ale_fix_on_save = 1