Compare commits

..

No commits in common. "913e4e88d4eb2117ebb28e1730fb2579fc20355a" and "b220a50fb7e2330ce328f7243806e86eb5967bf2" have entirely different histories.

7 changed files with 10 additions and 39 deletions

View File

@ -9,13 +9,13 @@ let g:ale_sign_warning = '~>'
let g:ale_elixir_elixir_ls_release = '/usr/lib/elixir-ls/'
let g:ale_java_javalsp_executable = '/usr/bin/java-language-server'
"\ 'rust': ['rust-analyzer'],
let g:ale_linters = {
\ 'javascript': ['eslint'],
\ 'javascriptreact': ['eslint'],
\ 'typescript': ['tsserver', 'tslint'],
\ 'typescriptreact': ['tsserver', 'tslint'],
\ 'python': ['pyright'],
\ 'rust': ['rust-analyzer'],
\ 'elixir': ['elixir-ls'],
\ 'go': ['gopls'],
\ 'json': ['jsonlint'],
@ -27,7 +27,6 @@ let g:ale_linters = {
\ 'promql': ['promql-langserver'],
\ 'java': ['javalsp'],
\ 'ps1': ['powershell'],
\ 'markdown': ['vale'],
\}
let g:ale_fixers = {
@ -36,22 +35,20 @@ let g:ale_fixers = {
\ 'javascriptreact': ['prettier'],
\ 'typescriptreact': ['prettier'],
\ 'python': ['black'],
\ 'rust': ['rustfmt'],
\ 'elixir': ['mix_format'],
\ 'graphql': ['prettier'],
\ 'perl': ['perltidy'],
\ 'go': ['gofmt'],
\ 'rust': ['rustfmt'],
\ 'json': ['prettier'],
\ 'vala': ['uncrustify'],
\ 'dart': ['dartfmt'],
\ 'scss': ['prettier'],
\ 'jsonnet': ['jsonnetfmt'],
\}
let g:ale_rust_rls_config = {
\ 'rust': {
\ 'clippy_preference': 'on',
\ 'ale_rust_cargo_default_feature_behavior': 'all'
\ 'clippy_preference': 'on'
\ }
\ }

View File

@ -9,46 +9,26 @@ set hidden
" \ 'ruby': ['~/.rbenv/shims/solargraph', 'stdio'],
" \ }
if !empty($RUST_VERSION)
let g:LanguageClient_rustVersion = $RUST_VERSION
else
let g:LanguageClient_rustVersion = 'stable'
endif
let g:LanguageClient_serverCommands = {
"\ 'rust': ['/usr/bin/rustup', 'run', g:LanguageClient_rustVersion, 'rust-analyzer'],
\ 'rust': {
\ 'name': 'rust-analyzer',
\ 'command': ['/usr/bin/rustup', 'run', g:LanguageClient_rustVersion, 'rust-analyzer'],
\ 'initializationOptions': {
\ 'cargo': {
\ 'features': 'true',
\ }
\ },
\ },
\ 'rust': ['/usr/bin/rustup', 'run', 'stable', 'rls'],
\ 'elixir': ['/usr/lib/elixir-ls/language_server.sh'],
\ 'elm': ['/usr/bin/elm-language-server'],
\ 'python': ['/usr/bin/pylsp'],
\ 'python': ['/usr/bin/pyls'],
\ 'go': ['/usr/bin/gopls'],
\ 'promql': ['/usr/local/bin/promql-langserver'],
\ 'java': ['/usr/bin/java-language-server'],
\ 'typescript': ['/usr/bin/typescript-language-server', '--stdio'],
\ 'typescriptreact': ['/usr/bin/typescript-language-server', '--stdio'],
"\ 'Dockerfile': ['/usr/bin/docker-langserver', '--stdio'],
\ 'hcl': ['/usr/bin/terraform-ls'],
\ 'jsonnet': ['/usr/bin/jsonnet-language-server'],
\ }
let g:LanguageClient_rootMarkers = {
\ 'elm': ['elm.json'],
\ 'typescript': ['package.json'],
\ 'typescriptreact': ['package.json'],
\ 'rust': ['Cargo.toml'],
\ 'python': ['pyproject.toml', 'setup.cfg'],
\ 'jsonnet': ['jsonnetfile.json', 'jsonnetfile.lock.json'],
\ }
let g:LanguageClient_hoverPreview = 'always'
let g:LanguageClient_loggingFile = expand('~/.vim/LanguageClient.log')
function LC_maps()
if has_key(g:LanguageClient_serverCommands, &filetype)
@ -66,11 +46,11 @@ function LC_maps()
" noremap <buffer> <silent> gd <Plug>(lcn-definition)
" noremap <buffer> <silent> <F2> <Plug>(lcn-rename)
let g:LanguageClient_loggingLevel = 'DEBUG'
let g:LanguageClient_loggingFile = expand('~/.vim/LanguageClient.log')
set formatexpr=LanguageClient#textDocument_rangeFormatting_sync()
endif
endfunction
autocmd FileType * call LC_maps()
let g:LanguageClient_loggingLevel = 'DEBUG'
let g:LanguageClient_loggingFile = expand('~/.vim/LanguageClient.log')

@ -1 +0,0 @@
Subproject commit 2a31e6bcea5977209c05c728c4253d82fd873c82

@ -1 +1 @@
Subproject commit 0668308e68b0ac28b332b204b469fbe04601536a
Subproject commit 1358e8e45ecedc53daf971924a0541ddf6224faf

@ -1 +0,0 @@
Subproject commit 4f48ae3a8bb820c174ef73293942a6b109f446ce

@ -1 +0,0 @@
Subproject commit 889b9a7515db477f4cb6808bef1769e53493c578

3
vimrc
View File

@ -142,9 +142,6 @@ endif
""" Set dockerfile syntax
autocmd BufNewFile,BufRead Dockerfile* set ft=Dockerfile
""" Disable SQLAutocomplete
let g:loaded_sql_completion = 0
""" keybindings