clean

Author: fi3ework

e2e/scripts/index.ts

@@ -11,7 +11,6 @@ class Cli {
   public stdout = '';
   public stderr = '';
   private stdoutListeners: Array<() => void> = [];
-  // biome-ignore lint/correctness/noUnusedPrivateClassMembers: will use it
   private stderrListeners: Array<() => void> = [];
 
   constructor(

e2e/test-coverage/fixtures/src/string.ts

@@ -21,5 +21,5 @@ export const countWords = (str: string): number => {
 
 export const truncate = (str: string, maxLength: number): string => {
   if (str.length <= maxLength) return str;
-  return str.slice(0, maxLength - 3) + '...';
+  return `${str.slice(0, maxLength - 3)}...`;
 };

packages/vscode/src/extension.ts

@@ -231,34 +231,6 @@ class Rstest {
       }
     };
 
-    // const runTestQueue = async () => {
-    //   for (const { test, data } of queue) {
-    //     run.appendOutput(`Running ${test.id}\r\n`);
-    //     if (run.token.isCancellationRequested) {
-    //       run.skipped(test);
-    //     } else {
-    //       run.started(test);
-    //       await data.run(test, run, this.api);
-    //     }
-
-    //     const lineNo = test.range!.start.line;
-    //     const fileCoverage = coveredLines.get(test.uri!.toString());
-    //     const lineInfo = fileCoverage?.[lineNo];
-    //     if (lineInfo) {
-    //       (lineInfo.executed as number)++;
-    //     }
-
-    //     run.appendOutput(`Completed ${test.id}\r\n`);
-    //   }
-
-    //   // TODO: support coverage in the future
-    //   // for (const [uri, statements] of coveredLines) {
-    //   //   run.addCoverage(new MarkdownFileCoverage(uri, statements));
-    //   // }
-
-    //   run.end();
-    // };
-
     discoverTests(request.include ?? gatherTestItems(this.ctrl.items))
       .then(() => run.end())
       .catch((error) => {
@@ -279,12 +251,6 @@ class Rstest {
 
     return;
   }
-
-  // async initialize(context: vscode.ExtensionContext) {
-  //   context.subscriptions.push(
-  //     ...startWatchingWorkspace(this.ctrl, this.fileChangedEmitter),
-  //   );
-  // }
 }
 
 function getOrCreateFile(controller: vscode.TestController, uri: vscode.Uri) {

packages/vscode/src/logger.ts

@@ -50,7 +50,9 @@ export class Logger implements vscode.Disposable {
   }
 
   public dispose() {
-    this.disposables.forEach((disposable) => disposable.dispose());
+    this.disposables.forEach((disposable) => {
+      disposable.dispose();
+    });
     this.channel.dispose();
   }
 

packages/vscode/src/master.ts

@@ -5,13 +5,12 @@ import getPort from 'get-port';
 import vscode from 'vscode';
 import type { WebSocket } from 'ws';
 import { WebSocketServer } from 'ws';
-
+import { logger } from './logger';
 import type {
   WorkerEvent,
   WorkerEventFinish,
   WorkerRunTestData,
 } from './types';
-import { logger } from './logger';
 
 export class RstestApi {
   public ws: WebSocket | null = null;
@@ -137,6 +136,10 @@ export class RstestApi {
     const workerPath = path.resolve(__dirname, 'worker.js');
     const port = await getPort();
     const wsAddress = `ws://localhost:${port}`;
+    logger.debug('Spawning worker process', {
+      workerPath,
+      wsAddress,
+    });
     const rstestProcess = spawn('node', [...execArgv, workerPath], {
       stdio: 'pipe',
       env: {
@@ -148,19 +151,20 @@ export class RstestApi {
 
     rstestProcess.stdout?.on('data', (d) => {
       const content = d.toString();
-      logger.debug('🟢 worker', content.trimEnd());
+      logger.debug('worker stdout', content.trimEnd());
     });
 
     rstestProcess.stderr?.on('data', (d) => {
       const content = d.toString();
-      logger.error('🔴 worker', content.trimEnd());
+      logger.error('worker stderr', content.trimEnd());
     });
 
     const server = createServer().listen(port).unref();
     const wss = new WebSocketServer({ server });
 
     wss.once('connection', (ws) => {
       this.ws = ws;
+      logger.debug('Worker connected', { wsAddress });
       const { cwd, rstestPath } = this.resolveRstestPath()[0];
       ws.send(
         JSON.stringify({
@@ -169,11 +173,21 @@ export class RstestApi {
           cwd,
         }),
       );
+      logger.debug('Sent init payload to worker', { cwd, rstestPath });
 
       ws.on('message', (_data) => {
         const _message = JSON.parse(_data.toString()) as WorkerEvent;
         if (_message.type === 'finish') {
           const message: WorkerEventFinish = _message;
+          logger.debug('Received worker completion event', {
+            id: message.id,
+            testResultCount: Array.isArray(message.testResults)
+              ? message.testResults.length
+              : undefined,
+            testFileResultCount: Array.isArray(message.testFileResults)
+              ? message.testFileResults.length
+              : undefined,
+          });
           // Check if we have a pending promise for this test ID
           const promiseObj = this.testPromises.get(message.id);
           if (promiseObj) {
@@ -186,7 +200,9 @@ export class RstestApi {
       });
     });
 
-    rstestProcess.on('exit', () => {});
+    rstestProcess.on('exit', (code, signal) => {
+      logger.debug('Worker process exited', { code, signal });
+    });
   }
 
   public async createRstestWorker() {}