Merge remote-tracking branch 'zignd/master'

Author: m2de

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.13.0 (Nov 6, 2017)
+* Added support for Laravel (Blade).
+
 ### 1.12.0 (Out 31, 2017)
 * Added the "multi-root ready" keyword, it was a request from the VS Code team.
 

README.md

@@ -13,6 +13,7 @@ A Visual Studio Code extension that provides CSS class name completion for the H
 * HTML
 * Razor
 * PHP
+* Laravel (Blade)
 * JavaScript
 * JavaScript React (.jsx)
 * TypeScript React (.tsx)
@@ -23,11 +24,14 @@ A Visual Studio Code extension that provides CSS class name completion for the H
 * Handlebars
 * EJS (.ejs)
 
+## Library Specific Support
+* @apply in CSS, SASS and SCSS Files for [Tailwind CSS](https://tailwindcss.com)
+
 ## Contributions
 You can request new features and/or contribute to the extension development on its [repository on GitHub](https://github.com/Zignd/HTML-CSS-Class-Completion/issues). Look for an issue you're interested in working on, comment on it to let me know you're working on it and submit your pull request! :D
 
-## What's new in version 1.12.0 (Out 31, 2017)
-* Added the "multi-root ready" keyword, it was a request from the VS Code team.
+## What's new in version 1.13.0 (Nov 6, 2017)
+* Added support for Laravel (Blade).
 
 Check out the [change log](https://github.com/zignd/HTML-CSS-Class-Completion/blob/master/CHANGELOG.md) for the current and previous updates.
 

package.json

@@ -2,7 +2,7 @@
   "name": "html-css-class-completion",
   "displayName": "IntelliSense for CSS class names",
   "description": "Provides CSS class name completion for the HTML class attribute based on the CSS files in your workspace. Also supports React's className attribute.",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "publisher": "Zignd",
   "engines": {
     "vscode": "^1.4.0"

src/extension.ts

@@ -122,34 +122,21 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         }
     }));
 
-    const htmlRegex = /class=["|']([\w- ]*$)/;
-    const jsxRegex = /className=["|']([\w- ]*$)/;
-
-    const html = provideCompletionItemsGenerator('html', htmlRegex);
-    const razor = provideCompletionItemsGenerator('razor', htmlRegex);
-    const php = provideCompletionItemsGenerator('php', htmlRegex);
-    const vue = provideCompletionItemsGenerator('vue', htmlRegex);
-    const twig = provideCompletionItemsGenerator('twig', htmlRegex);
-    const md = provideCompletionItemsGenerator('markdown', htmlRegex);
-    const tsReact = provideCompletionItemsGenerator('typescriptreact', jsxRegex);
-    const js = provideCompletionItemsGenerator('javascript', jsxRegex)
-    const jsReact = provideCompletionItemsGenerator('javascriptreact', jsxRegex);
-    const erb = provideCompletionItemsGenerator('erb', htmlRegex);
-    const hbs = provideCompletionItemsGenerator('handlebars', htmlRegex);
-    const ejs = provideCompletionItemsGenerator('ejs', htmlRegex);
-
-    context.subscriptions.push(html);
-    context.subscriptions.push(razor);
-    context.subscriptions.push(php);
-    context.subscriptions.push(vue);
-    context.subscriptions.push(twig);
-    context.subscriptions.push(md);
-    context.subscriptions.push(tsReact);
-    context.subscriptions.push(js);
-    context.subscriptions.push(jsReact);
-    context.subscriptions.push(erb);
-    context.subscriptions.push(hbs);
-    context.subscriptions.push(ejs);
+    // Javascript based extensions
+    ['typescriptreact', 'javascript', 'javascriptreact'].forEach((extension) => {
+        context.subscriptions.push(provideCompletionItemsGenerator(extension, /className=["|']([\w- ]*$)/));
+    });
+
+    // HTML based extensions
+    ['html', 'razor', 'php', 'blade', 'vue', 'twig', 'markdown', 'erb', 'handlebars', 'ejs'].forEach((extension) => {
+        context.subscriptions.push(provideCompletionItemsGenerator(extension, /class=["|']([\w- ]*$)/));
+    });
+
+    // CSS based extensions
+    ['css', 'sass', 'scss'].forEach((extension) => {
+        // Support for Tailwind CSS
+        context.subscriptions.push(provideCompletionItemsGenerator(extension, /@apply ([\w- ]*$)/));
+    });
 
     caching = true;
     try {