escape indent character if it's like '\t' (not "\t"). however, it won't beuseful for me.

This commit is contained in:
mattn
2012-07-26 08:58:08 +09:00
parent 2393c3772a
commit 7ad7c1032e
6 changed files with 12 additions and 11 deletions

View File

@@ -1,7 +1,7 @@
"=============================================================================
" zencoding.vim
" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
" Last Change: 23-Jul-2012.
" Last Change: 24-Jul-2012.
let s:save_cpo = &cpo
set cpo&vim
@@ -322,6 +322,7 @@ function! zencoding#expandAbbr(mode, abbr) range
endif
endfor
let expand = substitute(expand, '\$line\d*\$', '', 'g')
let expand = substitute(expand, '\$column\$', '', 'g')
let content = join(getline(a:firstline, a:lastline), "\n")
if stridx(expand, '$#') < len(expand)-2
let expand = substitute(expand, '^\(.*\)\$#\s*$', '\1', '')

View File

@@ -37,7 +37,7 @@ function! zencoding#lang#css#parseIntoTree(abbr, type)
let snippet = substitute(snippet, '|', '${cursor}', 'g')
endif
let lines = split(snippet, "\n")
call map(lines, 'substitute(v:val, "\\( \\|\\t\\)", indent, "g")')
call map(lines, 'substitute(v:val, "\\( \\|\\t\\)", escape(indent, "\\\\"), "g")')
let current.snippet = join(lines, "\n")
let current.name = ''
endif

View File

@@ -88,8 +88,8 @@ function! zencoding#lang#haml#toString(settings, current, type, inline, filters,
for child in current.child
let inner .= zencoding#toString(child, type, inline, filters, itemno)
endfor
let inner = substitute(inner, "\n", "\n" . indent, 'g')
let inner = substitute(inner, "\n" . indent . "$", "", 'g')
let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
let inner = substitute(inner, "\n" . escape(indent, '\') . "$", "", 'g')
let str .= "\n" . indent . inner
endif
else

View File

@@ -113,7 +113,7 @@ function! zencoding#lang#html#parseIntoTree(abbr, type)
let snippet = substitute(snippet, '|', '${cursor}', 'g')
endif
let lines = split(snippet, "\n")
call map(lines, 'substitute(v:val, "\\( \\|\\t\\)", indent, "g")')
call map(lines, 'substitute(v:val, "\\( \\|\\t\\)", escape(indent, "\\\\"), "g")')
let current.snippet = join(lines, "\n")
let current.name = ''
endif
@@ -361,8 +361,8 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
endif
let inner = zencoding#toString(child, type, 0, filters, itemno)
let inner = substitute(inner, "^\n", "", 'g')
let inner = substitute(inner, "\n", "\n" . indent, 'g')
let inner = substitute(inner, "\n" . indent . '$', '', 'g')
let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
let inner = substitute(inner, "\n" . escape(indent, '\') . '$', '', 'g')
let str .= inner
endfor
else

View File

@@ -52,8 +52,8 @@ function! zencoding#lang#scss#toString(settings, current, type, inline, filters,
for child in current.child
let inner .= zencoding#toString(child, type, inline, filters, itemno)
endfor
let inner = substitute(inner, "\n", "\n" . indent, 'g')
let inner = substitute(inner, "\n" . indent . "$", "", 'g')
let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
let inner = substitute(inner, "\n" . escape(indent, '\') . "$", "", 'g')
let str .= indent . inner . "\n}\n"
else
return zencoding#lang#css#toString(settings, current, type, inline, filters, itemno, indent)

View File

@@ -64,8 +64,8 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters,
for child in current.child
let inner .= zencoding#toString(child, type, inline, filters, itemno)
endfor
let inner = substitute(inner, "\n", "\n" . indent, 'g')
let inner = substitute(inner, "\n" . indent . "$", "", 'g')
let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
let inner = substitute(inner, "\n" . escape(indent, '\') . "$", "", 'g')
let str .= "\n" . indent . inner
endif
else