diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | after/ftplugin/yaml.vim | 11 | ||||
| -rw-r--r-- | after/syntax/yaml.vim | 65 | ||||
| -rw-r--r-- | packages.yaml | 5 |
4 files changed, 1 insertions, 83 deletions
@@ -7,7 +7,7 @@ A collection of language packs for Vim. > One to rule them all, one to find them, one to bring them all and in the darkness bind them. - It **won't affect your startup time**, as scripts are loaded only on demand\*. -- It **installs and updates 120+ times faster** than the <!--Package Count-->192<!--/Package Count--> packages it consists of. +- It **installs and updates 120+ times faster** than the <!--Package Count-->191<!--/Package Count--> packages it consists of. - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect). - Solid syntax and indentation support (other features skipped). Only the best language packs. - All unnecessary files are ignored (like enormous documentation from php support). @@ -229,7 +229,6 @@ If you need full functionality of any plugin, please use it directly with your p - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) - [xml](https://github.com/amadeus/vim-xml) - [xsl](https://github.com/vim-scripts/XSLT-syntax) -- [yaml-extras](https://github.com/stephpy/vim-yaml) - [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime) - [yard](https://github.com/sheerun/vim-yardoc) - [zephir](https://github.com/xwsoul/vim-zephir) diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim deleted file mode 100644 index 69785fc2..00000000 --- a/after/ftplugin/yaml.vim +++ /dev/null @@ -1,11 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml-extras') == -1 - -" Vim indent file -" Language: Yaml -" Author: Henrique Barcelos -" Date: 2014-10-08 -" URL: https://github.com/hjpbarcelos -setlocal autoindent sw=2 ts=2 expandtab -" vim:set sw=2: - -endif diff --git a/after/syntax/yaml.vim b/after/syntax/yaml.vim deleted file mode 100644 index 3a1e89a2..00000000 --- a/after/syntax/yaml.vim +++ /dev/null @@ -1,65 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml-extras') == -1 - -" To make this file do stuff, add something like the following (without the -" leading ") to your ~/.vimrc: -" au BufNewFile,BufRead *.yaml,*.yml so ~/src/PyYaml/YAML.vim - -" Vim syntax/macro file -" Language: YAML -" Author: Igor Vergeichik <iverg@mail.ru> -" Sponsor: Tom Sawyer <transami@transami.net> -" Stayven: Ryan King <jking@panoptic.com> -" Copyright (c) 2002 Tom Saywer - -" Add an item to a gangly list: -"map , o<bs><bs><bs><bs>-<esc>o -" Convert to Canonical form: -"map \c :%!python -c 'from yaml.redump import redump; import sys; print redump(sys.stdin.read()).rstrip()' - -if version < 600 - syntax clear -endif -syntax clear - -syn match yamlInline "[\[\]\{\}]" -syn match yamlBlock "[>|]\d\?[+-]" - -syn region yamlComment start="\#" end="$" -syn match yamlIndicator "#YAML:\S\+" - -syn region yamlString start="\(^\|\s\|\[\|\,\|\-\)\@<='" end="'" skip="\\'" -syn region yamlString start='"' end='"' skip='\\"' contains=yamlEscape -syn region yamlString matchgroup=yamlBlock start=/[>|]\s*\n\+\z(\s\+\)\S/rs=s+1 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1 -syn region yamlString matchgroup=yamlBlock start=/[>|]\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+2 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1 -syn region yamlString matchgroup=yamlBlock start=/[>|]\d\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+3 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1 -syn match yamlEscape +\\[abfnrtv'"\\]+ contained -syn match yamlEscape "\\\o\o\=\o\=" contained -syn match yamlEscape "\\x\x\+" contained - -syn match yamlType "!\S\+" - -syn keyword yamlConstant NULL Null null NONE None none NIL Nil nil -syn keyword yamlConstant TRUE True true YES Yes yes ON On on -syn keyword yamlConstant FALSE False false NO No no OFF Off off - -syn match yamlKey "^\s*\zs[^ \t\"\'#]\+\ze\s*:" - syn match yamlKey "^\s*-\s*\zs[^ \t\"\'#]\+\ze\s*:" -syn match yamlAnchor "&\S\+" -syn match yamlAlias "*\S\+" - -" Setup the highlighting links - -hi link yamlConstant Keyword -hi link yamlIndicator PreCondit -hi link yamlAnchor Function -hi link yamlAlias Function -hi link yamlKey Identifier -hi link yamlType Type - -hi link yamlComment Comment -hi link yamlInline Operator -hi link yamlBlock Operator -hi link yamlString String -hi link yamlEscape Special - -endif diff --git a/packages.yaml b/packages.yaml index 65df8369..0a8361b5 100644 --- a/packages.yaml +++ b/packages.yaml @@ -1661,11 +1661,6 @@ filetypes: - fish_read_history ignored_filenames: - '~/.config/fish/fish_{read_,}history' ---- -name: yaml-extras -remote: stephpy/vim-yaml -after: yaml -filetypes: [] # Ansible needs to be after YAML --- name: ansible |