Refactoring

Author: ecmel

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the extension will be documented in this file.
 
+## [1.8.1] - 
+
+- Minor internal refactoring.
+
 ## [1.8.0] - 2021-01-11
 
 - Added validate command.

package.json

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

src/completion.ts

@@ -41,35 +41,33 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
         this.cache.clear();
     }
 
-    watchFile(uri: Uri, listener: (e: Uri) => any) {
-        const key = uri.toString();
-
-        if (!this.watchers.has(key)) {
-            const watcher = workspace.createFileSystemWatcher(uri.fsPath);
+    watchFile(path: string, listener: (e: Uri) => any) {
+        if (!this.watchers.has(path)) {
+            const watcher = workspace.createFileSystemWatcher(path);
 
             watcher.onDidCreate(listener);
             watcher.onDidChange(listener);
             watcher.onDidDelete(listener);
 
-            this.watchers.set(key, watcher);
+            this.watchers.set(path, watcher);
         }
     }
 
-    getStyleSheets(uri: Uri): string[] {
-        return workspace.getConfiguration("css", uri).get<string[]>("styleSheets", []);
-    }
-
-    getRelativePath(uri: Uri, spec: string, ext?: string): string {
+    getRelativePath(uri: Uri, path: string, ext?: string): string {
         const folder = workspace.getWorkspaceFolder(uri);
-        const name = ext ? join(dirname(spec), basename(spec, ext) + ext) : spec;
+        const name = ext ? join(dirname(path), basename(path, ext) + ext) : path;
 
         return folder
-            ? join(isAbsolute(spec)
+            ? join(isAbsolute(path)
                 ? folder.uri.fsPath
                 : dirname(uri.fsPath), name)
             : join(dirname(uri.fsPath), name);
     }
 
+    getStyleSheets(uri: Uri): string[] {
+        return workspace.getConfiguration("css", uri).get<string[]>("styleSheets", []);
+    }
+
     parseTextToItems(text: string, items: CompletionItem[]) {
         walk(parse(text), node => {
 
@@ -90,47 +88,38 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
         });
     }
 
-    async fetchLocal(key: string, uri: Uri): Promise<void> {
-        const file = Uri.file(this.getRelativePath(uri, key));
-        const items: CompletionItem[] = [];
-
-        try {
-            const content = await workspace.fs.readFile(file);
-            this.parseTextToItems(content.toString(), items);
-        } catch (error) {
+    async fetchStyleSheet(key: string, uri: Uri): Promise<void> {
+        if (this.cache.has(key)) {
+            return;
         }
 
-        this.cache.set(key, items);
-        this.watchFile(file, e => this.cache.delete(key));
-    }
-
-    async fetchRemote(key: string): Promise<void> {
         const items: CompletionItem[] = [];
 
-        try {
-            const res = await fetch(key);
+        if (this.isRemote.test(key)) {
+            try {
+                const res = await fetch(key);
 
-            if (res.ok) {
-                const text = await res.text();
-                this.parseTextToItems(text, items);
+                if (res.ok) {
+                    this.parseTextToItems(await res.text(), items);
+                }
+            } catch (error) {
             }
-        } catch (error) {
-        }
-
-        this.cache.set(key, items);
-    }
+        } else {
+            const path = this.getRelativePath(uri, key);
 
-    async fetchStyleSheet(key: string, uri: Uri): Promise<void> {
-        if (!this.cache.has(key)) {
-            if (this.isRemote.test(key)) {
-                await this.fetchRemote(key);
-            } else {
-                await this.fetchLocal(key, uri);
+            try {
+                const content = await workspace.fs.readFile(Uri.file(path));
+                this.parseTextToItems(content.toString(), items);
+            } catch (error) {
             }
+
+            this.watchFile(path, e => this.cache.delete(key));
         }
+
+        this.cache.set(key, items);
     }
 
-    findDocumentStyles(uri: Uri, keys: Set<string>, text: string) {
+    findEmbedded(uri: Uri, keys: Set<string>, text: string) {
         const key = uri.toString();
         const items: CompletionItem[] = [];
         const findStyles = /<style[^>]*>([^<]+)<\/style>/gi;
@@ -145,14 +134,14 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
         keys.add(key);
     }
 
-    async findStyleSheets(uri: Uri, keys: Set<string>): Promise<void> {
+    async findFixed(uri: Uri, keys: Set<string>): Promise<void> {
         for (const key of this.getStyleSheets(uri)) {
             await this.fetchStyleSheet(key, uri);
             keys.add(key);
         }
     }
 
-    async findDocumentLinks(uri: Uri, keys: Set<string>, text: string): Promise<void> {
+    async findLinked(uri: Uri, keys: Set<string>, text: string): Promise<void> {
         const findLinks = /<link([^>]+)>/gi;
 
         let link;
@@ -173,7 +162,7 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
         }
     }
 
-    async findExtendedStyles(uri: Uri, keys: Set<string>, text: string, level: number = 0): Promise<void> {
+    async findInherited(uri: Uri, keys: Set<string>, text: string, level: number = 0): Promise<void> {
         const extended = this.findExtended.exec(text);
 
         if (extended && level < 3) {
@@ -188,10 +177,10 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
                 const content = await workspace.fs.readFile(file);
                 const text = content.toString();
 
-                this.findDocumentStyles(file, keys, text);
+                this.findEmbedded(file, keys, text);
 
-                await this.findDocumentLinks(file, keys, text);
-                await this.findExtendedStyles(file, keys, text, level);
+                await this.findLinked(file, keys, text);
+                await this.findInherited(file, keys, text, level);
             } catch (error) {
             }
         }
@@ -202,11 +191,11 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
         const uri = document.uri;
         const text = document.getText();
 
-        this.findDocumentStyles(uri, keys, text);
+        this.findEmbedded(uri, keys, text);
 
-        await this.findStyleSheets(uri, keys);
-        await this.findDocumentLinks(uri, keys, text);
-        await this.findExtendedStyles(uri, keys, text);
+        await this.findFixed(uri, keys);
+        await this.findLinked(uri, keys, text);
+        await this.findInherited(uri, keys, text);
 
         const ids = new Map<string, CompletionItem>();
         const classes = new Map<string, CompletionItem>();