From 8fb18c430b58696d0bdc900783c854f32cc6b4e8 Mon Sep 17 00:00:00 2001 From: hellerve Date: Mon, 8 Jun 2015 14:14:07 +0200 Subject: [PATCH] Added vim jade plugin --- .vim/bundle/vim-jade | 1 + .vim/syntax/zepto.vim | 19 +++++++++---------- vimrc | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) create mode 160000 .vim/bundle/vim-jade diff --git a/.vim/bundle/vim-jade b/.vim/bundle/vim-jade new file mode 160000 index 0000000..0aa231c --- /dev/null +++ b/.vim/bundle/vim-jade @@ -0,0 +1 @@ +Subproject commit 0aa231c9a5eef0a0943a1b4d16fd1e881f54f08f diff --git a/.vim/syntax/zepto.vim b/.vim/syntax/zepto.vim index ea5b253..62caf18 100644 --- a/.vim/syntax/zepto.vim +++ b/.vim/syntax/zepto.vim @@ -19,9 +19,9 @@ else endif -syn keyword zeptoSyntax quote \| <- , typeof +syn keyword zeptoSyntax quote \| <- , typeof \|\| && syn keyword zeptoSyntax lambda let let* letrec -syn keyword zeptoSyntax if cond and or case define else +syn keyword zeptoSyntax if cond and or nor case define else syn keyword zeptoSyntax define-syntax syntax-rules syn keyword zeptoSyntax when unless syn keyword zeptoSyntax set! set-car! set-cdr! @@ -43,7 +43,7 @@ syn keyword zeptoFunc zero? positive? negative? float? syn keyword zeptoFunc even? odd? exact? inexact? syn keyword zeptoFunc exact->inexact -syn keyword zeptoFunc + - * / quotient remainder modulo mod +syn keyword zeptoFunc + - * / /. quotient remainder modulo mod syn keyword zeptoFunc abs max min gcd lcm round floor ceiling ceil real imaginary syn keyword zeptoFunc truncate numerator denominator generate sum product @@ -82,8 +82,8 @@ syn keyword zeptoFunc symbol? syn keyword zeptoFunc symbol->string string->symbol syn keyword zeptoFunc pair? null? cons car cdr null -syn keyword zeptoFunc list? list length -syn keyword zeptoFunc list-ref list-tail append reverse map +syn keyword zeptoFunc list? list length list-append list-extend +syn keyword zeptoFunc list-ref list-tail append reverse map reduce syn keyword zeptoFunc for-each foldl foldr fold filter remove syn keyword zeptoFunc sort member memv memq syn keyword zeptoFunc assq assv assoc @@ -95,16 +95,17 @@ syn keyword zeptoFunc head tail indexed-tail syn keyword zeptoFunc vector? make-vector vector vector-length syn keyword zeptoFunc vector-ref vector-set! vector->list list->vector -syn keyword zeptoFunc vector-fill! +syn keyword zeptoFunc vector-fill! vector-append vector-extend syn keyword zeptoFunc procedure? apply compose syn keyword zeptoFunc primitive? syn keyword zeptoFunc negate curry uncurry +syn match zeptoAtom ,:\k+, contained syn match zeptoSymbol ,\k+, contained syn cluster zeptoNormal contains=zeptoSyntax,zeptoFunc,zeptoDelimiter -syn cluster zeptoQuotedStuff contains=zeptoSymbol +syn cluster zeptoQuotedStuff contains=zeptoSymbol,zeptoAtom syn cluster zeptoQuotedOrNormal contains=zeptoDelimiter syn region zeptoQuotedStruc start="("rs=s+1 end=")"re=e-1 contains=@zeptoQuotedStuff,@zeptoQuotedOrNormal contained @@ -211,8 +212,6 @@ syn region zeptoMultilineComment start=/#|/ end=/|#/ contains=zeptoMultilineComm syn cluster zeptoNormal add=zeptoQuoted,zeptoComment,zeptoMultilineComment syn cluster zeptoQuotedOrNormal add=zeptoComment,zeptoMultilineComment -" syn match zeptoListComp "\[.+ \| \w+ <- .+]" - syn sync match matchPlace grouphere NONE "^[^ \t]" if version >= 508 || !exists("zepto_syntax_init") @@ -237,7 +236,7 @@ if version >= 508 || !exists("zepto_syntax_init") HiLink zeptoQuoted Structure HiLink zeptoQuotedStruc Structure HiLink zeptoSymbol Structure - HiLink zeptoListComp Structure + HiLink zeptoAtom Structure HiLink zeptoDelimiter Delimiter HiLink zeptoConstant Constant diff --git a/vimrc b/vimrc index 05ca979..b3ba346 100644 --- a/vimrc +++ b/vimrc @@ -80,6 +80,7 @@ Bundle 'christoomey/vim-tmux-navigator' " Haskell Bundle 'raichoo/haskell-vim' +Bundle 'digitaltoad/vim-jade' Bundle 'enomsg/vim-haskellConcealPlus' Bundle 'eagletmt/ghcmod-vim' Bundle 'eagletmt/neco-ghc'