diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2020-07-26 10:20:08 +0200 | 
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2020-07-26 10:20:08 +0200 | 
| commit | 56121b4e27cb48efb17be55a969b2f0d725266f8 (patch) | |
| tree | 30df0f431705cdb72b2014177ce3f0655287a81c /ftplugin | |
| parent | 9c3c0bc082e0d58d15dc6f24d8a335931417e2f0 (diff) | |
| download | vim-polyglot-56121b4e27cb48efb17be55a969b2f0d725266f8.tar.gz vim-polyglot-56121b4e27cb48efb17be55a969b2f0d725266f8.zip | |
Update
Diffstat (limited to '')
| -rw-r--r-- | ftplugin/dhall.vim | 2 | ||||
| -rw-r--r-- | ftplugin/git.vim | 2 | ||||
| -rw-r--r-- | ftplugin/gitcommit.vim | 2 | ||||
| -rw-r--r-- | ftplugin/gitrebase.vim | 2 | ||||
| -rw-r--r-- | ftplugin/markdown.vim | 4 | ||||
| -rw-r--r-- | ftplugin/svelte.vim | 47 | 
6 files changed, 7 insertions, 52 deletions
| diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim index c5553f49..34974cd5 100644 --- a/ftplugin/dhall.vim +++ b/ftplugin/dhall.vim @@ -9,6 +9,8 @@ setlocal commentstring=--\ %s  set smarttab +autocmd! dhall +  if exists('g:dhall_use_ctags')      if g:dhall_use_ctags == 1          augroup dhall diff --git a/ftplugin/git.vim b/ftplugin/git.vim index 4e17198b..0137f594 100644 --- a/ftplugin/git.vim +++ b/ftplugin/git.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1  " Vim filetype plugin  " Language:	generic git output  " Maintainer:	Tim Pope <vimNOSPAM@tpope.org> -" Last Change:	2016 Aug 29 +" Last Change:	2019 Dec 05  " Only do this when not done yet for this buffer  if (exists("b:did_ftplugin")) diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim index c56eacdf..e8810c4f 100644 --- a/ftplugin/gitcommit.vim +++ b/ftplugin/gitcommit.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1  " Vim filetype plugin  " Language:	git commit file  " Maintainer:	Tim Pope <vimNOSPAM@tpope.org> -" Last Change:	2016 Aug 29 +" Last Change:	2019 Dec 05  " Only do this when not done yet for this buffer  if (exists("b:did_ftplugin")) diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim index 70fed8f4..27213988 100644 --- a/ftplugin/gitrebase.vim +++ b/ftplugin/gitrebase.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1  " Vim filetype plugin  " Language:	git rebase --interactive  " Maintainer:	Tim Pope <vimNOSPAM@tpope.org> -" Last Change:	2016 Aug 29 +" Last Change:	2019 Dec 05  " Only do this when not done yet for this buffer  if (exists("b:did_ftplugin")) diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim index 1c4268be..53e94872 100644 --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@ -790,7 +790,7 @@ function! s:MarkdownHighlightSources(force)      " Look for code blocks in the current file      let filetypes = {}      for line in getline(1, '$') -        let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*') +        let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*\ze.*')          if !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif      endfor      if !exists('b:mkd_known_filetypes') @@ -821,7 +821,7 @@ function! s:MarkdownHighlightSources(force)              else                  let include = '@' . toupper(filetype)              endif -            let command = 'syntax region %s matchgroup=%s start="^\s*```\s*%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s' +            let command = 'syntax region %s matchgroup=%s start="^\s*```\s*%s.*$" matchgroup=%s end="\s*```$" keepend contains=%s%s'              execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '')              execute printf('syntax cluster mkdNonListItem add=%s', group) diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim deleted file mode 100644 index 3c3df23a..00000000 --- a/ftplugin/svelte.vim +++ /dev/null @@ -1,47 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1 - -" Vim filetype plugin -" Language:   Svelte 3 (HTML/JavaScript) -" Author:     Evan Lecklider <evan@lecklider.com> -" Maintainer: Evan Lecklide <evan@lecklider.com> -" URL:        https://github.com/evanleck/vim-svelte -if (exists('b:did_ftplugin')) -  finish -endif -let b:did_ftplugin = 1 - -" Matchit support -if exists('loaded_matchit') && !exists('b:match_words') -  let b:match_ignorecase = 0 - -  " In order: -  " -  " 1. Svelte control flow keywords. -  " 2. Parens. -  " 3-5. HTML tags pulled from Vim itself. -  " -  " https://github.com/vim/vim/blob/5259275347667a90fb88d8ea74331f88ad68edfc/runtime/ftplugin/html.vim#L29-L35 -  let b:match_words = -        \ '#\%(if\|await\|each\)\>:\:\%(else\|catch\|then\)\>:\/\%(if\|await\|each\)\>,' . -        \ '{:},' . -        \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' . -        \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' . -        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>' -endif - -" ALE fixing and linting. -if exists('g:loaded_ale') -  if !exists('b:ale_fixers') -    let b:ale_fixers = ['eslint', 'prettier', 'prettier_standard'] -  endif - -  if !exists('b:ale_linter_aliases') -    let b:ale_linter_aliases = ['css', 'javascript'] -  endif - -  if !exists('b:ale_linters') -    let b:ale_linters = ['stylelint', 'eslint'] -  endif -endif - -endif | 
