Merge pull request #1 from Samirat/samirat/show_source_on_click

Show source on click
Samirat · Feb 24, 2020 · a3c2ce7 · a3c2ce7
2 parents 8f9e202 + 75d782e
commit a3c2ce7
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -229,7 +229,7 @@
       },
       {
         "command": "test-explorer.run",
-        "title": "Run tests",
+        "title": "Run",
         "icon": {
           "dark": "./icons/start-dark.svg",
           "light": "./icons/start-light.svg"
@@ -261,7 +261,7 @@
       },
       {
         "command": "test-explorer.debug",
-        "title": "Debug this test",
+        "title": "Debug",
         "icon": {
           "dark": "./icons/debug-dark.svg",
           "light": "./icons/debug-light.svg"
@@ -292,6 +292,10 @@
         "command": "test-explorer.show-log",
         "title": "Show test log"
       },
+      {
+        "command": "test-explorer.on-click",
+        "title": "On test node click"
+      },
       {
         "command": "test-explorer.show-error",
         "title": "Show error message"
@@ -467,6 +471,31 @@
           "group": "1_reload",
           "when": "view == test-explorer && viewItem == error"
         },
+        {
+          "command": "test-explorer.run",
+          "group": "1_basic@1",
+          "when": "view == test-explorer && viewItem != error"
+        },
+        {
+          "command": "test-explorer.debug",
+          "group": "1_basic@2",
+          "when": "view == test-explorer && viewItem == debuggableTestWithSource"
+        },
+        {
+          "command": "test-explorer.debug",
+          "group": "1_basic@2",
+          "when": "view == test-explorer && viewItem == debuggableTest"
+        },
+        {
+          "command": "test-explorer.show-source",
+          "group": "1_basic@3",
+          "when": "view == test-explorer && viewItem == debuggableTestWithSource"
+        },
+        {
+          "command": "test-explorer.show-source",
+          "group": "1_basic@3",
+          "when": "view == test-explorer && viewItem == testWithSource"
+        },
         {
           "command": "test-explorer.enable-autorun",
           "group": "4_autorun@4",
@@ -546,6 +575,10 @@
           "command": "test-explorer.show-log",
           "when": "false"
         },
+        {
+          "command": "test-explorer.on-click",
+          "when": "false"
+        },
         {
           "command": "test-explorer.show-error",
           "when": "false"

diff --git a/src/main.ts b/src/main.ts
@@ -85,6 +85,8 @@ export function activate(context: vscode.ExtensionContext): ITestHub {
 
 	registerCommand('test-explorer.debug-this-test', () => debugTestAtCursor(testExplorer));
 
+	registerCommand('test-explorer.on-click', (nodes) => { testExplorer.showSource(nodes[0]); testExplorer.showLog(nodes); });
+
 	registerCommand('test-explorer.show-log', (nodes) => testExplorer.showLog(nodes));
 
 	registerCommand('test-explorer.show-error', (message) => testExplorer.showError(message));

diff --git a/src/tree/testNode.ts b/src/tree/testNode.ts
@@ -210,7 +210,7 @@ export class TestNode implements TreeNode {
 			(this.fileUri ? 'testWithSource' : 'test');
 		treeItem.command = {
 			title: '',
-			command: 'test-explorer.show-log',
+			command: 'test-explorer.on-click',
 			arguments: [ [ this ] ]
 		};
 		treeItem.description = this.description;