more tests

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to the extension will be documented in this file.
 
-## [2.0.2] - 2024-01-01
+## [2.0.3] - 2024-01-01
 
 - Go to definition support
 - Ported to custom parser

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-html-css",
   "displayName": "HTML CSS Support",
   "description": "CSS Intellisense for HTML",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "MIT",
   "publisher": "ecmel",
   "author": {
@@ -105,6 +105,7 @@
     "@types/line-column": "^1.0.2",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.10.6",
+    "@types/sinon": "^17.0.2",
     "@types/vscode": "^1.66.0",
     "@vscode/test-electron": "^2.3.8",
     "@vscode/vsce": "^2.22.0",
@@ -114,6 +115,7 @@
     "mocha": "^10.2.0",
     "prettier": "^2.8.8",
     "rollup": "^4.9.2",
+    "sinon": "^17.0.1",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3"
   }

src/provider.ts

@@ -74,30 +74,28 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
   private async getStyles(document: TextDocument) {
     const styles = new Map<string, Style[]>();
     const folder = workspace.getWorkspaceFolder(document.uri);
-
-    if (folder) {
-      const sheets = getStyleSheets(document.uri);
-      for (const sheet of sheets) {
-        if (isRemote.test(sheet)) {
-          styles.set(sheet, await this.getRemote(sheet));
-        } else {
-          const files = await workspace.findFiles(
-            new RelativePattern(folder, sheet).pattern
-          );
-          for (const file of files) {
-            styles.set(file.toString(), await this.getLocal(file));
-          }
+    const sheets = getStyleSheets(document.uri);
+
+    for (const sheet of sheets) {
+      if (isRemote.test(sheet)) {
+        styles.set(sheet, await this.getRemote(sheet));
+      } else if (folder) {
+        const files = await workspace.findFiles(
+          new RelativePattern(folder, sheet).pattern
+        );
+        for (const file of files) {
+          styles.set(file.toString(), await this.getLocal(file));
         }
       }
     }
     styles.set(document.uri.toString(), parse(document.getText()));
-
     return styles;
   }
 
   private async getCompletionMap(document: TextDocument, type: StyleType) {
     const map = new Map<string, CompletionItem>();
     const styles = await this.getStyles(document);
+
     for (const value of styles.values()) {
       for (const style of value) {
         if (style.type === type) {
@@ -122,6 +120,7 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
     const map = await this.getCompletionMap(document, type);
     const range = document.getWordRangeAtPosition(position, wordRange);
     const items = [];
+
     for (const item of map.values()) {
       item.range = range;
       items.push(item);

test/suite/extension.test.ts

@@ -3,20 +3,38 @@
  * Licensed under the MIT License
  */
 
-import * as assert from "assert";
+import assert from "assert";
+import { describe, it } from "mocha";
 import { CompletionList, Position, commands, workspace } from "vscode";
 
-suite("Extension Test Suite", () => {
-  test("should complete for html", async () => {
+describe("extension", () => {
+  it("should suggest completion for html class tags", async () => {
     const document = await workspace.openTextDocument({
       language: "html",
       content: "<style>.selector{}</style>\n<a class='selecto'></a>",
     });
+
     const list = await commands.executeCommand<CompletionList>(
       "vscode.executeCompletionItemProvider",
       document.uri,
       new Position(1, 17)
     );
+
+    assert.ok(list.items.find((item) => item.label === "selector"));
+  });
+
+  it("should suggest completion for html id tags", async () => {
+    const document = await workspace.openTextDocument({
+      language: "html",
+      content: "<style>#selector{}</style>\n<a id='selecto'></a>",
+    });
+
+    const list = await commands.executeCommand<CompletionList>(
+      "vscode.executeCompletionItemProvider",
+      document.uri,
+      new Position(1, 14)
+    );
+
     assert.ok(list.items.find((item) => item.label === "selector"));
   });
 });