From ca6296fb7fc1400822edf89c8b0c54be544dfa20 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 17 Jul 2014 09:23:16 +0900 Subject: [PATCH] parenthesis for haml #216 --- autoload/emmet.vim | 1 + autoload/emmet/lang/haml.vim | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 5733e45..32cdf7e 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -1671,6 +1671,7 @@ let s:emmet_settings = { \ ."\t%body\n" \ ."\t\t${child}|\n", \ }, +\ 'parenthesis': '{}', \ }, \ 'slim': { \ 'indentation': ' ', diff --git a/autoload/emmet/lang/haml.vim b/autoload/emmet/lang/haml.vim index 9e1a418..35c709e 100644 --- a/autoload/emmet/lang/haml.vim +++ b/autoload/emmet/lang/haml.vim @@ -15,6 +15,7 @@ function! emmet#lang#haml#toString(settings, current, type, inline, filters, ite let itemno = a:itemno let indent = emmet#getIndentation(type) let dollar_expr = emmet#getResource(type, 'dollar_expr', 1) + let parenthesis = emmet#getResource('haml', 'parenthesis', '()') let str = "" let comment_indent = '' @@ -33,7 +34,7 @@ function! emmet#lang#haml#toString(settings, current, type, inline, filters, ite let Val = current.attr[attr] if type(Val) == 2 && Val == function('emmet#types#true') let tmp .= ' :' . attr . ' => true' - else + else if dollar_expr while Val =~ '\$\([^#{]\|$\)' let Val = substitute(Val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g') @@ -53,7 +54,7 @@ function! emmet#lang#haml#toString(settings, current, type, inline, filters, ite endif endfor if len(tmp) - let str .= '{' . tmp . ' }' + let str .= parenthesis[0] . tmp . ' '. parenthesis[1] endif if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1 && len(current.value) == 0 let str .= "/"