Fixes

Ecmel Ercan · Ecmel Ercan · commit a1a08cc00b73 · 2016-07-17T23:23:40.000+03:00
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-html-css",
   "displayName": "HTML CSS Support",
   "description": "CSS support in HTML documents",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "publisher": "ecmel",
   "license": "MIT",
   "homepage": "https://github.com/ecmel/vscode-html-css",
diff --git a/resource.json b/resource.json
@@ -0,0 +1,7 @@
+{
+  "css": {
+    "test": [
+      "test/test.css"
+    ]
+  }
+}
diff --git a/src/extension.ts b/src/extension.ts
@@ -131,7 +131,7 @@ class ClassServer implements vsc.CompletionItemProvider {
       for (let item in items) {
         ci.push(items[item]);
       }
-      return new vsc.CompletionList(ci, false);
+      return new vsc.CompletionList(ci);
     }
     return null;
   }
@@ -169,16 +169,21 @@ function parse(uri: vsc.Uri) {
 }
 
 function parseResource(resource: any): string {
-  let glob = '{'
+  let glob = ''
+  let count = 0;
   for (let key in resource.css) {
     for (let item of resource.css[key]) {
-      glob = glob + item + ',';
+      glob += item + ',';
+      count++;
     }
   }
-  if (glob.substring(glob.length - 1) === ',') {
-    glob = glob.substring(0, glob.length - 2);
+  if (count > 0) {
+    glob = glob.slice(0, -1);
   }
-  return glob + '}';
+  if (count > 1) {
+    glob = '{' + glob + '}';
+  }
+  return glob;
 }
 
 export function activate(context: vsc.ExtensionContext) {
diff --git a/test/test.html b/test/test.html
@@ -14,7 +14,7 @@
 </head>
 
 <body>
-  <a href="#" style="color: white; background-color: ghostwhite;" class="test test2 test3">TEST</a>
+  <a href="#" style="color: white; background-color: ghostwhite;" class="">TEST</a>
   <a href="#" style="
     color: white; 
     background-color: ghostwhite;

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class ClassServer implements vsc.CompletionItemProvider {`
`131`	`131`	`for (let item in items) {`
`132`	`132`	`ci.push(items[item]);`
`133`	`133`	`}`
`134`		`- return new vsc.CompletionList(ci, false);`
	`134`	`+ return new vsc.CompletionList(ci);`
`135`	`135`	`}`
`136`	`136`	`return null;`
`137`	`137`	`}`
`@@ -169,16 +169,21 @@ function parse(uri: vsc.Uri) {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`function parseResource(resource: any): string {`
`172`		`- let glob = '{'`
	`172`	`+ let glob = ''`
	`173`	`+ let count = 0;`
`173`	`174`	`for (let key in resource.css) {`
`174`	`175`	`for (let item of resource.css[key]) {`
`175`		`- glob = glob + item + ',';`
	`176`	`+ glob += item + ',';`
	`177`	`+ count++;`
`176`	`178`	`}`
`177`	`179`	`}`
`178`		`- if (glob.substring(glob.length - 1) === ',') {`
`179`		`- glob = glob.substring(0, glob.length - 2);`
	`180`	`+ if (count > 0) {`
	`181`	`+ glob = glob.slice(0, -1);`
`180`	`182`	`}`
`181`		`- return glob + '}';`
	`183`	`+ if (count > 1) {`
	`184`	`+ glob = '{' + glob + '}';`
	`185`	`+ }`
	`186`	`+ return glob;`
`182`	`187`	`}`
`183`	`188`
`184`	`189`	`export function activate(context: vsc.ExtensionContext) {`