From 76a53c51cb245fb8149c6e2d1d07ffe97b71423a Mon Sep 17 00:00:00 2001 From: serhioromano Date: Sun, 12 Jun 2022 21:28:14 +0600 Subject: [PATCH 1/4] add keywords --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index da43b8b..aa1b3e5 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,12 @@ "hot fix", "support", "version", + "version manager", "versions", - "versioning" + "versioning", + "DevOps", + "CI/CD", + "SCM" ], "categories": [ "Other", From 82e1589cbe4d793cb3139519f2ea416b4399e0ae Mon Sep 17 00:00:00 2001 From: serhioromano Date: Mon, 4 Jul 2022 18:38:22 +0600 Subject: [PATCH 2/4] stat bar indicator + sponsor link --- package.json | 11 +++++++---- src/extension.ts | 4 +++- src/lib/Util.ts | 7 ++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index aa1b3e5..a84bffd 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,9 @@ "engines": { "vscode": "^1.64.0" }, + "sponsor": { + "url": "https://www.paypal.com/donate/?hosted_button_id=UTU4EMPLLLX54" + }, "publisher": "Serhioromano", "author": "Sergey Romanov", "preview": true, @@ -739,16 +742,16 @@ ] } }, - "main": "./out/main.js", - "_main": "./out/extension.js", + "_main": "./out/main.js", + "main": "./out/extension.js", "scripts": { - "vscode:prepublish": "npm run esbuild-base -- --minify", + "_vscode:prepublish": "npm run esbuild-base -- --minify", "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node", "esbuild": "npm run esbuild-base -- --sourcemap", "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch", "watch": "tsc -watch -p ./", "publish": "vsce package && gh release create $(node -pe \"require('./package.json')['version']\") --generate-notes \"./vscode-gitflow-$(node -pe \"require('./package.json')['version']\").vsix\" && vsce publish", - "_vscode:prepublish": "npm run compile", + "vscode:prepublish": "npm run compile", "compile": "tsc -p ./", "pretest": "npm run compile && npm run lint", "lint": "eslint src --ext ts", diff --git a/src/extension.ts b/src/extension.ts index b900777..eb0acd7 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -15,7 +15,6 @@ export function activate(context: vscode.ExtensionContext) { logger.log("Extension activate", "activate"); logger.log(rootPath, "Root"); - const util = new Util(rootPath, logger); let statBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 10); statBar.command = "gitflow.quickPick"; @@ -23,6 +22,9 @@ export function activate(context: vscode.ExtensionContext) { statBar.tooltip = "Show Git Flow Quick Pick menu"; statBar.show(); context.subscriptions.push(statBar); + + + const util = new Util(rootPath, logger, statBar); const viewBranches = new TreeViewBranches(util); const a = vscode.window.createTreeView("gitflowExplorer", { diff --git a/src/lib/Util.ts b/src/lib/Util.ts index 25b3c1a..cc727ee 100644 --- a/src/lib/Util.ts +++ b/src/lib/Util.ts @@ -14,7 +14,7 @@ type CmdResult = { export class Util { public path: string = ''; public flowPath: string = ''; - constructor(public workspaceRoot: string, private logger: Logger) { + constructor(public workspaceRoot: string, private logger: Logger, public sb: vscode.StatusBarItem) { this.path = vscode.workspace.getConfiguration('git').get('path') || ""; if (this.path.trim().length === 0) { const gitExtension = vscode.extensions.getExtension("vscode.git")!.exports; @@ -61,11 +61,14 @@ export class Util { if (this.path.trim().length === 0) { return ""; } + this.sb.text = "$(sync~spin) Git Flow in progress..."; try { let out = execSync(cmd, { cwd: this.workspaceRoot }).toString(); this.logger.log(out, cmd); + this.sb.text = "$(list-flat) Git Flow"; return out; } catch (e) { + this.sb.text = "$(list-flat) Git Flow"; this.logger.log(`ERROR: ${e}`, cmd, LogLevels.error); vscode.window.showErrorMessage(`Error executing: ${cmd} : ${e}`); return "" + e; @@ -77,9 +80,11 @@ export class Util { if (this.path.trim().length === 0) { return; } + this.sb.text = "$(sync~spin) Git Flow in progress..."; exec( cmd, { cwd: this.workspaceRoot, }, (err, stdout, stderr) => { + this.sb.text = "$(list-flat) Git Flow"; if (err) { vscode.window.showErrorMessage(`Error executing: ${cmd} : ${err}`); this.logger.log(`${err} ${stderr}`, cmd, LogLevels.error); From 44060134d3cb7639c89994d8ba876ff779c75cdf Mon Sep 17 00:00:00 2001 From: serhioromano Date: Thu, 11 Aug 2022 10:37:17 +0600 Subject: [PATCH 3/4] fix speed --- .vscode/settings.json | 3 ++- package.json | 8 ++++---- src/lib/Util.ts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a6b8485..653dd26 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -49,5 +49,6 @@ "titleBar.activeForeground": "#e7e7e7", "titleBar.inactiveBackground": "#1857a499", "titleBar.inactiveForeground": "#e7e7e799" - } + }, + "editor.experimental.stickyScroll.enabled": true } diff --git a/package.json b/package.json index a84bffd..8a9ee88 100644 --- a/package.json +++ b/package.json @@ -742,16 +742,16 @@ ] } }, - "_main": "./out/main.js", - "main": "./out/extension.js", + "main": "./out/main.js", + "_main": "./out/extension.js", "scripts": { - "_vscode:prepublish": "npm run esbuild-base -- --minify", + "vscode:prepublish": "npm run esbuild-base -- --minify", "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node", "esbuild": "npm run esbuild-base -- --sourcemap", "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch", "watch": "tsc -watch -p ./", "publish": "vsce package && gh release create $(node -pe \"require('./package.json')['version']\") --generate-notes \"./vscode-gitflow-$(node -pe \"require('./package.json')['version']\").vsix\" && vsce publish", - "vscode:prepublish": "npm run compile", + "_vscode:prepublish": "npm run compile", "compile": "tsc -p ./", "pretest": "npm run compile && npm run lint", "lint": "eslint src --ext ts", diff --git a/src/lib/Util.ts b/src/lib/Util.ts index cc727ee..b25f875 100644 --- a/src/lib/Util.ts +++ b/src/lib/Util.ts @@ -118,7 +118,7 @@ export class Util { return false; } - if (this.execSync(`${this.flowPath} log`).toLowerCase().search("is not a git command") !== -1) { + if (this.execSync(`${this.flowPath} status`).toLowerCase().search("is not a git command") !== -1) { let installLink = "Install"; vscode.window .showWarningMessage("To use Git Flow extension please install Git flow (AVH).", installLink) From b84a143950f82feae65668b8b35cbc3546810c50 Mon Sep 17 00:00:00 2001 From: serhioromano Date: Thu, 11 Aug 2022 10:37:27 +0600 Subject: [PATCH 4/4] Version bump to 1.3.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a9ee88..03339a9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-gitflow", "displayName": "Git Flow", "description": "Git-Flow support for VS Code", - "version": "1.3.11", + "version": "1.3.12", "engines": { "vscode": "^1.64.0" },