fix: remove getImportedCSSModule

Author: apple-yagi

packages/ts-plugin/src/language-service/feature/definition-and-bound-span.ts

@@ -1,5 +1,5 @@
-import type { CMKConfig, CSSModule, MatchesPattern, Resolver } from '@css-modules-kit/core';
-import { isCSSModuleFile, parseCSSModule } from '@css-modules-kit/core';
+import type { CSSModule, MatchesPattern, Resolver } from '@css-modules-kit/core';
+import { isCSSModuleFile } from '@css-modules-kit/core';
 import type { Language } from '@volar/language-core';
 import ts from 'typescript';
 import { CMK_DATA_KEY, isCSSModuleScript } from '../../language-plugin.js';
@@ -18,27 +18,6 @@ function toTextSpan(loc: { start: { offset: number }; end: { offset: number } })
   return { start: loc.start.offset, length: loc.end.offset - loc.start.offset };
 }
 
-function getImportedCSSModule(
-  resolver: Resolver,
-  matchesPattern: MatchesPattern,
-  config: CMKConfig,
-  getCSSModule: (path: string) => CSSModule | undefined,
-  from: string,
-  requestFileName: string,
-): CSSModule | undefined {
-  const resolved = resolver(from, { request: requestFileName });
-  if (!resolved || !matchesPattern(resolved) || !isCSSModuleFile(resolved)) return;
-  const existing = getCSSModule(resolved);
-  if (existing) return existing;
-  const code = ts.sys.readFile(resolved);
-  if (!code) return;
-  return parseCSSModule(code, {
-    fileName: resolved,
-    includeSyntaxError: false,
-    keyframes: config.keyframes,
-  });
-}
-
 function dedupeDefinitions(definitions: readonly ts.DefinitionInfo[]): ts.DefinitionInfo[] {
   const seen = new Set<string>();
   const result: ts.DefinitionInfo[] = [];
@@ -57,7 +36,6 @@ export function getDefinitionAndBoundSpan(
   languageService: ts.LanguageService,
   resolver: Resolver,
   matchesPattern: MatchesPattern,
-  config: CMKConfig,
   getCSSModule: (path: string) => CSSModule | undefined,
 ): ts.LanguageService['getDefinitionAndBoundSpan'] {
   return (...args) => {
@@ -74,14 +52,9 @@ export function getDefinitionAndBoundSpan(
           const isInValue = position >= value.loc.start.offset && position < value.loc.end.offset;
           if (!isInLocal && !isInValue) continue;
 
-          const importedModule = getImportedCSSModule(
-            resolver,
-            matchesPattern,
-            config,
-            getCSSModule,
-            importer.from,
-            cssModule.fileName,
-          );
+          const resolved = resolver(importer.from, { request: cssModule.fileName });
+          const importedModule =
+            resolved && matchesPattern(resolved) && isCSSModuleFile(resolved) ? getCSSModule(resolved) : undefined;
           if (!importedModule) continue;
 
           const targetName = value.name;
@@ -168,14 +141,9 @@ export function getDefinitionAndBoundSpan(
             if (!matchesTokenName) continue;
             const fallbackLoc = (matchesTokenName && tokenName === localName ? value.localLoc : value.loc) ?? value.loc;
             importedLocs.push(fallbackLoc as { start: { offset: number }; end: { offset: number } });
-            const importedModule = getImportedCSSModule(
-              resolver,
-              matchesPattern,
-              config,
-              getCSSModule,
-              importer.from,
-              cssModule.fileName,
-            );
+            const resolved = resolver(importer.from, { request: cssModule.fileName });
+            const importedModule =
+              resolved && matchesPattern(resolved) && isCSSModuleFile(resolved) ? getCSSModule(resolved) : undefined;
             if (importedModule) {
               const matches = importedModule.localTokens.filter((token) => token.name === value.name);
               if (matches.length > 0) {

packages/ts-plugin/src/language-service/proxy.ts

@@ -56,7 +56,6 @@ export function proxyLanguageService(
     languageService,
     resolver,
     matchesPattern,
-    config,
     getCSSModule,
   );