From 84a03888270cd5f82a6dd584b85d4bc33cd6351f Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Wed, 13 Nov 2019 16:28:12 +0900
Subject: [PATCH] [WIP] styled

---
 autoload/emmet.vim          | 2 ++
 autoload/emmet/lang.vim     | 1 +
 autoload/emmet/lang/css.vim | 9 +++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/autoload/emmet.vim b/autoload/emmet.vim
index 0e36d3b..7d2f004 100644
--- a/autoload/emmet.vim
+++ b/autoload/emmet.vim
@@ -396,6 +396,8 @@ function! emmet#getFileType(...) abort
     let type = 'html'
   elseif type =~? '^jsx'
     let type = 'jsx'
+  elseif type =~? '^jsTemplateString'
+    let type = 'css-block'
   elseif (type =~? '^js\w' || type =~? '^javascript') && !(&filetype =~? 'jsx')
     let type = 'javascript'
   elseif type =~? '^tsx'
diff --git a/autoload/emmet/lang.vim b/autoload/emmet/lang.vim
index 37e426b..fe7aea5 100644
--- a/autoload/emmet/lang.vim
+++ b/autoload/emmet/lang.vim
@@ -15,6 +15,7 @@ function! emmet#lang#type(type) abort
   let settings = emmet#getSettings()
   while base != ''
     for b in split(base, '\.')
+      let b = substitute(b, '-.*', '', '')
       if emmet#lang#exists(b)
         return b
       endif
diff --git a/autoload/emmet/lang/css.vim b/autoload/emmet/lang/css.vim
index 3823337..3594dc4 100644
--- a/autoload/emmet/lang/css.vim
+++ b/autoload/emmet/lang/css.vim
@@ -13,10 +13,11 @@ function! emmet#lang#css#parseIntoTree(abbr, type) abort
   let prefix = 0
   let value = ''
 
-  let indent = emmet#getIndentation(type)
-  let aliases = emmet#getResource(type, 'aliases', {})
-  let snippets = emmet#getResource(type, 'snippets', {})
-  let use_pipe_for_cursor = emmet#getResource(type, 'use_pipe_for_cursor', 1)
+  let ftype = substitute(type, '-.*', '', '')
+  let indent = emmet#getIndentation(ftype)
+  let aliases = emmet#getResource(ftype, 'aliases', {})
+  let snippets = emmet#getResource(ftype, 'snippets', {})
+  let use_pipe_for_cursor = emmet#getResource(ftype, 'use_pipe_for_cursor', 1)
 
   let root = emmet#newNode()