From 00cbed4cdcd17d0e1f6587aed92144cc6634349c Mon Sep 17 00:00:00 2001 From: jdhao Date: Thu, 24 Sep 2020 23:01:10 +0800 Subject: [PATCH] fix style issues as per vint --- after/ftplugin/markdown.vim | 2 +- after/ftplugin/vim.vim | 8 ++++---- autoload/utils.vim | 4 ++-- ftdetect/pdc.vim | 5 ++++- options.vim | 2 +- plugins.vim | 5 +++-- ui.vim | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim index da142f7..f640660 100644 --- a/after/ftplugin/markdown.vim +++ b/after/ftplugin/markdown.vim @@ -1,7 +1,7 @@ set concealcursor=c set synmaxcol=3000 " For long Chinese paragraphs -if exists(":FootnoteNumber") +if exists(':FootnoteNumber') nnoremap AddVimFootnote :call markdownfootnotes#VimFootnotes('i') inoremap AddVimFootnote :call markdownfootnotes#VimFootnotes('i') endif diff --git a/after/ftplugin/vim.vim b/after/ftplugin/vim.vim index cac808f..efea738 100644 --- a/after/ftplugin/vim.vim +++ b/after/ftplugin/vim.vim @@ -9,7 +9,7 @@ set formatoptions-=r " focus is lost (see " https://github.com/tmux-plugins/vim-tmux-focus-events/issues/14) set foldmethod=expr foldlevel=0 foldlevelstart=-1 - \ foldexpr=utils#VimFolds(v:lnum) foldtext=utils#MyFoldText() + \ foldexpr=utils#VimFolds(v:lnum) foldtext=utils#MyFoldText() " Use :help command for keyword when pressing `K` in vim file, " see `:h K` and https://stackoverflow.com/q/15867323/6064933 @@ -17,8 +17,8 @@ set keywordprg=:help " Only define following variable if Auto-pairs plugin is used if &runtimepath =~? 'auto-pairs' - let b:AutoPairs = AutoPairsDefine({'<' : '>'}) + let b:AutoPairs = AutoPairsDefine({'<' : '>'}) - " Do not use `"` for vim script since `"` is also used for comment - let b:AutoPairs = {'(':')', '[':']', '{':'}', "'":"'", "`":"`", '<':'>'} + " Do not use `"` for vim script since `"` is also used for comment + let b:AutoPairs = {'(':')', '[':']', '{':'}', "'":"'", '`':'`', '<':'>'} endif diff --git a/autoload/utils.vim b/autoload/utils.vim index ad6078a..21f7535 100644 --- a/autoload/utils.vim +++ b/autoload/utils.vim @@ -79,9 +79,9 @@ endfunction function! utils#ToggleCursorCol() abort if &cursorcolumn set nocursorcolumn - echo "cursorcolumn: OFF" + echo 'cursorcolumn: OFF' else set cursorcolumn - echo "cursorcolumn: ON" + echo 'cursorcolumn: ON' endif endfunction diff --git a/ftdetect/pdc.vim b/ftdetect/pdc.vim index 0c728b3..5a8ea6a 100644 --- a/ftdetect/pdc.vim +++ b/ftdetect/pdc.vim @@ -1 +1,4 @@ -autocmd BufRead,BufNewFile *.pdc set filetype=markdown +augroup det_md + autocmd! + autocmd BufRead,BufNewFile *.pdc set filetype=markdown +augroup END diff --git a/options.vim b/options.vim index f1ff3a3..77d9975 100644 --- a/options.vim +++ b/options.vim @@ -28,7 +28,7 @@ set noswapfile " Set up backup directory let g:backupdir=expand(stdpath('data') . '/backup') if !isdirectory(g:backupdir) - call mkdir(g:backupdir, "p") + call mkdir(g:backupdir, 'p') endif let &backupdir=g:backupdir diff --git a/plugins.vim b/plugins.vim index 93f135b..cadcdf0 100644 --- a/plugins.vim +++ b/plugins.vim @@ -1,3 +1,4 @@ +scriptencoding utf-8 "{ Plugin installation "{{ Vim-plug Install and related settings @@ -536,9 +537,9 @@ nnoremap t :TagbarToggle " Add support for markdown files in tagbar. if g:is_win - let g:md_ctags_bin=fnamemodify(g:nvim_config_root."\\tools\\markdown2ctags.exe", ":p") + let g:md_ctags_bin=fnamemodify(g:nvim_config_root."\\tools\\markdown2ctags.exe", ':p') else - let g:md_ctags_bin=fnamemodify(g:nvim_config_root."/tools/markdown2ctags.py", ":p") + let g:md_ctags_bin=fnamemodify(g:nvim_config_root.'/tools/markdown2ctags.py', ':p') endif let g:tagbar_type_markdown = { diff --git a/ui.vim b/ui.vim index 8d046cd..c6c0552 100644 --- a/ui.vim +++ b/ui.vim @@ -4,7 +4,7 @@ " support true colors! For a comprehensive list of terminals supporting true " colors, see https://github.com/termstandard/colors and " https://gist.github.com/XVilka/8346728. -if $TERM == "xterm-256color" || exists('g:started_by_firenvim') +if $TERM ==# 'xterm-256color' || exists('g:started_by_firenvim') set termguicolors endif " Use dark background