Merge pull request orta#10 from orta/baselines

Showing baselines in a tree view, and clicking going to a diff

Author: orta

.gitignore

@@ -2,3 +2,4 @@ out
 node_modules
 .vscode-test/
 *.vsix
+*.log

.vscode/extensions.json

@@ -1,7 +1,5 @@
 {
 	// See http://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
-	"recommendations": [
-		"ms-vscode.vscode-typescript-tslint-plugin"
-	]
+	"recommendations": []
 }

.vscode/launch.json

@@ -16,7 +16,7 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"preLaunchTask": "npm: watch"
+			"preLaunchTask": "npm: build"
 		},
 		{
 			"name": "Extension Tests",

.vscodeignore

@@ -10,3 +10,5 @@ vsc-extension-quickstart.md
 **/*.ts
 fixtures/**
 screenshots/**
+node_modules
+fixtures

README.md

@@ -4,19 +4,25 @@
 
 ## Features
 
-It's not too smart yet, but:
+### Test File Stuff
 
-- It lets you choose a test file and re-run that file easily from anywhere in your editor.
-- It adds syntax highlighting for .types and .symbol files in a way which won't fill your screen with errors.
-- It adds a command and an optional status bar indicator for the selection’s zero-based position in the current file
+- Get the character index of your cursor in a fourslash test
+- Get auto-complete for twoslash compiler flags
 
-  - Symbol files ![](./screenshots/symbols.png)
+### Syntax Highlighting for Test Files
 
-  - Type Files ![](./screenshots/types.png)
+Adds syntax highlighting for .types and .symbol files in a way which won't fill your screen with errors.
+- Symbol files ![](./screenshots/symbols.png)
+- Type Files ![](./screenshots/types.png)
 
-### For more information
+### Changed Baselines Info
 
-- [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown)
-- [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/)
+![](./screenshots/baselines.png)
 
-**Enjoy!**
+Shows up to 100 changed baselines with:
+
+ - Jump to local/reference
+ - Show diff
+ - Jump to test (most of the time)
+
+Has a button for `gulp diff`.

jest.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  transform: {
+    "^.+\\.tsx?$": "esbuild-jest",
+  },
+  testEnvironment: "node",
+};

package.json

@@ -1,8 +1,8 @@
 {
   "name": "vscode-typescript-dev",
   "displayName": "TSC Dev",
-  "description": "An extension for working in the TypeScript codebase",
-  "version": "0.0.5",
+  "description": "An extension only for working in the TypeScript compiler codebase",
+  "version": "0.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/orta/vscode-typescript-dev"
@@ -17,8 +17,16 @@
   "activationEvents": [
     "workspaceContains:**/*.{ts,js,tsx,jsx}"
   ],
-  "main": "./out/extension.js",
+  "main": "./out/main.js",
   "contributes": {
+    "views": {
+      "explorer": [
+        {
+          "id": "tsDev.baselines",
+          "name": "Changed Baselines"
+        }
+      ]
+    },
     "languages": [
       {
         "id": "ts-symbols",
@@ -45,29 +53,47 @@
         "path": "./syntaxes/ts-types.tmLanguage.plist"
       }
     ],
-    "commands": [
-      {
-        "command": "io.orta.typescript-dev.declare-current-test-file",
-        "title": "Declare current test file",
-        "category": "TSC"
-      },
-      {
-        "command": "io.orta.typescript-dev.run-current-test-file",
-        "title": "Run tests",
-        "category": "TSC"
-      },
-      {
-        "command": "io.orta.typescript-dev.go-to-position",
-        "title": "Go to position",
-        "category": "TSC"
-      },
-      {
-        "command": "io.orta.typescript-dev.toggle-position",
-        "title": "Toggle position indicator in status bar",
-        "category": "TSC"
-      }
-    ],
     "menus": {
+      "view/title": [
+        {
+          "command": "tsDev.openDiffTool",
+          "when": "view == tsDev.baselines",
+          "group": "navigation"
+        }
+      ],
+      "view/item/context": [
+        {
+          "command": "tsDev.openTestShort",
+          "when": "view == tsDev.baselines && viewItem == edited",
+          "group": "inline"
+        },
+        {
+          "command": "tsDev.openReferenceShort",
+          "when": "view == tsDev.baselines && viewItem == edited",
+          "group": "inline"
+        },
+        {
+          "command": "tsDev.openDiffShort",
+          "when": "view == tsDev.baselines && viewItem == edited",
+          "group": "inline"
+        },
+        {
+          "command": "tsDev.openTestShort",
+          "when": "view == tsDev.baselines && viewItem == edited"
+        },
+        {
+          "command": "tsDev.openReferenceShort",
+          "when": "view == tsDev.baselines && viewItem == edited"
+        },
+        {
+          "command": "tsDev.openDiffShort",
+          "when": "view == tsDev.baselines && viewItem == edited"
+        },
+        {
+          "command": "tsDev.copyPath",
+          "when": "view == tsDev.baselines && viewItem == edited"
+        }
+      ],
       "commandPalette": [
         {
           "command": "io.orta.typescript-dev.declare-current-test-file",
@@ -86,24 +112,64 @@
           "when": "editorFocus"
         }
       ]
-    }
+    },
+    "commands": [
+      {
+        "command": "tsDev.openDiffTool",
+        "title": "Difftool",
+        "shortTitle": "Gulp Diff"
+      },
+      {
+        "command": "tsDev.openTestShort",
+        "title": "Test"
+      },
+      {
+        "command": "tsDev.openReferenceShort",
+        "title": "Ref"
+      },
+      {
+        "command": "tsDev.openDiffShort",
+        "title": "Diff"
+      },
+      {
+        "command": "tsDev.copyPath",
+        "title": "Copy Path"
+      },
+      {
+        "command": "io.orta.typescript-dev.go-to-position",
+        "title": "Go to position",
+        "category": "TSC"
+      },
+      {
+        "command": "io.orta.typescript-dev.toggle-position",
+        "title": "Toggle position indicator in status bar",
+        "category": "TSC"
+      }
+    ]
   },
   "scripts": {
-    "vscode:prepublish": "yarn run compile",
+    "vscode:prepublish": "yarn esbuild-base -- --minify",
+    "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
+    "build": "yarn esbuild-base --sourcemap",
+    "watch": "yarn esbuild-base --watch",
     "compile": "tsc -p ./",
-    "watch": "tsc -watch -p ./",
     "pretest": "yarn run compile",
-    "test": "node ./out/test/runTest.js"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
-    "@types/mocha": "^5.2.6",
     "@types/node": "^10.12.21",
     "@types/vscode": "^1.36.0",
     "glob": "^7.1.4",
-    "mocha": "^6.1.4",
     "tslint": "^5.12.1",
-    "typescript": "^4.0.0-dev.20200803",
-    "vscode-test": "^1.0.0-next.0"
+    "typescript": "^4.3.2",
+    "@types/jest": "^26.0.23",
+    "esbuild": "^0.12.5",
+    "esbuild-jest": "^0.5.0",
+    "jest": "^27.0.3"
+  },
+  "dependencies": {},
+  "prettier": {
+    "printWidth": 140
   }
 }

