From 20ccfb070c899b0f49b616e4cf6899d98e1b7574 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 16 Jan 2020 16:41:03 +0100 Subject: [PATCH] scm: make commit template work again --- .../contrib/scm/browser/repositoryPane.ts | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/vs/workbench/contrib/scm/browser/repositoryPane.ts b/src/vs/workbench/contrib/scm/browser/repositoryPane.ts index 7e67f14a9c2..eafe52641af 100644 --- a/src/vs/workbench/contrib/scm/browser/repositoryPane.ts +++ b/src/vs/workbench/contrib/scm/browser/repositoryPane.ts @@ -606,7 +606,7 @@ export class RepositoryPane extends ViewPane { private menus: SCMMenus; private toggleViewModelModeAction: ToggleViewModeAction | undefined; protected contextKeyService: IContextKeyService; - // private commitTemplate = ''; + private commitTemplate = ''; constructor( readonly repository: ISCMRepository, @@ -984,20 +984,21 @@ export class RepositoryPane extends ViewPane { .filter(r => !!r && !isSCMResourceGroup(r))! as any; } - // TODO@joao private onDidChangeCommitTemplate(): void { - // if (typeof this.repository.provider.commitTemplate === 'undefined' || !this.repository.input.visible) { - // return; - // } + if (typeof this.repository.provider.commitTemplate === 'undefined' || !this.repository.input.visible) { + return; + } + + const oldCommitTemplate = this.commitTemplate; + this.commitTemplate = this.repository.provider.commitTemplate; - // const oldCommitTemplate = this.commitTemplate; - // this.commitTemplate = this.repository.provider.commitTemplate; + const value = this.inputModel.getValue(); - // if (this.inputBox.value && this.inputBox.value !== oldCommitTemplate) { - // return; - // } + if (value && value !== oldCommitTemplate) { + return; + } - // this.inputBox.value = this.commitTemplate; + this.inputModel.setValue(this.commitTemplate); } private updateInputBoxVisibility(): void { -- GitLab