VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2025-12-07 03:04:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix order of attributes. close #117

Browse Source
This commit is contained in:
mattn
2013-04-09 10:39:31 +09:00
parent f08061ec20
commit 4825e6b6c9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/zencoding/lang/haml.vim
View File

@@ -138,7 +138,7 @@ function! zencoding#lang#haml#encodeImage()
endfunction endfunction
function! zencoding#lang#haml#parseTag(tag) function! zencoding#lang#haml#parseTag(tag)
let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': ['id', 'class'] } let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': [] }
let mx = '%\([a-zA-Z][a-zA-Z0-9]*\)\s*\%({\(.*\)}\)' let mx = '%\([a-zA-Z][a-zA-Z0-9]*\)\s*\%({\(.*\)}\)'
let match = matchstr(a:tag, mx) let match = matchstr(a:tag, mx)
let current.name = substitute(match, mx, '\1', 'i') let current.name = substitute(match, mx, '\1', 'i')
@@ -153,9 +153,9 @@ function! zencoding#lang#haml#parseTag(tag)
let name = attr_match[1] let name = attr_match[1]
let value = len(attr_match[2]) ? attr_match[2] : attr_match[3] let value = len(attr_match[2]) ? attr_match[2] : attr_match[3]
let current.attr[name] = value let current.attr[name] = value
let current.attrs_order += [name]
let attrs = attrs[stridx(attrs, match) + len(match):] let attrs = attrs[stridx(attrs, match) + len(match):]
endwhile endwhile
let current.attrs_order = keys(current.attr)
return current return current
endfunction endfunction

4
autoload/zencoding/lang/html.vim
View File

@@ -454,7 +454,7 @@ function! zencoding#lang#html#encodeImage()
endfunction endfunction
function! zencoding#lang#html#parseTag(tag) function! zencoding#lang#html#parseTag(tag)
let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': ['id', 'class'] } let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': [] }
let mx = '<\([a-zA-Z][a-zA-Z0-9]*\)\(\%(\s[a-zA-Z][a-zA-Z0-9]\+=\%([^"'' \t]\+\|"[^"]\{-}"\|''[^'']\{-}''\)\s*\)*\)\(/\{0,1}\)>' let mx = '<\([a-zA-Z][a-zA-Z0-9]*\)\(\%(\s[a-zA-Z][a-zA-Z0-9]\+=\%([^"'' \t]\+\|"[^"]\{-}"\|''[^'']\{-}''\)\s*\)*\)\(/\{0,1}\)>'
let match = matchstr(a:tag, mx) let match = matchstr(a:tag, mx)
let current.name = substitute(match, mx, '\1', 'i') let current.name = substitute(match, mx, '\1', 'i')
@@ -469,9 +469,9 @@ function! zencoding#lang#html#parseTag(tag)
let name = attr_match[1] let name = attr_match[1]
let value = len(attr_match[2]) ? attr_match[2] : attr_match[3] let value = len(attr_match[2]) ? attr_match[2] : attr_match[3]
let current.attr[name] = value let current.attr[name] = value
let current.attrs_order += [name]
let attrs = attrs[stridx(attrs, match) + len(match):] let attrs = attrs[stridx(attrs, match) + len(match):]
endwhile endwhile
let current.attrs_order = keys(current.attr)
return current return current
endfunction endfunction

4
autoload/zencoding/lang/slim.vim
View File

@@ -116,7 +116,7 @@ function! zencoding#lang#slim#encodeImage()
endfunction endfunction
function! zencoding#lang#slim#parseTag(tag) function! zencoding#lang#slim#parseTag(tag)
let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': ['id', 'class'] } let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': [] }
let mx = '\([a-zA-Z][a-zA-Z0-9]*\)\s\+\(.*\)' let mx = '\([a-zA-Z][a-zA-Z0-9]*\)\s\+\(.*\)'
let match = matchstr(a:tag, mx) let match = matchstr(a:tag, mx)
let current.name = substitute(match, mx, '\1', 'i') let current.name = substitute(match, mx, '\1', 'i')
@@ -131,9 +131,9 @@ function! zencoding#lang#slim#parseTag(tag)
let name = attr_match[1] let name = attr_match[1]
let value = len(attr_match[2]) ? attr_match[2] : attr_match[3] let value = len(attr_match[2]) ? attr_match[2] : attr_match[3]
let current.attr[name] = value let current.attr[name] = value
let current.attrs_order += [name]
let attrs = attrs[stridx(attrs, match) + len(match):] let attrs = attrs[stridx(attrs, match) + len(match):]
endwhile endwhile
let current.attrs_order = keys(current.attr)
return current return current
endfunction endfunction