refactor: revert to implementation using css-tree (yaegassy#5)

Author: yaegassy

package.json

@@ -48,6 +48,7 @@
     "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.15.0",
     "coc.nvim": "0.0.83-next.17",
+    "css-tree": "1.1.2",
     "esbuild": "^0.16.17",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
@@ -97,7 +98,5 @@
       }
     ]
   },
-  "dependencies": {
-    "fast-glob": "^3.3.2"
-  }
+  "dependencies": {}
 }

src/completion.ts

@@ -12,7 +12,7 @@ import {
   Uri,
   workspace,
 } from 'coc.nvim';
-import { glob } from 'fast-glob';
+import { parse, walk } from 'css-tree';
 import fetch from 'node-fetch';
 import { basename, dirname, extname, isAbsolute, join } from 'path';
 
@@ -65,21 +65,28 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
   }
 
   parseTextToItems(path: string, text: string, items: CompletionItem[]) {
-    const regex = /([.#])(-?[_a-zA-Z]+[_a-zA-Z0-9-]*)\s*{([^}]*)}/g;
-
-    let match: RegExpExecArray | null = null;
-
-    while ((match = regex.exec(text))) {
-      const kind = match[1] === '.' ? CompletionItemKind.Enum : CompletionItemKind.Value;
+    walk(parse(text), (node) => {
+      let kind: CompletionItemKind;
+
+      switch (node.type) {
+        case 'ClassSelector':
+          kind = CompletionItemKind.Enum;
+          break;
+        case 'IdSelector':
+          kind = CompletionItemKind.Value;
+          break;
+        default:
+          return;
+      }
 
       const resultCompletionItem: CompletionItem = {
-        label: match[2],
+        label: node.name,
         kind,
         detail: 'filename: ' + path,
       };
 
       items.push(resultCompletionItem);
-    }
+    });
   }
 
   async fetchLocal(path: string): Promise<void> {
@@ -91,8 +98,7 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
 
     try {
       const content = await workspace.readFile(path);
-      const text = content.toString();
-      this.parseTextToItems(basename(path), text, items);
+      this.parseTextToItems(basename(path), content.toString(), items);
     } catch (error) {}
 
     this.cache.set(path, items);
@@ -122,14 +128,10 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
     if (this.isRemote.test(path)) {
       await this.fetchRemote(path);
     } else {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const base = basename(uri.fsPath, extname(uri.fsPath));
 
-      const paths = isAbsolute(path) ? glob.sync(path) : [path];
-
-      for (const path of paths) {
-        await this.fetchLocal(path);
-      }
+      path = this.getPath(uri, path.replace(/\${\s*fileBasenameNoExtension\s*}/, base));
+      await this.fetchLocal(path);
     }
 
     return path;

yarn.lock

@@ -518,6 +518,14 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+css-tree@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
+  integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
+  dependencies:
+    mdn-data "2.0.14"
+    source-map "^0.6.1"
+
 debug@^4.1.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
@@ -793,7 +801,7 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.3.0, fast-glob@^3.3.2:
+fast-glob@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -1126,6 +1134,11 @@ lru-cache@^6.0.0:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
   integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
 
+mdn-data@2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -1427,6 +1440,11 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
   name string-width-cjs
   version "4.2.3"