Remove setting for always creating a draft PR

Github requires there be commits
Fixes microsoft#1705

Author: alexr00

package.json

@@ -322,11 +322,6 @@
               "query": "author:${user} state:open repo:${owner}/${repository} sort:updated-desc"
             }
           ]
-        },
-        "githubIssues.alwaysCreateDraftPR": {
-          "type": "boolean",
-          "default": false,
-          "description": "When true, and when you are working on an issue in a branch, immediately creates a draft PR when you start working on an issue."
         }
       }
     },

src/issues/currentIssue.ts

@@ -6,10 +6,9 @@
 import { PullRequestManager, PullRequestDefaults } from '../github/pullRequestManager';
 import { IssueModel } from '../github/issueModel';
 import * as vscode from 'vscode';
-import { ISSUES_CONFIGURATION, variableSubstitution, BRANCH_NAME_CONFIGURATION, getIssueNumberLabel, BRANCH_CONFIGURATION, pushAndCreatePR } from './util';
+import { ISSUES_CONFIGURATION, variableSubstitution, BRANCH_NAME_CONFIGURATION, getIssueNumberLabel, BRANCH_CONFIGURATION } from './util';
 import { Repository } from '../typings/git';
 import { StateManager, IssueState } from './stateManager';
-import { ReviewManager } from '../view/reviewManager';
 
 export class CurrentIssue {
 	private statusBarItem: vscode.StatusBarItem | undefined;
@@ -18,7 +17,7 @@ export class CurrentIssue {
 	private user: string | undefined;
 	private repo: Repository | undefined;
 	private repoDefaults: PullRequestDefaults | undefined;
-	constructor(private issueModel: IssueModel, private manager: PullRequestManager, private reviewManager: ReviewManager, private stateManager: StateManager, private shouldPromptForBranch?: boolean) {
+	constructor(private issueModel: IssueModel, private manager: PullRequestManager, private stateManager: StateManager, private shouldPromptForBranch?: boolean) {
 		this.setRepo();
 	}
 
@@ -54,7 +53,6 @@ export class CurrentIssue {
 		await this.createIssueBranch();
 		await this.setCommitMessageAndGitEvent();
 		this.setStatusBar();
-		await this.createDraftPR();
 	}
 
 	public dispose() {
@@ -155,20 +153,4 @@ export class CurrentIssue {
 		this.statusBarItem.command = 'issue.statusBar';
 		this.statusBarItem.show();
 	}
-
-	private async createDraftPR() {
-		const configuration = vscode.workspace.getConfiguration(ISSUES_CONFIGURATION).get('alwaysCreateDraftPR');
-		if (configuration && this._branchName) {
-			// It seems that there is no API to tell if a PR or an issue are linked to eachother. Instead of doing something like the following query, we'll just try to push the branch.
-			// const existingDrafts = (await this.manager.getPullRequests(PRType.Query, undefined, `repo:${this.issueModel.remote.owner}/${this.issueModel.remote.repositoryName} is:open linked:issue author:${await this.getUser()} draft:false`)).items;
-			const issueState = this.stateManager.getSavedIssueState(this.issueModel.number);
-			if (!issueState.hasDraftPR) {
-				const succeeded = await pushAndCreatePR(this.manager, this.reviewManager, true);
-				if (succeeded) {
-					issueState.hasDraftPR = true;
-					this.stateManager.setSavedIssueState(this.issueModel, issueState);
-				}
-			}
-		}
-	}
 }

src/issues/issueFeatureRegistrar.ts

@@ -29,7 +29,7 @@ export class IssueFeatureRegistrar implements vscode.Disposable {
 	private createIssueInfo: { document: vscode.TextDocument, newIssue: NewIssue | undefined, assignee: string | undefined, lineNumber: number | undefined, insertIndex: number | undefined } | undefined;
 
 	constructor(gitAPI: GitAPI, private manager: PullRequestManager, private reviewManager: ReviewManager, private context: vscode.ExtensionContext, private telemetry: ITelemetry) {
-		this._stateManager = new StateManager(gitAPI, this.manager, this.reviewManager, this.context);
+		this._stateManager = new StateManager(gitAPI, this.manager, this.context);
 	}
 
 	async initialize() {
@@ -305,13 +305,13 @@ export class IssueFeatureRegistrar implements vscode.Disposable {
 		}
 
 		if (issueModel) {
-			await this._stateManager.setCurrentIssue(new CurrentIssue(issueModel, this.manager, this.reviewManager, this._stateManager));
+			await this._stateManager.setCurrentIssue(new CurrentIssue(issueModel, this.manager, this._stateManager));
 		}
 	}
 
 	async startWorkingBranchPrompt(issueModel: any) {
 		if (issueModel instanceof IssueModel) {
-			await this._stateManager.setCurrentIssue(new CurrentIssue(issueModel, this.manager, this.reviewManager, this._stateManager, true));
+			await this._stateManager.setCurrentIssue(new CurrentIssue(issueModel, this.manager, this._stateManager, true));
 		}
 	}
 

src/issues/stateManager.ts

@@ -12,7 +12,6 @@ import { MilestoneModel } from '../github/milestoneModel';
 import { GitAPI } from '../typings/git';
 import { ISSUES_CONFIGURATION, BRANCH_CONFIGURATION, QUERIES_CONFIGURATION, DEFAULT_QUERY_CONFIGURATION, variableSubstitution } from './util';
 import { CurrentIssue } from './currentIssue';
-import { ReviewManager } from '../view/reviewManager';
 
 // TODO: make exclude from date words configurable
 const excludeFromDate: string[] = ['Recovery'];
@@ -61,7 +60,6 @@ export class StateManager {
 	constructor(
 		readonly gitAPI: GitAPI,
 		private manager: PullRequestManager,
-		private reviewManager: ReviewManager,
 		private context: vscode.ExtensionContext
 	) { }
 
@@ -199,7 +197,7 @@ export class StateManager {
 		if (restoreIssueNumber && this.currentIssue === undefined) {
 			for (let i = 0; i < issues.length; i++) {
 				if (issues[i].number === restoreIssueNumber) {
-					await this.setCurrentIssue(new CurrentIssue(issues[i], this.manager, this.reviewManager, this));
+					await this.setCurrentIssue(new CurrentIssue(issues[i], this.manager, this));
 					return;
 				}
 			}
@@ -233,7 +231,7 @@ export class StateManager {
 			if (branch === branchName) {
 				const issueModel = await this.manager.resolveIssue(state.branches[branch].owner, state.branches[branch].repositoryName, state.branches[branch].number);
 				if (issueModel) {
-					await this.setCurrentIssue(new CurrentIssue(issueModel, this.manager, this.reviewManager, this));
+					await this.setCurrentIssue(new CurrentIssue(issueModel, this.manager, this));
 				}
 				return;
 			}
@@ -301,17 +299,22 @@ export class StateManager {
 			return;
 		}
 		this.isSettingIssue = true;
-		if (this._currentIssue && (issue?.issue.number === this._currentIssue.issue.number)) {
-			return;
-		}
-		if (this._currentIssue) {
-			await this._currentIssue.stopWorking();
+		try {
+			if (this._currentIssue && (issue?.issue.number === this._currentIssue.issue.number)) {
+				return;
+			}
+			if (this._currentIssue) {
+				await this._currentIssue.stopWorking();
+			}
+			this.context.workspaceState.update(CURRENT_ISSUE_KEY, issue?.issue.number);
+			this._currentIssue = issue;
+			await this._currentIssue?.startWorking();
+			this._onDidChangeCurrentIssue.fire();
+		} catch (e) {
+			// Error has already been surfaced
+		} finally {
+			this.isSettingIssue = false;
 		}
-		this.context.workspaceState.update(CURRENT_ISSUE_KEY, issue?.issue.number);
-		this._currentIssue = issue;
-		await this._currentIssue?.startWorking();
-		this._onDidChangeCurrentIssue.fire();
-		this.isSettingIssue = false;
 	}
 
 	private getSavedState(): IssuesState {