From e5b1e29964839d29d6c6aa2bb8e8e105a2038e31 Mon Sep 17 00:00:00 2001 From: mattn Date: Wed, 13 Jun 2012 17:20:36 +0900 Subject: [PATCH] fix indent for multiplier items. --- autoload/zencoding.vim | 5 +++-- autoload/zencoding/lang/slim.vim | 8 ++++---- unittest.vim | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 4cb93e3..35d34e3 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 11-Jun-2012. +" Last Change: 13-Jun-2012. let s:save_cpo = &cpo set cpo&vim @@ -176,8 +176,9 @@ function! zencoding#toString(...) for n in current.child let inner .= zencoding#toString(n, type, inline, filters, group_itemno) endfor - let inner = substitute(inner, "\n", "\n" . indent, 'g') + "let inner = substitute(inner, "\n", "\n" . indent, 'g') endif + let inner = substitute(inner, "\n", "\n" . indent, 'g') let str = substitute(str, '\${child}', inner, '') endif let itemno = itemno + 1 diff --git a/autoload/zencoding/lang/slim.vim b/autoload/zencoding/lang/slim.vim index f3f0e7b..7bd15a2 100644 --- a/autoload/zencoding/lang/slim.vim +++ b/autoload/zencoding/lang/slim.vim @@ -40,7 +40,7 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters, let text = substitute(text, '\${nr}', "\n", 'g') let text = substitute(text, '\\\$', '$', 'g') for line in split(text, "\n") - let str .= " | " . line . "\n" + let str .= indent . "| " . line . "\n" endfor endif if len(current.child) == 1 && len(current.child[0].name) == 0 @@ -50,15 +50,15 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters, let text = substitute(text, '\${nr}', "\n", 'g') let text = substitute(text, '\\\$', '$', 'g') for line in split(text, "\n") - let str .= " | " . line . "\n" + let str .= indent . "| " . line . "\n" endfor elseif len(current.child) > 0 for child in current.child let inner .= zencoding#toString(child, type, inline, filters, itemno) endfor - let inner = substitute(inner, "\n", "\n ", 'g') + let inner = substitute(inner, "\n", "\n" . indent, 'g') let inner = substitute(inner, "\n $", "", 'g') - let str .= "\n " . inner + let str .= "\n" . indent . inner endif else let str = current.value[1:-2] diff --git a/unittest.vim b/unittest.vim index 42747c9..c9d2f22 100644 --- a/unittest.vim +++ b/unittest.vim @@ -600,11 +600,11 @@ finish 'tests': [ { 'query': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}", - 'result': "div\n p\n ul id=\"foo\"\n li foo=\"bar\" bar=\"baz\" class=\"bar1\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar2\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar3\"\n | baz\n", + 'result': "div\n p\n ul id=\"foo\"\n li foo=\"bar\" bar=\"baz\" class=\"bar1\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar2\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar3\"\n | baz\n", }, { 'query': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}|slim", - 'result': "div\n p\n ul id=\"foo\"\n li foo=\"bar\" bar=\"baz\" class=\"bar1\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar2\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar3\"\n | baz\n", + 'result': "div\n p\n ul id=\"foo\"\n li foo=\"bar\" bar=\"baz\" class=\"bar1\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar2\"\n | baz\n li foo=\"bar\" bar=\"baz\" class=\"bar3\"\n | baz\n", }, { 'query': "a*3|slim", @@ -612,7 +612,7 @@ finish }, { 'query': ".content{Hello!}|slim", - 'result': "div class=\"content\"\n | Hello!\n", + 'result': "div class=\"content\"\n | Hello!\n", }, ], },