diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2019-09-04 15:44:43 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2019-09-04 15:44:43 +0200 |
| commit | 664aa988f6d9cdb7b75218666fbe348c85ef8b29 (patch) | |
| tree | 306173199576430e6133a1ed137bd80bbc2fb01b /ftplugin/rust | |
| parent | 3ddca5da461ebfaa82104f82e3cbf19d1c326ade (diff) | |
| download | vim-polyglot-664aa988f6d9cdb7b75218666fbe348c85ef8b29.tar.gz vim-polyglot-664aa988f6d9cdb7b75218666fbe348c85ef8b29.zip | |
Update
Diffstat (limited to '')
| -rw-r--r-- | ftplugin/rust.vim | 4 | ||||
| -rw-r--r-- | ftplugin/rust/tagbar.vim | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim index ad325e67..7f29cf38 100644 --- a/ftplugin/rust.vim +++ b/ftplugin/rust.vim @@ -39,7 +39,7 @@ if get(g:, 'rust_bang_comment_leader', 0) " leaders. I'm fairly sure that's a Vim bug. setlocal comments=s1:/*,mb:*,ex:*/,s0:/*,mb:\ ,ex:*/,:///,://!,:// else - setlocal comments=s0:/*!,m:\ ,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,:// + setlocal comments=s0:/*!,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,:// endif setlocal commentstring=//%s setlocal formatoptions-=t formatoptions+=croqnl @@ -195,7 +195,7 @@ augroup END setlocal matchpairs+=<:> " For matchit.vim (rustArrow stops `Fn() -> X` messing things up) -let b:match_skip = 's:comment\|string\|rustArrow' +let b:match_skip = 's:comment\|string\|rustCharacter\|rustArrow' " vint: -ProhibitAbbreviationOption let &cpo = s:save_cpo diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim index 91bd3c31..3de5d8a9 100644 --- a/ftplugin/rust/tagbar.vim +++ b/ftplugin/rust/tagbar.vim @@ -5,7 +5,7 @@ endif " " Support for Tagbar -- https://github.com/majutsushi/tagbar " -if !exists(':Tagbar') +if !exists(':Tagbar') || rust#tags#IsUCtags() finish endif |