mirror of
https://github.com/mattn/emmet-vim.git
synced 2025-12-07 11:14:26 +08:00
@@ -315,8 +315,15 @@ function! emmet#getResource(type, name, default) abort
|
|||||||
if has_key(s:emmet_settings, '*') && has_key(s:emmet_settings['*'], a:name)
|
if has_key(s:emmet_settings, '*') && has_key(s:emmet_settings['*'], a:name)
|
||||||
let global = extend(global, s:emmet_settings['*'][a:name])
|
let global = extend(global, s:emmet_settings['*'][a:name])
|
||||||
endif
|
endif
|
||||||
|
echo a:type
|
||||||
|
|
||||||
for type in split(a:type, '\.')
|
if has_key(s:emmet_settings, a:type)
|
||||||
|
let types = [a:type]
|
||||||
|
else
|
||||||
|
let types = split(a:type, '\.')
|
||||||
|
endif
|
||||||
|
|
||||||
|
for type in types
|
||||||
if !has_key(s:emmet_settings, type)
|
if !has_key(s:emmet_settings, type)
|
||||||
continue
|
continue
|
||||||
endif
|
endif
|
||||||
@@ -366,7 +373,13 @@ endfunction
|
|||||||
function! emmet#getFileType(...) abort
|
function! emmet#getFileType(...) abort
|
||||||
let flg = get(a:000, 0, 0)
|
let flg = get(a:000, 0, 0)
|
||||||
let type = ''
|
let type = ''
|
||||||
for part in split(&filetype, '\.')
|
|
||||||
|
if has_key(s:emmet_settings, &filetype)
|
||||||
|
let types = [&filetype]
|
||||||
|
else
|
||||||
|
let types = split(a:type, '\.')
|
||||||
|
endif
|
||||||
|
for part in types
|
||||||
if emmet#lang#exists(part)
|
if emmet#lang#exists(part)
|
||||||
let type = part
|
let type = part
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -136,7 +136,8 @@ function! emmet#lang#html#parseIntoTree(abbr, type) abort
|
|||||||
let snippet = substitute(snippet, '|', '${cursor}', 'g')
|
let snippet = substitute(snippet, '|', '${cursor}', 'g')
|
||||||
endif
|
endif
|
||||||
" just redirect to expanding
|
" just redirect to expanding
|
||||||
if snippet !~ '^\s*<'
|
if snippet !~ '^\s*[{\[<]'
|
||||||
|
let part = emmet#lang#html#findTokens(part)
|
||||||
return emmet#lang#html#parseIntoTree(snippet, a:type)
|
return emmet#lang#html#parseIntoTree(snippet, a:type)
|
||||||
endif
|
endif
|
||||||
let lines = split(snippet, "\n", 1)
|
let lines = split(snippet, "\n", 1)
|
||||||
|
|||||||
Reference in New Issue
Block a user