VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2025-12-06 10:44:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix zero origin base value

Browse Source 
closes #420
This commit is contained in:
Yasuhiro Matsumoto
2018-05-21 10:39:09 +09:00
parent acc5ac7a9b
commit f5b185e3a2
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/emmet.vim
View File

@@ -182,18 +182,10 @@ endfunction
function! s:itemno(itemno, current) abort function! s:itemno(itemno, current) abort
let current = a:current let current = a:current
if current.basedirect > 0 if current.basedirect > 0
if current.basevalue ==# 0
return a:itemno
else
return current.basevalue - 1 + a:itemno return current.basevalue - 1 + a:itemno
endif
else
if current.basevalue ==# 0
return current.multiplier - 1 - a:itemno
else else
return current.multiplier + current.basevalue - 2 - a:itemno return current.multiplier + current.basevalue - 2 - a:itemno
endif endif
endif
endfunction endfunction
function! s:localvar(current, key) abort function! s:localvar(current, key) abort

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

@@ -154,7 +154,11 @@ function! emmet#lang#html#parseIntoTree(abbr, type) abort
endif endif
let basedirect = basevalue[1] ==# '-' ? -1 : 1 let basedirect = basevalue[1] ==# '-' ? -1 : 1
if basevalue != ''
let basevalue = 0 + abs(basevalue[1:]) let basevalue = 0 + abs(basevalue[1:])
else
let basevalue = 1
endif
if multiplier <= 0 | let multiplier = 1 | endif if multiplier <= 0 | let multiplier = 1 | endif
" make default node " make default node

9
unittest.vim
View File

@@ -679,6 +679,15 @@ finish
}, },
], ],
}, },
{
'name': 'base value',
'tests': [
{
'query': "ul>li#id$@0*3",
'result': "<ul>\n\t<li id=\"id0\"></li>\n\t<li id=\"id1\"></li>\n\t<li id=\"id2\"></li>\n</ul>\n",
},
],
},
], ],
'dummy': "}}}"}, 'dummy': "}}}"},
{ 'test-css': '{{{', { 'test-css': '{{{',