Remove dependency to tss.server.Project for CEM cache

Author: Matsuuu

lib/custom-elements-languageserver-core/src/cem/cem-cache.ts

@@ -80,27 +80,27 @@ export class CEMCollection {
 
 const CEM_COLLECTION_CACHE = new Map<string, CEMCollection>();
 
-export function getCEMData(project: tss.server.Project, projectBasePath: string): CEMCollection {
-    const existingCollection = getCEMFromCache(project);
+export function getCEMData(projectBasePath: string): CEMCollection {
+    const existingCollection = getCEMFromCache(projectBasePath);
     if (existingCollection) {
         return existingCollection;
     }
 
     const cemCollection = new CEMCollection(projectBasePath);
-    setToCEMCache(project, cemCollection);
+    setToCEMCache(projectBasePath, cemCollection);
     return cemCollection;
 }
 
-function getCEMFromCache(project: tss.server.Project) {
-    return CEM_COLLECTION_CACHE.get(project.getCurrentDirectory());
+function getCEMFromCache(projectBasePath: string) {
+    return CEM_COLLECTION_CACHE.get(projectBasePath);
 }
 
 function getCEMFromCacheByPath(projectDirectory: string) {
     return CEM_COLLECTION_CACHE.get(projectDirectory);
 }
 
-function setToCEMCache(project: tss.server.Project, cemCollection: CEMCollection) {
-    CEM_COLLECTION_CACHE.set(project.getCurrentDirectory(), cemCollection);
+function setToCEMCache(projectBasePath: string, cemCollection: CEMCollection) {
+    CEM_COLLECTION_CACHE.set(projectBasePath, cemCollection);
 }
 
 export function refreshCEMData(projectBasePath: string) {

lib/custom-elements-languageserver-core/src/handlers/completion.ts

@@ -12,7 +12,7 @@ export function getCompletionEntries(request: CustomElementsLanguageServiceReque
 
     const actionContext = resolveActionContext(htmlLanguageService, document, position);
 
-    const cemCollection = getCEMData(project, projectBasePath);
+    const cemCollection = getCEMData(projectBasePath);
     let cemCompletions: tss.CompletionEntry[] = [];
 
     if (!cemCollection) {

lib/custom-elements-languageserver-core/src/handlers/diagnostics/import-diagnostics.ts

@@ -31,7 +31,7 @@ export function getImportDiagnostics(request: CustomElementsLanguageServiceReque
     // Might lead to some false negatives.
     const sourceFileNames = associatedFiles;
 
-    const cemCollection = getCEMData(project, projectBasePath);
+    const cemCollection = getCEMData(projectBasePath);
     if (!cemCollection.hasData()) {
         return [];
     }

lib/custom-elements-languageserver-core/src/handlers/go-to-definition.ts

@@ -28,7 +28,7 @@ export function getGoToDefinitionEntries(request: CustomElementsLanguageServiceR
     const { document, position, htmlLanguageService, projectBasePath, project } = request;
 
     const actionContext = resolveActionContext(htmlLanguageService, document, position);
-    const cemCollection = getCEMData(project, projectBasePath);
+    const cemCollection = getCEMData(projectBasePath);
 
     if (!cemCollection.hasData()) {
         return [...definitionInfos];

lib/custom-elements-languageserver-core/src/handlers/quickinfo.ts

@@ -14,7 +14,7 @@ import { CustomElementsLanguageServiceRequest } from "../request.js";
 export function getQuickInfo(request: CustomElementsLanguageServiceRequest): tss.QuickInfo | undefined {
     const { document, position, htmlLanguageService, projectBasePath, project } = request;
     const actionContext = resolveActionContext(htmlLanguageService, document, position);
-    const cemCollection = getCEMData(project, projectBasePath);
+    const cemCollection = getCEMData(projectBasePath);
 
     if (!cemCollection.hasData()) {
         return undefined;

lib/server/src/handlers/references.ts

@@ -23,7 +23,7 @@ export function getReferencesAtPosition(referenceParams: ReferenceParams) {
         return [];
     }
 
-    const cemCollection = getCEMData(project, basePath);
+    const cemCollection = getCEMData(basePath);
     if (!cemCollection.hasData()) {
         return [];
     }

usage-testing-project/src/both.jsx

@@ -1,7 +1,6 @@
 import { createSignal, onCleanup } from "solid-js";
 import { render } from "solid-js/web";
 import "@shoelace-style/shoelace/dist/components/card/card.js";
-import "@shoelace-style/shoelace/dist/components/button/button.d.js";
 
 const template = html`
   <example-project></example-project>