screenshots/baselines.png

@@ -0,0 +1,32 @@
+import * as vscode from "vscode";
+
+export const createBaselineFinder = (workspaceRoot: string) => {
+  const emitter = new vscode.EventEmitter<vscode.Uri[]>();
+
+  const run = () => {
+    const local = new vscode.RelativePattern(workspaceRoot, "tests/baselines/local/**/*");
+    vscode.workspace.findFiles(local.pattern, null, 100).then((r) => emitter.fire(r));
+  };
+
+  let interval: any | undefined = undefined;
+
+  const startTimer = () => {
+    if (interval) clearInterval(interval);
+    run();
+    // Every 30s
+    setInterval(run, 30 * 1000);
+  };
+
+  const stopTimer = () => {
+    if (interval) clearInterval(interval);
+  };
+
+  return {
+    resultsEmitter: emitter,
+    run,
+    startTimer,
+    stopTimer,
+  };
+};
+
+export type Runner = ReturnType<typeof createBaselineFinder>;

src/baselineFinder.ts

@@ -0,0 +1,50 @@
+import { join } from "path";
+import { baselineToTester } from "./baselineToTest";
+
+it("resolves to compiler baselines ", () => {
+  const root = join(__dirname, "..", "..", "typescript-compiler");
+  const baseLineToTest = baselineToTester({ tscRoot: root });
+
+  const result = root + "/tests/cases/compiler/acceptableAlias1.ts";
+  expect(baseLineToTest("/tests/baselines/local/acceptableAlias1.js")).toEqual(result);
+  expect(baseLineToTest("/tests/baselines/local/acceptableAlias1.symbols")).toEqual(result);
+  expect(baseLineToTest("/tests/baselines/local/acceptableAlias1.types")).toEqual(result);
+  expect(baseLineToTest("/tests/baselines/local/acceptableAlias1.errors.txt")).toEqual(result);
+});
+
+it("resolves to a subfolder ", () => {
+  const root = join(__dirname, "..", "..", "typescript-compiler");
+  const baseLineToTest = baselineToTester({ tscRoot: root });
+
+  const result = root + "/tests/cases/conformance/classes/propertyMemberDeclarations/abstractPropertyInitializer.ts";
+  expect(baseLineToTest("/tests/baselines/reference/abstractPropertyInitializer.js")).toEqual(result);
+  expect(baseLineToTest("/tests/baselines/reference/abstractPropertyInitializer.types")).toEqual(result);
+});
+
+it("handles multi-arg files ", () => {
+  const root = join(__dirname, "..", "..", "typescript-compiler");
+  const baseLineToTest = baselineToTester({ tscRoot: root });
+
+  const result = root + "/tests/cases/conformance/es2020/modules/exportAsNamespace1.ts";
+  expect(baseLineToTest("/tests/baselines/reference/exportAsNamespace1_amd.js")).toEqual(result);
+});
+
+// tests/baselines/reference/exportAndImport-es3-amd.js
+// -> tests/cases/conformance/es6/modules/exportAndImport-es3.ts
+
+describe("edge cases", () => {
+  it("tsbuild", () => {
+    const root = join(__dirname, "..", "..", "typescript-compiler");
+    const baseLineToTest = baselineToTester({ tscRoot: root });
+
+    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",
+      ],
+    ];
+    for (const test of tests) {
+      expect(baseLineToTest(root + test[0])).toEqual(root + test[1]);
+    }
+  });
+});