Merge pull request #5 from microsoft/connor4312/fix-copilot-parse

fix: replace estraverse with eslint keys

Author: connor4312

package-lock.json

@@ -3,7 +3,7 @@
   "displayName": "Extension Test Runner",
   "description": "Runs tests in VS Code extensions",
   "publisher": "ms-vscode",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "icon": "icon.png",
   "engines": {
     "vscode": "^1.83.0"
@@ -102,7 +102,6 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.7",
-    "@types/estraverse": "^5.1.4",
     "@types/estree": "^1.0.2",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.2",
@@ -133,7 +132,7 @@
     "data-uri-to-buffer": "^6.0.1",
     "enhanced-resolve": "^5.15.0",
     "error-stack-parser": "^2.1.4",
-    "estraverse": "^5.3.0",
+    "eslint-visitor-keys": "^3.4.3",
     "minimatch": "^9.0.3",
     "split2": "^4.2.0",
     "stacktrace-parser": "^0.1.10"

package.json

@@ -4,7 +4,7 @@
 
 import type { Options } from 'acorn';
 import { parse } from 'acorn-loose';
-import { traverse } from 'estraverse';
+import * as evk from 'eslint-visitor-keys';
 import { Node } from 'estree';
 import { IParsedNode, ITestSymbols, NodeKind } from '.';
 
@@ -32,6 +32,30 @@ const getStringish = (nameArg: Node | undefined): string | undefined => {
   }
 };
 
+const traverse = (
+  node: Node,
+  visitor: { enter: (node: Node) => void; leave: (node: Node) => void },
+) => {
+  if (!node) {
+    return;
+  }
+  visitor.enter(node);
+
+  const keys = evk.KEYS[node.type];
+  if (keys) {
+    for (const key of keys) {
+      const child = (node as unknown as Record<string, Node | Node[]>)[key];
+      if (child instanceof Array) {
+        child.forEach((c) => traverse(c, visitor));
+      } else if (child) {
+        traverse(child, visitor);
+      }
+    }
+  }
+
+  visitor.leave(node);
+};
+
 export const extractWithAst = (text: string, symbols: ITestSymbols) => {
   const ast = parse(text, acornOptions);
 

src/extract/syntax.ts

@@ -2,7 +2,6 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import * as path from 'path';
 import * as vscode from 'vscode';
 
 export const enum ItemType {
@@ -46,7 +45,7 @@ export function* getContainingItemsForFile(
       const item = ctrl.createTestItem(
         filePath[i],
         filePath[i],
-        uri.with({ path: filePath.slice(0, i + 1).join(path.sep) }),
+        uri.with({ path: filePath.slice(0, i + 1).join('/') }),
       );
       item.tags = createOpts.tags;
       testMetadata.set(