Merge branch 'develop' of https://github.com/easterapps/script-runner into develop

Author: easterapps

.github/workflows/release.yml

@@ -27,8 +27,6 @@ jobs:
     - run: npm install
     - run: npm ci
     - run: npm run compile 
-    - name: Get tag name
-      uses: olegtarasov/get-tag@v2
     - name: "Publish to Marketplace"
       uses: lannonbr/vsce-action@master
       with:
@@ -38,7 +36,7 @@ jobs:
     - name: "Package release"
       uses: lannonbr/vsce-action@master
       with:
-        args: "package $GIT_TAG_NAME"
+        args: "package"
       env:
         VSCE_TOKEN: ${{ secrets.vsce_token }}
     - name: Upload binaries to release

README.md

@@ -72,19 +72,21 @@ Sample command definition:
 }
 ```
 
-| Name                | Description                                                                         | Required | Type    |
-| ------------------- | ----------------------------------------------------------------------------------- | -------- | ------- |
-| `identifier`        | Identifier used to do key binding. Use alphanumerical and hyphen/underscore only.   | yes      | string  |
-| `description`       | Description of the command.                                                         | yes      | string  |
-| `command`           | Command to execute (with variables).                                                | yes      | string  |
-| `working_directory` | The working directory in which to execute the script.                               |          | string  |
-| `form`              | A list of questions to ask in order to obtain values for variables.                 |          | array   |
-| `variable`          | The variable name.                                                                  |          | string  |
-| `question`          | The question to ask the user.                                                       |          |
-| `password`          | Input is a password. Default is false.  Suggestion: use also show_in_console: false |          | boolean |
-| `default`           | The default value to put in the field. Only for text inputs.                        |          | string  |
-| `options`           | List of options (string)                                                            |          | array   |
-| `variables`         | List of variables (string)                                                          |          | array   |
+| Name                   | Description                                                                                            | Required | Type    |
+| ---------------------- | ------------------------------------------------------------------------------------------------------ | -------- | ------- |
+| `identifier`           | Identifier used to do key binding. Use alphanumerical and hyphen/underscore only.                      | yes      | string  |
+| `description`          | Description of the command.                                                                            | yes      | string  |
+| `command`              | Command to execute (with variables).                                                                   | yes      | string  |
+| `working_directory`    | The working directory in which to execute the script.                                                  |          | string  |
+| `form`                 | A list of questions to ask in order to obtain values for variables.                                    |          | array   |
+| `variable`             | The variable name.                                                                                     |          | string  |
+| `question`             | The question to ask the user.                                                                          |          | string  |
+| `password`             | Input is a password. Default is false.  Suggestion: use also show_in_console: false                    |          | boolean |
+| `default`              | The default value to put in the field. Only for text inputs.                                           |          | string  |
+| `defaultValuePath`     | Overrides the default value with the current file path. Empty if no file open. password option ignored |          | boolean |
+| `defaultValueFilename` | Overrides the default value with the current filename. Empty if no file open. password option ignored  |          | boolean |
+| `options`              | List of options (string)                                                                               |          | array   |
+| `variables`            | List of variables (string)                                                                             |          | array   |
 
 ## Full Configuration Sample
 
@@ -126,6 +128,19 @@ Sample command definition:
             "default": "Test 1"
           }
         ]
+      },
+      {
+        "identifier": "filepath1",
+        "description": "Filepath",
+        "command": "echo $path ",
+        "working_directory": "$tmp",
+        "form": [
+          {
+            "variable": "$path",
+            "question": "What is the path",
+            "defaultValuePath": true
+          }
+        ]
       }
     ],
     "variables": {

package-lock.json

@@ -3,7 +3,7 @@
 	"displayName": "Script Runner",
 	"description": "Run command line scripts (with parameters) directly from #VSCode with a configured form. Create and customize your own commands to simplify your way of working.",
 	"icon": "resources/logo/icon_128.gif",
-	"version": "0.5.0",
+	"version": "0.6.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/easterapps/vscode-script-runner"
@@ -120,6 +120,16 @@
 													"items": {
 														"type": "string"
 													}
+												},
+												"defaultValuePath": {
+													"type": "boolean",
+													"description": "The default value to put in the field. Only for text inputs.",
+													"default": false
+												},
+												"defaultValueFilename": {
+													"type": "boolean",
+													"description": "The default value to put in the field. Only for text inputs.",
+													"default": false
 												}
 											}
 										}

package.json

@@ -3,6 +3,8 @@ import { workspace, window, OutputChannel, TerminalOptions } from "vscode";
 import { IConfiguration, ICommandConfiguration, IFormConfiguration } from "./configuration";
 import { VariableManager } from "./variable_manager";
 import { Terminal } from "./terminal";
+var path = require("path");
+var vscode = require("vscode");
 
 export class CommandRunner {
 	private outputChannel: OutputChannel;
@@ -61,6 +63,14 @@ export class CommandRunner {
 		if (form && form.length > 0) {
 			let currentStep = 0;
 			const firstStep = form[currentStep];
+			let currentlyOpenTabfilePath = ""
+			let currentlyOpenTabfileName = ""
+			try {
+				currentlyOpenTabfilePath = vscode.window.activeTextEditor.document.fileName;
+				currentlyOpenTabfileName = path.basename(currentlyOpenTabfilePath);
+			} catch (error) {
+
+			}
 
 			const askQuestion = (step: IFormConfiguration) => {
 				if (step.options) {
@@ -69,13 +79,27 @@ export class CommandRunner {
 						ignoreFocusOut: true,
 					});
 				} else {
-
-					return window.showInputBox({
-						prompt: step.question,
-						value: step.default,
-						password: step.password,
-						ignoreFocusOut: true,
-					});
+					if (step.defaultValuePath) {
+						return window.showInputBox({
+							prompt: step.question,
+							value: currentlyOpenTabfilePath,
+							ignoreFocusOut: true,
+						});
+					} else {
+						if (step.defaultValueFilename) {
+							return window.showInputBox({
+								prompt: step.question,
+								value: currentlyOpenTabfileName,
+								ignoreFocusOut: true,
+							});
+						}
+						return window.showInputBox({
+							prompt: step.question,
+							value: step.default,
+							password: step.password,
+							ignoreFocusOut: true,
+						});
+					}
 				}
 			};
 

src/command_runner.ts

@@ -18,6 +18,8 @@ export interface IFormConfiguration {
 	default?: string;
 	password?: boolean;
 	options?: string[];
+	defaultValuePath?: boolean;
+	defaultValueFilename?: boolean;
 }
 
 export type IVariableConfiguration = { [id: string]: string };