Compare commits

..

No commits in common. "a63673b78315f6fb4b8ed5ef0b0e562c92dcc509" and "239646b2ae84de4d1899b0c731dd94c5b4f3a689" have entirely different histories.

2 changed files with 4 additions and 10 deletions

View File

@ -33,7 +33,7 @@ function! HaskellDocCurrentWord()
endfunction
" done by LSP now
nmap <F7> :call HaskellDocCurrentWord()<CR><CR>
" nmap <F7> :call HaskellDocCurrentWord()<CR><CR>
nmap <silent> <F3> :silent update <bar> HsimportModule<CR>
nmap <silent> <F4> :silent update <bar> HsimportSymbol<CR>
@ -62,12 +62,9 @@ let g:LanguageClient_autoStart = 1
let g:LanguageClient_serverCommands = {
\ 'haskell': ['hie', '--lsp', '-d', '-l', $HOME.'/lang-server.log'],
\ }
" we use ALE instead
let g:LanguageClient_diagnosticsEnable = 0
nnoremap <leader>lc :call LanguageClient_contextMenu()<CR>
nnoremap <silent> <F7> :call LanguageClient#textDocument_hover()<CR>
nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
nnoremap <silent> <C-F6> :call LanguageClient#textDocument_hover()<CR>
nnoremap <silent> <F8> :call LanguageClient#textDocument_rename()<CR>
" deoplete
@ -80,7 +77,7 @@ call deoplete#enable()
let g:ghcmod_hlint_options = ['--ignore=Eta reduce $']
" ALE
let g:ale_enabled = 1
let g:ale_enabled = 0 " LSP does it
let g:ale_linters = {'haskell':['ghc-mod', 'hdevtools'], 'c':['clang']}
" let g:ale_fixers = {
" \ 'go': ['gofmt', 'goimports'],

5
vimrc
View File

@ -41,11 +41,11 @@ Plug 'nathanaelkane/vim-indent-guides'
Plug 'xolox/vim-misc'
Plug 'Shougo/vimproc.vim', {'do' : 'make'}
Plug 'tpope/vim-rhubarb'
Plug 'sjbach/lusty'
if has("nvim")
Plug 'iCyMind/NeoSolarized'
Plug 'vim-airline/vim-airline'
else
Plug 'vim-scripts/LustyJuggler'
Plug 'powerline/powerline', {
\ 'branch': 'develop',
\ 'do': 'python3 setup.py install --user',
@ -166,9 +166,6 @@ if !has("nvim")
let g:LustyJugglerSuppressRubyWarning = 1
endif
" lustyexplorer
set hidden
" LSP
let g:LanguageClient_autoStart = 0