Fixes

Author: Ecmel Ercan

README.md

@@ -8,7 +8,7 @@ CSS support for HTML documents.
 - Style attribute completion and hover.
 - Id attribute completion.
 - Class attribute completion.
-- Supports Zen Coding completion for id and class attributes
+- Supports Zen Coding completion for id and class attributes.
 - Scans workspace folder for css files.
 - Supports optional resource.json file for fine tuned resource selection.
 - Uses [vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice).

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-html-css",
   "displayName": "HTML CSS Support",
   "description": "CSS support for HTML documents",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "publisher": "ecmel",
   "license": "MIT",
   "homepage": "https://github.com/ecmel/vscode-html-css",

src/extension.ts

@@ -41,7 +41,10 @@ class Snippet {
 
 class StyleServer implements vsc.CompletionItemProvider, vsc.HoverProvider {
 
-  private regex = [/style=["|']([^"^']*$)/i, /<style[\s\S]*>([^<]*$)/i];
+  private regex = [
+    /style=["|']([^"^']*$)/i,
+    /<style[^\<\s\S]*\>([^\<]*)/i
+  ];
 
   private convertCompletionList(list: lst.CompletionList): vsc.CompletionList {
     let ci: vsc.CompletionItem[] = [];
@@ -102,7 +105,11 @@ class StyleServer implements vsc.CompletionItemProvider, vsc.HoverProvider {
 
 class ClassServer implements vsc.CompletionItemProvider {
 
-  private regex = [/(class|id)=["|']([^"^']*$)/i, /<style[\s\S]*>([\s\S]*)<\/style>/ig, /(\.|\#)[^\.^\#^\<^\>]*$/i];
+  private regex = [
+    /(class|id)=["|']([^"^']*$)/i,
+    /<style[\s\S]*>([\s\S]*)<\/style>/ig,
+    /(\.|\#)[^\.^\#^\<^\>]*$/i
+  ];
 
   provideCompletionItems(document: vsc.TextDocument, position: vsc.Position, token: vsc.CancellationToken): vsc.CompletionList {
     let start = new vsc.Position(0, 0);