Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/lm/pullRequestContextProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import * as vscode from 'vscode';
import { GitApiImpl } from '../api/api1';
import { Disposable } from '../common/lifecycle';
import Logger from '../common/logger';
import { onceEvent } from '../common/utils';
import { issueMarkdown } from '../github/markdownUtils';
import { PullRequestModel } from '../github/pullRequestModel';
Expand All @@ -24,6 +25,8 @@ export namespace PRChatContextItem {
}

export class WorkspaceContextProvider extends Disposable implements vscode.ChatWorkspaceContextProvider {
private static readonly ID = 'WorkspaceContextProvider';

private readonly _onDidChangeWorkspaceChatContext = this._register(new vscode.EventEmitter<void>());
readonly onDidChangeWorkspaceChatContext = this._onDidChangeWorkspaceChatContext.event;

Expand Down Expand Up @@ -70,7 +73,15 @@ export class WorkspaceContextProvider extends Disposable implements vscode.ChatW
if (folderManager.gitHubRepositories.length === 0) {
continue;
}
const defaults = await folderManager.getPullRequestDefaults();
let defaults;
try {
defaults = await folderManager.getPullRequestDefaults();
} catch (e) {
// The folder may have no upstream, a detached HEAD, or an upstream that is not a GitHub
// repository. Skip it instead of letting the rejection escape as an unhandled promise.
Logger.debug(`Skipping workspace chat context for folder ${folderManager.repository.rootUri.toString()}: ${e.message ?? e}`, WorkspaceContextProvider.ID);
continue;
}

let value = `Repository name: ${defaults.repo}
Owner: ${defaults.owner}
Expand Down
2 changes: 1 addition & 1 deletion src/view/treeNodes/categoryNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
hasMorePages = response.hasMorePages;
hasUnsearchedRepositories = response.hasUnsearchedRepositories;
} catch (e) {
if (this.isCopilot && (e.response.status === 422) && e.message.includes('the users do not exist')) {
if (this.isCopilot && (e?.response?.status === 422) && e.message?.includes('the users do not exist')) {
// Skip it, it's copilot and the repo doesn't have copilot
} else {
const error = formatError(e);
Expand Down