Fixed multi-root

Author: ecmel

package.json

@@ -2,7 +2,7 @@
 	"name": "vscode-html-css",
 	"displayName": "HTML CSS Support",
 	"description": "CSS support for HTML documents",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"publisher": "ecmel",
 	"license": "MIT",
 	"homepage": "https://github.com/ecmel/vscode-html-css",
@@ -35,7 +35,8 @@
 				"css.remoteStyleSheets": {
 					"type": "array",
 					"default": [],
-					"description": "A list of remote style sheets."
+					"description": "A list of remote style sheets.",
+					"scope": "resource"
 				}
 			}
 		}

src/extension.ts

@@ -13,10 +13,11 @@ import {
     ProviderResult,
     CompletionItem,
     CompletionList,
-    CompletionItemKind
+    CompletionItemKind,
+    Uri
 } from "vscode";
 
-const NONE = "__!NONE!__";
+export const NONE = "__!NONE!__";
 
 export class ClassCompletionItemProvider implements CompletionItemProvider {
 
@@ -27,8 +28,6 @@ export class ClassCompletionItemProvider implements CompletionItemProvider {
     readonly findLinkRel = /rel\s*=\s*(["'])((?:(?!\1).)+)\1/si;
     readonly findLinkHref = /href\s*=\s*(["'])((?:(?!\1).)+)\1/si;
 
-    remoteStyleSheets: string[] = [];
-
     parseTextToItems(text: string, items: Map<string, CompletionItem>) {
         walk(parse(text), node => {
             if (node.type === "ClassSelector") {
@@ -96,16 +95,23 @@ export class ClassCompletionItemProvider implements CompletionItemProvider {
         });
     }
 
-    findRemoteStyles(): Thenable<Set<string>> {
+    findRemoteStyles(uri: Uri): Thenable<Set<string>> {
         return new Promise(resolve => {
             const keys = new Set<string>();
-            const promises = [];
+            const config = workspace.getConfiguration("css", uri);
+            const remoteStyleSheets = config.get<string[]>("remoteStyleSheets", []);
 
-            for (const href of this.remoteStyleSheets) {
-                promises.push(this.fetchStyleSheet(href).then(k => keys.add(k)));
-            }
+            if (remoteStyleSheets.length === 0) {
+                resolve(keys);
+            } else {
+                const promises = [];
 
-            Promise.all(promises).then(() => resolve(keys));
+                for (const href of remoteStyleSheets) {
+                    promises.push(this.fetchStyleSheet(href).then(k => keys.add(k)));
+                }
+
+                Promise.all(promises).then(() => resolve(keys));
+            }
         });
     }
 
@@ -148,7 +154,7 @@ export class ClassCompletionItemProvider implements CompletionItemProvider {
                 if (canComplete) {
                     const items = this.findDocumentStyles(text);
 
-                    this.findRemoteStyles().then(styles =>
+                    this.findRemoteStyles(document.uri).then(styles =>
                         this.findDocumentLinks(text).then(links =>
                             resolve(this.buildItems(items, styles, links))));
                 } else {
@@ -159,22 +165,10 @@ export class ClassCompletionItemProvider implements CompletionItemProvider {
     }
 }
 
-function parseConfig(provider: ClassCompletionItemProvider) {
-    const config = workspace.getConfiguration("css");
-    const remoteStyleSheets = config.get<string[]>("remoteStyleSheets");
-
-    if (remoteStyleSheets) {
-        provider.remoteStyleSheets = remoteStyleSheets;
-    }
-}
-
 export function activate(context: ExtensionContext) {
-    const provider = new ClassCompletionItemProvider();
-
-    parseConfig(provider);
-
-    context.subscriptions.push(workspace.onDidChangeConfiguration(e => parseConfig(provider)));
-    context.subscriptions.push(languages.registerCompletionItemProvider("html", provider, "\"", "'"));
+    context.subscriptions.push(languages
+        .registerCompletionItemProvider("html",
+            new ClassCompletionItemProvider(), "\"", "'"));
 }
 
 export function deactivate() { }

src/test/suite/extension.test.ts

@@ -1,6 +1,7 @@
 import * as assert from 'assert';
 import { ClassCompletionItemProvider } from '../../extension';
 import {
+	workspace,
 	TextDocument,
 	Position,
 	CancellationToken,
@@ -181,22 +182,4 @@ suite('Extension Test Suite', () => {
 			}
 		}, done);
 	});
-
-	test('Completes from remote config', done => {
-		const provider = new ClassCompletionItemProvider();
-		const document = new MockTextDocument(`<a class="`);
-
-		provider.remoteStyleSheets = ["https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"];
-
-		const result = provider.provideCompletionItems(document, position, token, context) as Thenable<CompletionItem[]>;
-
-		result.then(items => {
-			try {
-				assert.notStrictEqual(items.length, 0);
-				done();
-			} catch (e) {
-				done(e);
-			}
-		}, done);
-	});
 });