WIP

Author: mizdra

packages/ts-plugin/src/index.ts

@@ -79,9 +79,7 @@ const plugin = createLanguageServicePlugin((ts, info) => {
             ts.server.toNormalizedPath(request.arguments.fileName),
             true,
           );
-          if (!project) {
-            return { response: { result: [] } };
-          }
+          if (!project) return {};
           const languageService = project.getLanguageService();
           const { fileName, position } = request.arguments;
           const result = languageService.findRenameLocations(fileName, position, false, false, {});
@@ -92,9 +90,7 @@ const plugin = createLanguageServicePlugin((ts, info) => {
             ts.server.toNormalizedPath(request.arguments.fileName),
             true,
           );
-          if (!project) {
-            return { response: { result: { canRename: false, localizedErrorMessage: '' } as const } };
-          }
+          if (!project) return {};
           const languageService = project.getLanguageService();
           const { fileName, position } = request.arguments;
           const result = languageService.getRenameInfo(fileName, position, {});
@@ -105,9 +101,9 @@ const plugin = createLanguageServicePlugin((ts, info) => {
             ts.server.toNormalizedPath(request.arguments.fileName),
             true,
           );
-          if (!project) return { response: { result: [] } };
+          if (!project) return {};
           const language = projectToLanguage.get(project);
-          if (!language) return { response: { result: [] } };
+          if (!language) return {};
           const { fileName } = request.arguments;
           const script = language.scripts.get(fileName);
           const links: DocumentLink[] = [];

packages/ts-plugin/src/type.ts

@@ -2,13 +2,10 @@ import type ts from 'typescript';
 
 export interface CSSModulesKitRenameRequest extends ts.server.protocol.Request {
   command: '_css-modules-kit:rename';
-  arguments: {
-    fileName: string;
-    position: number;
-  };
+  arguments: { fileName: string; position: number };
 }
 export interface CSSModulesKitRenameHandlerResponse extends ts.server.HandlerResponse {
-  response: { result: ReturnType<ts.LanguageService['findRenameLocations']> };
+  response?: { result: ReturnType<ts.LanguageService['findRenameLocations']> };
 }
 export interface CSSModulesKitRenameResponse extends ts.server.protocol.Response {
   command: '_css-modules-kit:rename';
@@ -17,13 +14,10 @@ export interface CSSModulesKitRenameResponse extends ts.server.protocol.Response
 
 export interface CSSModulesKitRenameInfoRequest extends ts.server.protocol.Request {
   command: '_css-modules-kit:renameInfo';
-  arguments: {
-    fileName: string;
-    position: number;
-  };
+  arguments: { fileName: string; position: number };
 }
 export interface CSSModulesKitRenameInfoHandlerResponse extends ts.server.HandlerResponse {
-  response: { result: ReturnType<ts.LanguageService['getRenameInfo']> };
+  response?: { result: ReturnType<ts.LanguageService['getRenameInfo']> };
 }
 export interface CSSModulesKitRenameInfoResponse extends ts.server.protocol.Response {
   command: '_css-modules-kit:renameInfo';
@@ -36,14 +30,10 @@ export interface DocumentLink {
 }
 export interface CSSModulesKitDocumentLinkRequest extends ts.server.protocol.Request {
   command: '_css-modules-kit:documentLink';
-  arguments: {
-    fileName: string;
-  };
+  arguments: { fileName: string };
 }
 export interface CSSModulesKitDocumentLinkHandlerResponse extends ts.server.HandlerResponse {
-  response: {
-    result: DocumentLink[];
-  };
+  response?: { result: DocumentLink[] };
 }
 export interface CSSModulesKitDocumentLinkResponse extends ts.server.protocol.Response {
   command: '_css-modules-kit:documentLink';

packages/vscode/src/index.ts

@@ -35,7 +35,7 @@ export async function activate(context: vscode.ExtensionContext) {
             } satisfies CSSModulesKitRenameRequest['arguments'],
           );
           // If the response does not contain any results, return undefined to fall back to standard CSS Language Server.
-          if (!res.success || !res.body.result || res.body.result.length === 0) return;
+          if (!res.success || !res.body || !res.body.result || res.body.result.length === 0) return;
           const edit = new vscode.WorkspaceEdit();
           for (const location of res.body.result) {
             // eslint-disable-next-line no-await-in-loop
@@ -56,7 +56,7 @@ export async function activate(context: vscode.ExtensionContext) {
             } satisfies CSSModulesKitRenameInfoRequest['arguments'],
           );
           // If the response does not contain any results, return undefined to fall back to standard CSS Language Server.
-          if (!res.success || !res.body.result.canRename) return;
+          if (!res.success || !res.body || !res.body.result.canRename) return;
           return new vscode.Range(
             document.positionAt(res.body.result.triggerSpan.start),
             document.positionAt(res.body.result.triggerSpan.start + res.body.result.triggerSpan.length),
@@ -76,7 +76,7 @@ export async function activate(context: vscode.ExtensionContext) {
             } satisfies CSSModulesKitDocumentLinkRequest['arguments'],
           );
           // If the response does not contain any results, return undefined to fall back to standard CSS Language Server.
-          if (!res.success || !res.body.result || res.body.result.length === 0) return null;
+          if (!res.success || !res.body || res.body.result.length === 0) return;
           return res.body.result.map((link) => {
             return new vscode.DocumentLink(
               new vscode.Range(