Polish

Author: orta

README.md

@@ -6,16 +6,17 @@
 
 It's not too smart yet, but:
 
-- 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.
+### Syntax Highlighting for Test Files
 
-  - Symbol files ![](./screenshots/symbols.png)
+- Symbol files ![](./screenshots/symbols.png)
+- Type Files ![](./screenshots/types.png)
 
-  - Type Files ![](./screenshots/types.png)
+### Changed Baselines Info
 
-### For more information
+Shows up to 100 changed baselines with:
 
-- [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown)
-- [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/)
+ - Jump to local/reference
+ - Show diff
+ - Jump to test (most of the time)
 
-**Enjoy!**
+Has a button for `gulp diff`.

package.json

@@ -71,14 +71,35 @@
           "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"
         }
       ]
     },
     "commands": [
       {
         "command": "tsDev.openDiffTool",
         "title": "Difftool",
-        "shortTitle": "Difftool"
+        "shortTitle": "Gulp Diff"
       },
       {
         "command": "tsDev.openTestShort",
@@ -87,6 +108,14 @@
       {
         "command": "tsDev.openReferenceShort",
         "title": "Ref"
+      },
+      {
+        "command": "tsDev.openDiffShort",
+        "title": "Diff"
+      },
+      {
+        "command": "tsDev.copyPath",
+        "title": "Copy Path"
       }
     ]
   },

src/baselineToTest.test.ts

@@ -42,10 +42,6 @@ describe("edge cases", () => {
         "/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",
       ],
-      // [
-      //   "/tests/baselines/local/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js",
-      //   "/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts:85",
-      // ],
     ];
     for (const test of tests) {
       expect(baseLineToTest(root + test[0])).toEqual(root + test[1]);

src/baselineToTest.ts

@@ -1,5 +1,4 @@
 import { join, parse, sep } from "path";
-import * as os from "os";
 import * as fs from "fs";
 
 export const baselineToTester = (config: { tscRoot: string }) => {
@@ -75,18 +74,19 @@ export const baselineToTester = (config: { tscRoot: string }) => {
       }
     }
 
-    // Known pattern lookups like the tsbuild one
+    // Known pattern lookups:
 
     // With tsbuild files, the names are pretty auto-generated
     if (components[4] === "tsbuild") {
       const tsBuildTests = join(config.tscRoot, "src", "testRunner", "unittests", "tsbuild");
       const filesInDirectory = fs.readdirSync(tsBuildTests);
-      // Look through all the tsbuild test files
-      const scenario = `subscenario: "${name.replace(/-/g, " ")}",`;
-      console.log(scenario);
+
+      // 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();
+
       for (const f of filesInDirectory) {
         const filepath = join(tsBuildTests, f);
-        const content = fs.readFileSync(filepath, "utf8").toLowerCase().replace(/-/g, " ");
+        const content = fs.readFileSync(filepath, "utf8").toLowerCase();
 
         if (content.includes(scenario)) {
           const line = getLineForResultInString(scenario, content);

src/baselines.ts

@@ -66,11 +66,12 @@ export class BaselinesProvider implements vscode.TreeDataProvider<TreeNode> {
 
     treeItem.command = {
       command: "vscode.open",
-      title: `Open new file`,
+      title: `Open changed file`,
       arguments: [node.uri],
     };
 
-    treeItem.contextValue = "edited"
+    treeItem.contextValue = "edited";
+    treeItem.resourceUri = node.uri;
     return treeItem;
   }
 }

src/extension.ts

@@ -1,9 +1,10 @@
 import * as vscode from "vscode";
 import { BaselinesProvider, TreeNode } from "./baselines";
-import { showBaselineDiff } from "./showBaselineDiff";
 import { createBaselineFinder } from "./baselineFinder";
 import { baselineToTester } from "./baselineToTest";
 
+// https://code.visualstudio.com/api/references/commands
+
 export function activate(context: vscode.ExtensionContext) {
   const workspace = vscode.workspace.workspaceFolders![0];
   const watcher = createBaselineFinder(workspace.uri.fsPath);
@@ -12,25 +13,46 @@ export function activate(context: vscode.ExtensionContext) {
   const baselinesProvider = new BaselinesProvider(watcher.resultsEmitter);
   vscode.window.registerTreeDataProvider("tsDev.baselines", baselinesProvider);
 
-  let disposable = vscode.commands.registerCommand("io.orta.typescript-dev.show-baseline-diff", showBaselineDiff);
-  context.subscriptions.push(disposable);
+  const getTest = baselineToTester({ tscRoot: workspace.uri.fsPath });
 
-  let cmd1 = vscode.commands.registerCommand("tsDev.openReferenceShort", (item: TreeNode) => {
+  const diffTool = vscode.commands.registerCommand("tsDev.openDiffTool", () => {
+    require("child_process").exec("gulp diff");
+  });
+
+  const open = vscode.commands.registerCommand("tsDev.openReferenceShort", (item: TreeNode) => {
     vscode.commands.executeCommand("vscode.open", vscode.Uri.parse(item.uri.fsPath.replace("local", "reference")));
   });
 
-  const getTest = baselineToTester({ tscRoot: workspace.uri.fsPath });
+  const diff = vscode.commands.registerCommand("tsDev.openDiffShort", (item: TreeNode) => {
+    const local = vscode.Uri.parse(item.uri.fsPath);
+    const ref = vscode.Uri.parse(item.uri.fsPath.replace("local", "reference"));
+    vscode.commands.executeCommand("vscode.diff", local, ref, `Diff for ${item.display}`);
+  });
 
-  let cmd2 = vscode.commands.registerCommand("tsDev.openTestShort", (item: TreeNode) => {
+  const test = vscode.commands.registerCommand("tsDev.openTestShort", (item: TreeNode) => {
     const testFile = getTest(item.uri.fsPath);
     if (!testFile) {
-      vscode.window.showErrorMessage(`Could not find a test file for ${item.uri.fsPath}`);
+      vscode.window.showErrorMessage(`Could not find a test file for ${item.uri.fsPath}`, "Copy Local Path").then((res) => {
+        if (res && res.length) {
+          vscode.env.clipboard.writeText(item.uri.fsPath);
+          vscode.window.showInformationMessage("Copied");
+        }
+      });
     } else {
-      // const [path, number] = testFile.split(":")[0];
-      // const meta: vscode.TextDocumentShowOptions = ;
-      // const d = vscode.window.showTextDocument();
-      vscode.commands.executeCommand("vscode.open", "file:/" + vscode.Uri.parse(testFile));
+      const [path, line] = testFile.split(":");
+      const opts: vscode.TextDocumentShowOptions = line
+        ? {
+            selection: new vscode.Range(new vscode.Position(Number(line), 0), new vscode.Position(Number(line), 0)),
+          }
+        : {};
+      vscode.commands.executeCommand("vscode.open", vscode.Uri.parse(path), opts);
     }
   });
-  context.subscriptions.push(cmd2);
+
+  const copy = vscode.commands.registerCommand("tsDev.copyPath", (item: TreeNode) => {
+    vscode.env.clipboard.writeText(item.uri.fsPath);
+    vscode.window.showInformationMessage("Copied");
+  });
+
+  context.subscriptions.push(open, test, diff, copy, diffTool);
 }