Handle more test cases

Author: orta

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-typescript-dev",
   "displayName": "TSC Dev",
   "description": "An extension only for working in the TypeScript compiler codebase",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/orta/vscode-typescript-dev"

src/baselineToTest.test.ts

@@ -40,11 +40,19 @@ describe("edge cases", () => {
     const tests = [
       [
         "/tests/baselines/local/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js",
-        "/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts:85",
+        "/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts:xx",
+      ],
+      [
+        "/tests/baselines/local/tsbuild/moduleResolution/initial-build/type-reference-resolution-uses-correct-options-for-different-resolution-options-referenced-project.js",
+        "/src/testRunner/unittests/tsbuild/moduleResolution.ts:xx",
       ],
     ];
     for (const test of tests) {
-      expect(baseLineToTest(root + test[0])).toEqual(root + test[1]);
+      let res = baseLineToTest(root + test[0]);
+      if (res && res.includes(":")) {
+        res = res.split(":")[0] + ":xx";
+      }
+      expect(res).toEqual(root + test[1]);
     }
   });
 });

src/baselineToTest.ts

@@ -82,14 +82,18 @@ export const baselineToTester = (config: { tscRoot: string }) => {
       const filesInDirectory = fs.readdirSync(tsBuildTests);
 
       // Look through all the tsbuild test files, looking for a sub-scenario with the same name as the file
-      const scenario = `subscenario: "${name.replace(/-/g, " ")}"`.toLowerCase();
+      const scenarioQuote = `subscenario: "${name.replace(/-/g, " ")}"`.toLowerCase();
+      const scenarioBack = `subscenario: \`${name.replace(/-/g, " ")}\``.toLowerCase();
 
       for (const f of filesInDirectory) {
         const filepath = join(tsBuildTests, f);
         const content = fs.readFileSync(filepath, "utf8").toLowerCase();
 
-        if (content.includes(scenario)) {
-          const line = getLineForResultInString(scenario, content);
+        const gotQuote = content.includes(scenarioQuote);
+        const gotBacktick = content.includes(scenarioBack);
+        if (gotQuote || gotBacktick) {
+          const found = gotQuote ? scenarioQuote : scenarioBack;
+          const line = getLineForResultInString(found, content);
           const result = line !== -1 ? `${filepath}:${line}` : filepath;
           resultsCache.set(withoutExt, result);
           return result;

src/position.ts

@@ -1,4 +1,5 @@
 import * as vscode from "vscode";
+import { tryParseRangeExpression } from "./positionExpression";
 
 const goToPositionCommandName = "io.orta.typescript-dev.go-to-position";
 const togglePositionCommandName = "io.orta.typescript-dev.toggle-position";
@@ -58,100 +59,3 @@ function updatePosition(statusBarItem: vscode.StatusBarItem) {
     statusBarItem.text = "Pos " + lower + (upper === lower ? "" : `, ${upper}`);
   }
 }
-
-export function tryParseRangeExpression(expr: string): readonly [number, number | undefined] | undefined {
-  const [startExpr, endExpr] = expr.split(",");
-  const start = tryParsePositionExpression(startExpr);
-  if (start === undefined) return undefined;
-  return [start, endExpr === undefined ? endExpr : tryParsePositionExpression(endExpr)];
-}
-
-function tryParsePositionExpression(expr: string): number | undefined {
-  const enum State {
-    ParseOperator,
-    ParseOperand,
-  }
-
-  let state = State.ParseOperand as State;
-  let value: number | undefined;
-  let operator: "+" | "-" = "+";
-  let pos = 0;
-
-  while (pos < expr.length) {
-    skipSpace();
-    const current = expr[pos];
-    if (!current) break;
-
-    switch (state) {
-      case State.ParseOperand:
-        if (isNumeric(current)) {
-          value = operate(consumeInt());
-          state = State.ParseOperator;
-          continue;
-        } else if (current === "+") {
-          pos++;
-          continue;
-        } else if (current === "-") {
-          flipSign();
-          pos++;
-          continue;
-        } else {
-          return undefined;
-        }
-      case State.ParseOperator:
-        if (current === "+") {
-          operator = "+";
-          pos++;
-          state = State.ParseOperand;
-        } else if (current === "-") {
-          operator = "-";
-          pos++;
-          state = State.ParseOperand;
-        } else {
-          return undefined;
-        }
-    }
-  }
-  return value !== undefined && value >= 0 ? value : undefined;
-
-  function consumeInt(): number | undefined {
-    let start = pos;
-    while (pos < expr.length && isNumeric(expr[pos])) {
-      pos++;
-    }
-    const int = +expr.slice(start, pos);
-    if (Number.isSafeInteger(int)) {
-      return int;
-    }
-  }
-
-  function skipSpace() {
-    while (pos < expr.length && /\s/.test(expr[pos])) {
-      pos++;
-    }
-  }
-
-  function operate(operand: number | undefined) {
-    if (operand === undefined) return value;
-    if (value === undefined) value = 0;
-    switch (operator) {
-      case "+":
-        return value + operand;
-      case "-":
-        return value - operand;
-    }
-  }
-
-  function flipSign() {
-    if (operator === "+") {
-      operator = "-";
-    } else {
-      operator = "+";
-    }
-  }
-}
-
-function isNumeric(char: string) {
-  const code = char.charCodeAt(0);
-  return 48 <= code && code <= 57;
-}

src/positionExpression.ts

@@ -0,0 +1,96 @@
+export function tryParseRangeExpression(expr: string): readonly [number, number | undefined] | undefined {
+  const [startExpr, endExpr] = expr.split(",");
+  const start = tryParsePositionExpression(startExpr);
+  if (start === undefined) return undefined;
+  return [start, endExpr === undefined ? endExpr : tryParsePositionExpression(endExpr)];
+}
+
+function tryParsePositionExpression(expr: string): number | undefined {
+  const enum State {
+    ParseOperator,
+    ParseOperand,
+  }
+
+  let state = State.ParseOperand as State;
+  let value: number | undefined;
+  let operator: "+" | "-" = "+";
+  let pos = 0;
+
+  while (pos < expr.length) {
+    skipSpace();
+    const current = expr[pos];
+    if (!current) break;
+
+    switch (state) {
+      case State.ParseOperand:
+        if (isNumeric(current)) {
+          value = operate(consumeInt());
+          state = State.ParseOperator;
+          continue;
+        } else if (current === "+") {
+          pos++;
+          continue;
+        } else if (current === "-") {
+          flipSign();
+          pos++;
+          continue;
+        } else {
+          return undefined;
+        }
+      case State.ParseOperator:
+        if (current === "+") {
+          operator = "+";
+          pos++;
+          state = State.ParseOperand;
+        } else if (current === "-") {
+          operator = "-";
+          pos++;
+          state = State.ParseOperand;
+        } else {
+          return undefined;
+        }
+    }
+  }
+  return value !== undefined && value >= 0 ? value : undefined;
+
+  function consumeInt(): number | undefined {
+    let start = pos;
+    while (pos < expr.length && isNumeric(expr[pos])) {
+      pos++;
+    }
+    const int = +expr.slice(start, pos);
+    if (Number.isSafeInteger(int)) {
+      return int;
+    }
+  }
+
+  function skipSpace() {
+    while (pos < expr.length && /\s/.test(expr[pos])) {
+      pos++;
+    }
+  }
+
+  function operate(operand: number | undefined) {
+    if (operand === undefined) return value;
+    if (value === undefined) value = 0;
+    switch (operator) {
+      case "+":
+        return value + operand;
+      case "-":
+        return value - operand;
+    }
+  }
+
+  function flipSign() {
+    if (operator === "+") {
+      operator = "-";
+    } else {
+      operator = "+";
+    }
+  }
+}
+
+function isNumeric(char: string) {
+  const code = char.charCodeAt(0);
+  return 48 <= code && code <= 57;
+}

src/test/suite/position.test.ts

@@ -1,7 +1,7 @@
 import * as assert from "assert";
-import { tryParseRangeExpression } from "../../position";
+import { tryParseRangeExpression } from "../../positionExpression";
 
-suite("Go To Position", () => {
+describe("Go To Position", () => {
   test("parses simple expressions", () => {
     assert.deepStrictEqual(tryParseRangeExpression("3"), [3, undefined]);
     assert.deepStrictEqual(tryParseRangeExpression("422424"), [422424, undefined]);
@@ -33,4 +33,4 @@ suite("Go To Position", () => {
     assert.deepStrictEqual(tryParseRangeExpression("3,,,,4"), [3, undefined]);
     assert.deepStrictEqual(tryParseRangeExpression("3, 2"), [3, 2]);
   });
-});
+});

tsconfig.json

@@ -7,6 +7,7 @@
 			"es6"
 		],
 		"sourceMap": true,
+		"noEmit": true,
 		"rootDir": "src",
 		"strict": true   /* enable all strict type-checking options */
 		/* Additional Checks */