diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-23 18:44:14 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-23 18:44:54 +0200 |
| commit | 7536f303a4826647868a57542d67d625db7b9c1d (patch) | |
| tree | 2a04398149dbf3f4e69be6ced8015df25b2ba4fd | |
| parent | 3f325091dd8ca8d2f89368ed44bd9cbebf25721e (diff) | |
| download | aports-7536f303a4826647868a57542d67d625db7b9c1d.tar.bz2 aports-7536f303a4826647868a57542d67d625db7b9c1d.tar.xz | |
testing/vim-editorconfig: new aport
| -rw-r--r-- | testing/vim-editorconfig/APKBUILD | 25 | ||||
| -rw-r--r-- | testing/vim-editorconfig/fix-config-parsing.patch | 46 |
2 files changed, 71 insertions, 0 deletions
diff --git a/testing/vim-editorconfig/APKBUILD b/testing/vim-editorconfig/APKBUILD new file mode 100644 index 0000000000..937d779373 --- /dev/null +++ b/testing/vim-editorconfig/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +pkgname=vim-editorconfig +pkgver=0_git20170721 +_gitrev=14ad5ced8b9daad219f1e48b121dbbd66c20d3a6 +pkgrel=0 +pkgdesc="EditorConfig plugin for vim written in vimscript only" +url="https://github.com/sgur/vim-editorconfig" +arch="noarch" +license="MIT" +source="$pkgname-$pkgver.tar.gz::https://github.com/sgur/$pkgname/archive/$_gitrev.tar.gz + fix-config-parsing.patch" +builddir="$srcdir/$pkgname-$_gitrev" +options="!check" # there are no tests + +package() { + local destdir="$pkgdir/usr/share/vim/vimfiles" + cd "$builddir" + + mkdir -p "$destdir" + cp -r autoload doc ftdetect ftplugin plugin "$destdir"/ +} + +sha512sums="61deaedcb6034f6de2cb8bb28e23a1aba2ca74fdf482421078f50c832d2128663bb89279534e7b2e37a00ba7b2cd5dd1d080c452975761fcac7a29a07ce69576 vim-editorconfig-0_git20170721.tar.gz +d2b17733aa77d50326807d033cacffb74eb4fdf91721255ff58c1821e3488cb46f0014f73afc5630dc75c2a6ea3ee91c37699433326bf4ee9eed80a2ed709620 fix-config-parsing.patch" diff --git a/testing/vim-editorconfig/fix-config-parsing.patch b/testing/vim-editorconfig/fix-config-parsing.patch new file mode 100644 index 0000000000..806407d405 --- /dev/null +++ b/testing/vim-editorconfig/fix-config-parsing.patch @@ -0,0 +1,46 @@ +From 69f86d1077b226a7535b1dec06d5bbf0fb2a89cd Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Mon, 23 Oct 2017 18:23:33 +0200 +Subject: [PATCH] Fix trimming of empty comments + +For example this .editorconfig: + +``` +; Lorem ipsum +; +; dolor sit amet + +root = true +``` + +is parsed incorrectly: + +s:parse_properties(...) -> [], {} + s:trim(...) -> [';', 'root = true'] + s:remove_comment(';') -> ';' + +This commit fixes this issue. + +Patch-Source: https://github.com/sgur/vim-editorconfig/pull/15 +--- + autoload/editorconfig.vim | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/autoload/editorconfig.vim b/autoload/editorconfig.vim +index b0e4240..469172d 100644 +--- a/autoload/editorconfig.vim ++++ b/autoload/editorconfig.vim +@@ -203,9 +203,11 @@ endfunction "}}} + " + " >>> echo s:remove_comment('bar') + " bar ++" >>> echo s:remove_comment('#') ++" + + function! s:remove_comment(line) abort "{{{ +- let pos = match(a:line, '\s*[;#].\+') ++ let pos = match(a:line, '\s*[;#].*') + return pos == -1 ? a:line : pos == 0 ? '' : a:line[: pos-1] + endfunction "}}} + +-- |