Merge pull request #11 from Lokesh-Garg-22/dev

Dev

Author: Lokesh-Garg-22

.github/workflows/tests.yml

@@ -0,0 +1,66 @@
+name: CI / Build & Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest # Or windows-latest, macos-latest
+
+    strategy:
+      fail-fast: false # Don't cancel other jobs if one fails
+      matrix:
+        vscode_version:
+          - 1.92.0
+          - 1.93.0
+          - 1.94.0
+          - 1.95.0
+          - 1.96.0
+          - 1.97.0
+          - 1.98.0
+          - 1.99.0
+          - 1.100.0
+          - 1.101.0
+          - 1.102.0
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20" # Or your project's Node.js version
+
+      - name: Install dependencies
+        run: npm ci
+
+      # Step to install xvfb
+      - name: Install xvfb
+        run: sudo apt-get update && sudo apt-get install -y xvfb
+
+      - name: Compile Extension
+        run: npm run pretest
+
+      # Define your test workspace folder relative to the repository root
+      # You can have multiple test workspaces and dynamically select them if needed
+      - name: Set test workspace folder
+        id: test_workspace
+        run: echo "WORKSPACE_PATH=." >> $GITHUB_OUTPUT # Adjust this path to your actual test workspace folder
+
+      - name: Run VS Code Extension Tests
+        run: |
+          xvfb-run -a \
+          ./node_modules/.bin/vscode-test \
+            --vscode-version ${{ matrix.vscode_version }} \
+            --extensionDevelopmentPath ./ \
+            --extensionTestsPath dist/test/extension.test.js \
+            --launch-args "${{ steps.test_workspace.outputs.WORKSPACE_PATH }}" \
+            --launch-args "--disable-extensions" \
+            --launch-args "--skip-getting-started"
+        env:
+          CI: true # Indicate that we are in a CI environment

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.3] – 2025-07-30
+
+### Fixed
+
+- Inefficiencies in `isPositionInComment` and `isPositionInString` that caused
+  slow parsing in large files.
+
 ## [0.1.2] – 2025-07-18
 
 ### Added
@@ -90,6 +97,7 @@ All notable changes to this project will be documented in this file.
 - Go-to-Definition support for `styles.className` references.
 - Autocompletion of class names in JavaScript and TypeScript.
 
+[0.1.3]: https://github.com/Lokesh-Garg-22/CSS-Modules-IntelliSense/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/Lokesh-Garg-22/CSS-Modules-IntelliSense/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/Lokesh-Garg-22/CSS-Modules-IntelliSense/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/Lokesh-Garg-22/CSS-Modules-IntelliSense/compare/v0.0.5...v0.1.0

package-lock.json

