From d51c73088e11a42acb32309e3da5f32c112d3b1e Mon Sep 17 00:00:00 2001 From: RMacfarlane Date: Tue, 26 Jan 2021 20:11:11 -0800 Subject: [PATCH] Pull request description set incorrectly for "ask" Fixes #2420 --- src/github/createPRViewProvider.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/github/createPRViewProvider.ts b/src/github/createPRViewProvider.ts index dbc8247527..f131cd1ed9 100644 --- a/src/github/createPRViewProvider.ts +++ b/src/github/createPRViewProvider.ts @@ -140,7 +140,7 @@ export class CreatePullRequestViewProvider extends WebviewViewBase implements vs } } - private async getPullRequestTemplate(): Promise { + private async getPullRequestTemplate(): Promise { const templateUris = await this._folderRepositoryManager.getPullRequestTemplates(); if (templateUris[0]) { try { @@ -148,11 +148,11 @@ export class CreatePullRequestViewProvider extends WebviewViewBase implements vs return templateContent.toString(); } catch (e) { Logger.appendLine(`Reading pull request template failed: ${e}`); - return ''; + return undefined; } } - return ''; + return undefined; } private async getDescription(): Promise { @@ -161,7 +161,7 @@ export class CreatePullRequestViewProvider extends WebviewViewBase implements vs switch (method) { case PullRequestDescriptionSourceEnum.Template: - return this.getPullRequestTemplate(); + return await this.getPullRequestTemplate() || ''; case PullRequestDescriptionSourceEnum.Commit: return titleAndBodyFrom(await this._folderRepositoryManager.getTipCommitMessage(this.compareBranch.name!)).title;