merge

src/extension.ts

@@ -1,7 +1,8 @@
 'use strict'
 
 import * as vscode from 'vscode'
-import { join, dirname } from 'path'
+import { dirname } from 'path'
+const htmlElements = require('./htmlElements.js')
 const tailwindClassNames = require('tailwind-class-names')
 const dlv = require('dlv')
 const Color = require('color')
@@ -15,16 +16,13 @@ const HTML_TYPES = [
   'razor',
   'php',
   'blade',
-  'vue',
   'twig',
   'markdown',
   'erb',
   'handlebars',
   'ejs',
   'nunjucks',
-  'haml',
+  'haml'
-  // for jsx
-  ...JS_TYPES
 ]
 const CSS_TYPES = ['css', 'sass', 'scss', 'less', 'postcss', 'stylus']
 
@@ -103,14 +101,25 @@ async function getTailwind() {
 
 export function deactivate() {}
 
-function createCompletionItemProvider(
+function createCompletionItemProvider({
   items,
-  languages: string[],
+  languages,
-  regex: RegExp,
+  regex,
-  triggerCharacters: string[],
+  triggerCharacters,
   config,
-  prefix = ''
+  prefix = '',
-): vscode.Disposable {
+  enable = () => true,
+  emmet = false
+}: {
+  items?
+  languages?: string[]
+  regex?: RegExp
+  triggerCharacters?: string[]
+  config?
+  prefix?: string
+  enable?: (text: string) => boolean
+  emmet?: boolean
+} = {}): vscode.Disposable {
   return vscode.languages.registerCompletionItemProvider(
     languages,
     {
@@ -122,21 +131,38 @@ function createCompletionItemProvider(
         let str
 
         const range: vscode.Range = new vscode.Range(
-          new vscode.Position(Math.max(position.line - 5, 0), 0),
+          new vscode.Position(0, 0),
           position
         )
         const text: string = document.getText(range)
 
-        let matches = text.match(regex)
+        if (!enable(text)) return []
+
+        let lines = text.split(/[\n\r]/)
+
+        let matches = lines
+          .slice(-5)
+          .join('\n')
+          .match(regex)
 
         if (matches) {
           let parts = matches[matches.length - 1].split(' ')
           str = parts[parts.length - 1]
-        } else if (languages.indexOf('html') !== -1) {
+        } else if (emmet) {
           // match emmet style syntax
           // e.g. .flex.items-center
-          let lineText = text.split('\n').pop()
+          let currentLine = lines[lines.length - 1]
-          matches = lineText.match(/\.([^()#>*^ \[\]=$@{}]*)$/i)
+          let currentWord = currentLine.split(' ').pop()
+          matches = currentWord.match(/^\.([^.()#>*^ \[\]=$@{}]*)$/)
+          if (!matches) {
+            matches = currentWord.match(
+              new RegExp(
+                `^([A-Z][a-zA-Z0-9]*|[a-z][a-z0-9]*-[a-z0-9-]+|${htmlElements.join(
+                  '|'
+                )}).*?\\.([^.()#>*^ \\[\\]=$@{}]*)$`
+              )
+            )
+          }
           if (matches) {
             let parts = matches[matches.length - 1].split('.')
             str = parts[parts.length - 1]
@@ -171,6 +197,59 @@ function createCompletionItemProvider(
   )
 }
 
+function createConfigItemProvider({
+  languages,
+  items,
+  enable = () => true
+}: {
+  languages?: string[]
+  items?: vscode.CompletionItem[]
+  enable?: (text: string) => boolean
+} = {}) {
+  return vscode.languages.registerCompletionItemProvider(
+    languages,
+    {
+      provideCompletionItems: (
+        document: vscode.TextDocument,
+        position: vscode.Position
+      ): vscode.CompletionItem[] => {
+        const range: vscode.Range = new vscode.Range(
+          new vscode.Position(0, 0),
+          position
+        )
+        const text: string = document.getText(range)
+
+        if (!enable(text)) return []
+
+        let lines = text.split(/[\n\r]/)
+
+        let matches = lines
+          .slice(-5)
+          .join('\n')
+          .match(/config\(["']([^"']*)$/)
+
+        if (!matches) return []
+
+        let objPath =
+          matches[1]
+            .replace(/\.[^.]*$/, '')
+            .replace('.', '.children.')
+            .trim() + '.children'
+        let foo = dlv(items, objPath)
+
+        if (foo) {
+          return Object.keys(foo).map(x => foo[x].item)
+        }
+
+        return Object.keys(items).map(x => items[x].item)
+      }
+    },
+    "'",
+    '"',
+    '.'
+  )
+}
+
 function prefixItems(items, str, prefix) {
   const addPrefix =
     typeof prefix !== 'undefined' && prefix !== '' && str === prefix
@@ -265,7 +344,7 @@ function createItems(classNames, separator, config, parent = '') {
   return items
 }
 
-function createConfigItems(config) {
+function createConfigItems(config, prefix = '') {
   let items = {}
   let i = 0
 
@@ -278,7 +357,7 @@ function createConfigItems(config) {
     if (depthOf(config[key]) === 0) {
       if (key === 'plugins') return
 
-      item.filterText = item.insertText = `.${key}`
+      item.filterText = item.insertText = `${prefix}${key}`
       item.sortText = naturalExpand(i.toString())
       if (typeof config[key] === 'string' || typeof config[key] === 'number') {
         item.detail = config[key]
@@ -298,7 +377,7 @@ function createConfigItems(config) {
       item.filterText = item.insertText = `${key}.`
       item.sortText = naturalExpand(i.toString())
       item.command = { title: '', command: 'editor.action.triggerSuggest' }
-      items[key] = { item, children: createConfigItems(config[key]) }
+      items[key] = { item, children: createConfigItems(config[key], prefix) }
     }
 
     i++
@@ -313,6 +392,7 @@ class TailwindIntellisense {
   private _tailwind
   private _items
   private _configItems
+  private _prefixedConfigItems
 
   constructor(tailwind) {
     if (tailwind) {
@@ -330,83 +410,155 @@ class TailwindIntellisense {
 
     this._items = createItems(tailwind.classNames, separator, tailwind.config)
     this._configItems = createConfigItems(tailwind.config)
+    this._prefixedConfigItems = createConfigItems(tailwind.config, '.')
 
     this._providers = []
 
     this._providers.push(
-      createCompletionItemProvider(
+      createCompletionItemProvider({
-        this._items,
+        items: this._items,
-        JS_TYPES,
+        languages: JS_TYPES,
-        /\btw`([^`]*)$/,
+        regex: /\btw`([^`]*)$/,
-        ['`', ' ', separator],
+        triggerCharacters: ['`', ' ', separator],
-        tailwind.config
+        config: tailwind.config
-      )
+      })
     )
 
     this._providers.push(
-      createCompletionItemProvider(
+      createCompletionItemProvider({
-        this._items,
+        items: this._items,
-        CSS_TYPES,
+        languages: CSS_TYPES,
-        /@apply ([^;}]*)$/,
+        regex: /@apply ([^;}]*)$/,
-        ['.', separator],
+        triggerCharacters: ['.', separator],
-        tailwind.config,
+        config: tailwind.config,
-        '.'
+        prefix: '.'
-      )
+      })
     )
 
     this._providers.push(
-      createCompletionItemProvider(
+      createCompletionItemProvider({
-        this._items,
+        items: this._items,
-        HTML_TYPES,
+        languages: HTML_TYPES,
-        /\bclass(Name)?=["']([^"']*)$/, // /\bclass(Name)?=(["'])(?!.*?\2)/
+        regex: /\bclass=["']([^"']*)$/, // /\bclass(Name)?=(["'])(?!.*?\2)/
-        ["'", '"', ' ', '.', separator],
+        triggerCharacters: ["'", '"', ' ', '.', separator],
-        tailwind.config
+        config: tailwind.config,
-      )
+        emmet: true
+      })
     )
 
     this._providers.push(
-      vscode.languages.registerCompletionItemProvider(
+      createCompletionItemProvider({
-        CSS_TYPES,
+        items: this._items,
-        {
+        languages: JS_TYPES,
-          provideCompletionItems: (
+        regex: /\bclass(Name)?=["']([^"']*)$/, // /\bclass(Name)?=(["'])(?!.*?\2)/
-            document: vscode.TextDocument,
+        triggerCharacters: ["'", '"', ' ', separator]
-            position: vscode.Position
+          .concat([
-          ): vscode.CompletionItem[] => {
+            Object.keys(
-            const range: vscode.Range = new vscode.Range(
+              vscode.workspace.getConfiguration('emmet.includeLanguages')
-              new vscode.Position(Math.max(position.line - 5, 0), 0),
+            ).indexOf('javascript') !== -1 && '.'
-              position
+          ])
+          .filter(Boolean),
+        config: tailwind.config,
+        emmet:
+          Object.keys(
+            vscode.workspace.getConfiguration('emmet.includeLanguages')
+          ).indexOf('javascript') !== -1
+      })
     )
-            const text: string = document.getText(range)
 
-            let matches = text.match(/config\(["']([^"']*)$/)
+    // Vue.js
-
+    this._providers.push(
-            if (!matches) return []
+      createCompletionItemProvider({
-
+        items: this._items,
-            let objPath =
+        languages: ['vue'],
-              matches[1]
+        regex: /\bclass=["']([^"']*)$/,
-                .replace(/\.[^.]*$/, '')
+        enable: text => {
-                .replace('.', '.children.')
+          if (
-                .trim() + '.children'
+            text.indexOf('<template') !== -1 &&
-            let foo = dlv(this._configItems, objPath)
+            text.indexOf('</template>') === -1
-
+          ) {
-            if (foo) {
+            return true
-              console.log(Object.keys(foo).map(x => foo[x].item))
-              return Object.keys(foo).map(x => foo[x].item)
-            }
-
-            return Object.keys(this._configItems).map(
-              x => this._configItems[x].item
-            )
           }
+          return false
         },
-        "'",
+        triggerCharacters: ["'", '"', ' ', separator]
-        '"',
+          .concat([
-        '.'
+            Object.keys(
+              vscode.workspace.getConfiguration('emmet.includeLanguages')
+            ).indexOf('vue-html') !== -1 && '.'
+          ])
+          .filter(Boolean),
+        config: tailwind.config,
+        emmet:
+          Object.keys(
+            vscode.workspace.getConfiguration('emmet.includeLanguages')
+          ).indexOf('vue-html') !== -1
+      })
     )
+    this._providers.push(
+      createCompletionItemProvider({
+        items: this._items,
+        languages: ['vue'],
+        regex: /\bclass=["']([^"']*)$/,
+        enable: text => {
+          if (
+            text.indexOf('<script') !== -1 &&
+            text.indexOf('</script>') === -1
+          ) {
+            return true
+          }
+          return false
+        },
+        triggerCharacters: ["'", '"', ' ', separator],
+        config: tailwind.config
+      })
+    )
+    this._providers.push(
+      createCompletionItemProvider({
+        items: this._items,
+        languages: ['vue'],
+        regex: /@apply ([^;}]*)$/,
+        triggerCharacters: ['.', separator],
+        config: tailwind.config,
+        enable: text => {
+          if (
+            text.indexOf('<style') !== -1 &&
+            text.indexOf('</style>') === -1
+          ) {
+            return true
+          }
+          return false
+        }
+      })
     )
 
     this._providers.push(
-      vscode.languages.registerHoverProvider(HTML_TYPES, {
+      createConfigItemProvider({
+        languages: CSS_TYPES,
+        items: this._prefixedConfigItems
+      })
+    )
+
+    this._providers.push(
+      createConfigItemProvider({
+        languages: ['vue'],
+        items: this._configItems,
+        enable: text => {
+          if (
+            text.indexOf('<style') !== -1 &&
+            text.indexOf('</style>') === -1
+          ) {
+            return true
+          }
+          return false
+        }
+      })
+    )
+
+    this._providers.push(
+      vscode.languages.registerHoverProvider(
+        [...HTML_TYPES, ...JS_TYPES, 'vue'],
+        {
           provideHover: (document, position, token) => {
             const range1: vscode.Range = new vscode.Range(
               new vscode.Position(Math.max(position.line - 5, 0), 0),
@@ -485,7 +637,8 @@ class TailwindIntellisense {
 
             return null
           }
-      })
+        }
+      )
     )
 
     this._disposable = vscode.Disposable.from(...this._providers)

src/htmlElements.ts

@@ -0,0 +1,142 @@
+module.exports = [
+  'a',
+  'abbr',
+  'acronym',
+  'address',
+  'applet',
+  'area',
+  'article',
+  'aside',
+  'audio',
+  'b',
+  'base',
+  'basefont',
+  'bdi',
+  'bdo',
+  'bgsound',
+  'big',
+  'blink',
+  'blockquote',
+  'body',
+  'br',
+  'button',
+  'canvas',
+  'caption',
+  'center',
+  'cite',
+  'code',
+  'col',
+  'colgroup',
+  'command',
+  'content',
+  'data',
+  'datalist',
+  'dd',
+  'del',
+  'details',
+  'dfn',
+  'dialog',
+  'dir',
+  'div',
+  'dl',
+  'dt',
+  'element',
+  'em',
+  'embed',
+  'fieldset',
+  'figcaption',
+  'figure',
+  'font',
+  'footer',
+  'form',
+  'frame',
+  'frameset',
+  'h1',
+  'head',
+  'header',
+  'hgroup',
+  'hr',
+  'html',
+  'i',
+  'iframe',
+  'image',
+  'img',
+  'input',
+  'ins',
+  'isindex',
+  'kbd',
+  'keygen',
+  'label',
+  'legend',
+  'li',
+  'link',
+  'listing',
+  'main',
+  'map',
+  'mark',
+  'marquee',
+  'menu',
+  'menuitem',
+  'meta',
+  'meter',
+  'multicol',
+  'nav',
+  'nextid',
+  'nobr',
+  'noembed',
+  'noframes',
+  'noscript',
+  'object',
+  'ol',
+  'optgroup',
+  'option',
+  'output',
+  'p',
+  'param',
+  'picture',
+  'plaintext',
+  'pre',
+  'progress',
+  'q',
+  'rb',
+  'rp',
+  'rt',
+  'rtc',
+  'ruby',
+  's',
+  'samp',
+  'script',
+  'section',
+  'select',
+  'shadow',
+  'slot',
+  'small',
+  'source',
+  'spacer',
+  'span',
+  'strike',
+  'strong',
+  'style',
+  'sub',
+  'summary',
+  'sup',
+  'table',
+  'tbody',
+  'td',
+  'template',
+  'textarea',
+  'tfoot',
+  'th',
+  'thead',
+  'time',
+  'title',
+  'tr',
+  'track',
+  'tt',
+  'u',
+  'ul',
+  'var',
+  'video',
+  'wbr',
+  'xmp'
+]