aboutsummaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMax Christian Pohle2020-07-08 18:00:35 +0200
committerMax Christian Pohle2020-07-08 18:00:35 +0200
commitac11adf0b76ac3a07b5c2891aad9f4da040423ad (patch)
tree1080d0d89e5bd757ff19d56f192e65e4718cf647 /plugin
parent36b4b477745e9f5275e0115f57df6a067c71b856 (diff)
parentb9591e68f0a631dd17f54291ca277aff5a8e9f3b (diff)
downloadvim-ac11adf0b76ac3a07b5c2891aad9f4da040423ad.tar.bz2
vim-ac11adf0b76ac3a07b5c2891aad9f4da040423ad.zip
Merge branch 'staging2' into staging
Diffstat (limited to 'plugin')
-rw-r--r--plugin/ale.vim2
-rw-r--r--plugin/snippets.vim15
-rw-r--r--plugin/youcompleteme.vim23
3 files changed, 27 insertions, 13 deletions
diff --git a/plugin/ale.vim b/plugin/ale.vim
index ba07343..4efc137 100644
--- a/plugin/ale.vim
+++ b/plugin/ale.vim
@@ -1,5 +1,5 @@
1let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}} 1let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}}
2let g:ale_linters = {'python': ['flake8', 'pylint'] } 2let g:ale_linters = {'python': ['pycodestyle'] }
3let g:ale_fixers = 3let g:ale_fixers =
4 \ { 4 \ {
5 \ 'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'], 5 \ 'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'],
diff --git a/plugin/snippets.vim b/plugin/snippets.vim
index dcf265b..fe5d29d 100644
--- a/plugin/snippets.vim
+++ b/plugin/snippets.vim
@@ -1,12 +1,3 @@
1 1" vv if we ever want snippets, that seems to be the best choice right now
2augroup ULTISNIPS 2" packadd neosnippet-snippets
3 if has("python") || has('python3') 3" packadd neosnippet
4 let g:UltiSnipsExpandTrigger = '<Tab>'| " expands the snippet, be careful not to use <tab> elsewhere (ycm uses it by default, but it has been deactivated by g:ycm_key_list_select_completion)
5 let g:UltiSnipsJumpForwardTrigger = '<Tab>'|
6 let g:UltiSnipsJumpBackwardTrigger = '<S-Tab>'|
7
8 packadd vim-snippets
9 packadd ultisnips
10 endif
11augroup END
12
diff --git a/plugin/youcompleteme.vim b/plugin/youcompleteme.vim
new file mode 100644
index 0000000..d2283fd
--- /dev/null
+++ b/plugin/youcompleteme.vim
@@ -0,0 +1,23 @@
1augroup YOUCOMPLETEME
2 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column
3 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
4
5 let g:ycm_autoclose_preview_window_after_insertion = 0
6 let g:ycm_auto_trigger = 1
7 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
8 let g:ycm_confirm_extra_conf = 0 " security is overrated ;)
9 let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that
10
11 let g:ycm_key_list_previous_completion = ['Up']
12 let g:ycm_key_list_select_completion = ['Down']
13
14 let g:ycm_semantic_triggers =
15 \ {
16 \ 'c': [ 're!\w{2}' ]
17 \ } " per language configurations
18
19
20 " packadd YouCompleteMe
21augroup END
22
23
..