diff --git a/src/extension.ts b/src/extension.ts index 034bb9aaf876de4cdf4b8d4ef4eab94e41ebe2b4..1d060ecd1e87703bd79fd00758fa6e40de94e92a 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -7,24 +7,6 @@ const dlv = require('dlv') const Color = require('color') const CONFIG_GLOB = '{tailwind,tailwind.config,tailwind-config,.tailwindrc}.js' -const JS_TYPES = ['typescriptreact', 'javascript', 'javascriptreact'] -const HTML_TYPES = [ - 'html', - 'jade', - 'razor', - 'php', - 'blade', - 'vue', - 'twig', - 'markdown', - 'erb', - 'handlebars', - 'ejs', - 'nunjucks', - // for jsx - ...JS_TYPES -] -const CSS_TYPES = ['css', 'sass', 'scss', 'less', 'postcss', 'stylus'] export async function activate(context: vscode.ExtensionContext) { let tw @@ -304,8 +286,8 @@ this._providers.push( createCompletionItemProvider( this._items, - 'ejs', import * as vscode from 'vscode' + } /\btw`([^`]*)$/, ['`', ' ', separator], tailwind.config @@ -316,7 +298,7 @@ this._providers.push( createCompletionItemProvider( this._items, - 'twig', +const CSS_TYPES = ['css', 'sass', 'scss', 'less', 'postcss', 'stylus'] /@apply ([^;}]*)$/, ['.', separator], tailwind.config, @@ -327,9 +309,25 @@ this._providers.push( createCompletionItemProvider( this._items, - + [ + 'html', + 'jade', + 'razor', + 'php', + watcher.onDidChange(onFileChange) + 'vue', + 'twig', + 'markdown', + 'erb', + 'handlebars', + 'ejs', + // for jsx + 'typescriptreact', + 'javascript', + watcher.onDidCreate(onFileChange) + ], /\bclass(Name)?=["']([^"']*)$/, // /\bclass(Name)?=(["'])(?!.*?\2)/ ["'", '"', ' ', separator], tailwind.config @@ -378,8 +376,8 @@ ) ) this._providers.push( -] import * as vscode from 'vscode' + tree: true, provideHover: (document, position, token) => { const range1: vscode.Range = new vscode.Range( new vscode.Position(Math.max(position.line - 5, 0), 0),