@@ -2,7 +2,7 @@
   "name": "css-scss-modules-intellisense",
   "displayName": "CSS/SCSS Modules IntelliSense",
   "description": "Linter and tooling for CSS Modules with support for SCSS, LESS, Go-to-Definition, and Rename in JS/TS files.",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "publisher": "lokesh-garg",
   "repository": {
     "type": "git",

package.json

@@ -19,13 +19,6 @@ export default class CompletionItemProvider
     document: vscode.TextDocument,
     position: vscode.Position
   ) => {
-    if (
-      (await isPositionInString(document, position)) ||
-      (await isPositionInComment(document, position))
-    ) {
-      return;
-    }
-
     const importModulePath = getImportModulePath(document, position);
     if (!importModulePath) {
       return;
@@ -37,6 +30,14 @@ export default class CompletionItemProvider
     if (!classNames) {
       return;
     }
+
+    if (
+      (await isPositionInString(document, position)) ||
+      (await isPositionInComment(document, position))
+    ) {
+      return;
+    }
+
     return new vscode.CompletionList(
       classNames.map((name) => {
         const item = new vscode.CompletionItem(

src/providers/completionProvider.ts

@@ -47,14 +47,6 @@ export class ScriptDefinitionProvider implements vscode.DefinitionProvider {
     document: vscode.TextDocument,
     position: vscode.Position
   ): Promise<vscode.LocationLink[] | undefined> => {
-    // Skip strings and comments early
-    if (
-      (await isPositionInString(document, position)) ||
-      (await isPositionInComment(document, position))
-    ) {
-      return;
-    }
-
     const wordRange = document.getWordRangeAtPosition(position, /\w+/);
     if (!wordRange) {
       return;
@@ -71,6 +63,14 @@ export class ScriptDefinitionProvider implements vscode.DefinitionProvider {
       return;
     }
 
+    // Skip strings and comments
+    if (
+      (await isPositionInString(document, position)) ||
+      (await isPositionInComment(document, position))
+    ) {
+      return;
+    }
+
     const cssDoc = await vscode.workspace.openTextDocument(cssPath);
     const locations: vscode.LocationLink[] = [];
 
@@ -90,14 +90,6 @@ export class ModuleDefinitionProvider implements vscode.DefinitionProvider {
     cssDoc: vscode.TextDocument,
     position: vscode.Position
   ): Promise<vscode.LocationLink[] | undefined> => {
-    if (
-      (await isPositionInString(cssDoc, position)) ||
-      (await isPositionInComment(cssDoc, position)) ||
-      !isDocumentModule(cssDoc)
-    ) {
-      return;
-    }
-
     const wordRange = cssDoc.getWordRangeAtPosition(position, /\.[\w-]+/);
     if (!wordRange) {
       return;
@@ -109,6 +101,14 @@ export class ModuleDefinitionProvider implements vscode.DefinitionProvider {
       return;
     }
 
+    if (
+      (await isPositionInString(cssDoc, position)) ||
+      (await isPositionInComment(cssDoc, position)) ||
+      !isDocumentModule(cssDoc)
+    ) {
+      return;
+    }
+
     const locations: vscode.LocationLink[] = [];
 
     // Add definitions in the current CSS module

src/providers/definitionProvider.ts

@@ -36,7 +36,7 @@ const provideRenameEdits = async ({
     );
     const matches = await getAllImportModulePaths(doc);
 
-    matches.forEach(async (match) => {
+    for (const match of matches) {
       const varName = match[1];
       const resolvedPath = resolveImportPathWithAliases(doc, match[2]);
 
@@ -53,7 +53,7 @@ const provideRenameEdits = async ({
       classNamePositions.forEach((classNamePosition) => {
         edit.replace(doc.uri, classNamePosition.range, newName);
       });
-    });
+    }
   }
 
   // Update the Css Module File
@@ -80,13 +80,6 @@ export class ScriptsRenameProvider implements vscode.RenameProvider {
     position: vscode.Position,
     newName: string
   ) => {
-    if (
-      (await isPositionInString(document, position)) ||
-      (await isPositionInComment(document, position))
-    ) {
-      return;
-    }
-
     const wordRange = document.getWordRangeAtPosition(position, /\w+/);
     if (!wordRange) {
       return;
@@ -106,6 +99,13 @@ export class ScriptsRenameProvider implements vscode.RenameProvider {
       return;
     }
 
+    if (
+      (await isPositionInString(document, position)) ||
+      (await isPositionInComment(document, position))
+    ) {
+      return;
+    }
+
     const cssDoc = await vscode.workspace.openTextDocument(cssFilePath);
 
     return await provideRenameEdits({
@@ -119,13 +119,6 @@ export class ScriptsRenameProvider implements vscode.RenameProvider {
     document: vscode.TextDocument,
     position: vscode.Position
   ) => {
-    if (
-      (await isPositionInString(document, position)) ||
-      (await isPositionInComment(document, position))
-    ) {
-      return;
-    }
-
     const wordRange = document.getWordRangeAtPosition(position, /\w+/);
     if (!wordRange) {
       return;
@@ -137,6 +130,13 @@ export class ScriptsRenameProvider implements vscode.RenameProvider {
       return;
     }
 
+    if (
+      (await isPositionInString(document, position)) ||
+      (await isPositionInComment(document, position))
+    ) {
+      return;
+    }
+
     return (await ClassNameCache.hasClassNameFromImportPath(
       className,
       getWorkspaceRelativeImportPath(document, importModulePath)
@@ -152,14 +152,6 @@ export class ModulesRenameProvider implements vscode.RenameProvider {
     position: vscode.Position,
     newName: string
   ) => {
-    if (
-      (await isPositionInString(document, position)) ||
-      (await isPositionInComment(document, position)) ||
-      !isDocumentModule(document)
-    ) {
-      return;
-    }
-
     const wordRange = document.getWordRangeAtPosition(
       position,
       /\.[a-zA-Z0-9_-]+/
@@ -168,6 +160,14 @@ export class ModulesRenameProvider implements vscode.RenameProvider {
       return;
     }
 
+    if (
+      (await isPositionInString(document, position)) ||
+      (await isPositionInComment(document, position)) ||
+      !isDocumentModule(document)
+    ) {
+      return;
+    }
+
     const oldClassName = document.getText(wordRange).replace(/^\./, "");
 
     return await provideRenameEdits({ document, oldClassName, newName });

src/providers/renameProvider.ts

@@ -9,7 +9,8 @@ suite("Extension Tests", () => {
     assert.ok(ext?.isActive);
   });
 
-  test("Run Command Reset Cache", async () => {
+  test("Run Command Reset Cache", async function () {
+    this.timeout(10000);
     const result = await vscode.commands.executeCommand(
       "css-scss-modules-intellisense.resetCache"
     );

src/test/extension.test.ts

@@ -80,7 +80,7 @@ suite("Rename Provider Tests", function () {
     for (const expectedPath of expectedPaths) {
       assert.ok(
         seenPaths.has(expectedPath),
-        `Expected rename to edit file: ${expectedPath}`
+        `Expected rename provider to edit file: ${expectedPath}`
       );
     }
   });
@@ -145,7 +145,7 @@ suite("Rename Provider Tests", function () {
     for (const expectedPath of expectedPaths) {
       assert.ok(
         seenPaths.has(expectedPath),
-        `Expected rename to edit file: ${expectedPath}`
+        `Expected rename provider to edit file: ${expectedPath}`
       );
     }
   });

src/test/providers/renameProvider.test.ts

@@ -27,18 +27,18 @@ const getAllClassNames = async (
     const className = match[1];
     const pos = document.positionAt(match.index);
 
-    // Skip matches inside strings or comments
+    // Reject nested usage like temp.styles.class
     if (
-      (await isPositionInString(document, pos)) ||
-      (await isPositionInComment(document, pos))
+      pos.character > 0 &&
+      document.lineAt(pos.line).text[pos.character - 1].match(/[.\w]$/)
     ) {
       continue;
     }
 
-    // Reject nested usage like temp.styles.class
+    // Skip matches inside strings or comments
     if (
-      pos.character > 0 &&
-      document.lineAt(pos.line).text[pos.character - 1].match(/[.\w]$/)
+      (await isPositionInString(document, pos)) ||
+      (await isPositionInComment(document, pos))
     ) {
       continue;
     }