From ebcf6d220503be89008c31624d439fcec4424d29 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Mon, 7 Nov 2016 16:09:09 +0900 Subject: [PATCH] fix rtype --- autoload/emmet.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index aa89e4f..0d43af4 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -374,7 +374,7 @@ function! emmet#getFileType(...) abort let type = '' if has_key(s:emmet_settings, &filetype) - let types = [&filetype] + return &filetype else let types = split(&filetype, '\.') endif @@ -543,7 +543,7 @@ function! emmet#expandAbbr(mode, abbr) range abort let items = emmet#parseIntoTree(query, type).child let itemno = 0 for item in items - let inner = emmet#toString(item, rtype, 0, filters, 0, indent) + let inner = emmet#toString(item, type, 0, filters, 0, indent) let inner = substitute(inner, '\$#', '$line'.(itemno*(a:lastline - a:firstline + 1)/len(items)+1).'$', 'g') let expand .= inner let itemno = itemno + 1 @@ -613,7 +613,7 @@ function! emmet#expandAbbr(mode, abbr) range abort let items = emmet#parseIntoTree(leader, type).child endif for item in items - let expand .= emmet#toString(item, rtype, 0, filters, 0, '') + let expand .= emmet#toString(item, type, 0, filters, 0, '') endfor if emmet#useFilter(filters, 'e') let expand = substitute(expand, '&', '\&', 'g') @@ -658,9 +658,9 @@ function! emmet#expandAbbr(mode, abbr) range abort let filters = split(matchstr(str, s:filtermx)[1:], '\s*,\s*') let str = substitute(str, s:filtermx, '', '') endif - let items = emmet#parseIntoTree(str, rtype).child + let items = emmet#parseIntoTree(str, type).child for item in items - let expand .= emmet#toString(item, rtype, 0, filters, 0, indent) + let expand .= emmet#toString(item, type, 0, filters, 0, indent) endfor if emmet#useFilter(filters, 'e') let expand = substitute(expand, '&', '\&', 'g')