Going back to VS Code after a PR is merged and the branch is deleted shows an error toast (#6686)

Fixes #6681

Author: alexr00

src/github/activityBarViewProvider.ts

@@ -325,7 +325,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				});
 			})
 			.catch(e => {
-				vscode.window.showErrorMessage(formatError(e));
+				vscode.window.showErrorMessage(`Error updating active pull request view: ${formatError(e)}`);
 			});
 	}
 

src/github/githubRepository.ts

@@ -263,7 +263,8 @@ export class GitHubRepository extends Disposable {
 		try {
 			rsp = await gql.query<T>(query);
 		} catch (e) {
-			Logger.error(`Error querying GraphQL API: ${e.message}${e.graphQLErrors ? `. ${(e.graphQLErrors as GraphQLError[]).map(error => error.extensions?.code).join(',')}` : ''}`, this.id);
+			const logInfo = (query.query.definitions[0] as { name: { value: string } | undefined }).name?.value;
+			Logger.error(`Error querying GraphQL API (${logInfo}): ${e.message}${e.graphQLErrors ? `. ${(e.graphQLErrors as GraphQLError[]).map(error => error.extensions?.code).join(',')}` : ''}`, this.id);
 			if (legacyFallback) {
 				query.query = legacyFallback.query;
 				return this.query(query, ignoreSamlErrors);

src/github/issueOverview.ts

@@ -175,7 +175,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 				});
 			})
 			.catch(e => {
-				vscode.window.showErrorMessage(formatError(e));
+				vscode.window.showErrorMessage(`Error updating issue description: ${formatError(e)}`);
 			});
 	}
 

src/github/pullRequestOverview.ts

@@ -327,7 +327,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				}
 			})
 			.catch(e => {
-				vscode.window.showErrorMessage(formatError(e));
+				vscode.window.showErrorMessage(`Error updating pull request description: ${formatError(e)}`);
 			});
 	}
 

src/view/reviewManager.ts

@@ -1105,7 +1105,7 @@ export class ReviewManager extends Disposable {
 				// The pull request was checked out, but the upstream branch was deleted
 				vscode.window.showInformationMessage('The remote branch for this pull request has been deleted. The file contents may not match the remote.');
 			} else {
-				vscode.window.showErrorMessage(formatError(e));
+				vscode.window.showErrorMessage(`Error switching to pull request: ${formatError(e)}`);
 			}
 			// todo, we should try to recover, for example, git checkout succeeds but set config fails.
 			if (this._folderRepoManager.activePullRequest?.number === pr.number) {