Skip to content

Commit 4ff224b

Browse files
Copilotalexr00
andcommitted
Fix copy link commands to also resolve issues
Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>
1 parent 8852122 commit 4ff224b

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

src/commands.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,32 +1565,40 @@ ${contents}
15651565

15661566
context.subscriptions.push(
15671567
vscode.commands.registerCommand('pr.copyVscodeDevPrLink', async (params: OverviewContext | undefined) => {
1568-
let pr: PullRequestModel | undefined;
1568+
let item: PullRequestModel | IssueModel | undefined;
15691569
if (params) {
1570-
pr = await reposManager.getManagerForRepository(params.owner, params.repo)?.resolvePullRequest(params.owner, params.repo, params.number, true);
1570+
const folderManager = reposManager.getManagerForRepository(params.owner, params.repo);
1571+
item = await folderManager?.resolvePullRequest(params.owner, params.repo, params.number, true);
1572+
if (!item) {
1573+
item = await folderManager?.resolveIssue(params.owner, params.repo, params.number);
1574+
}
15711575
} else {
15721576
const activePullRequests: PullRequestModel[] = reposManager.folderManagers
15731577
.map(folderManager => folderManager.activePullRequest!)
15741578
.filter(activePR => !!activePR);
1575-
pr = await chooseItem<PullRequestModel>(
1579+
item = await chooseItem<PullRequestModel>(
15761580
activePullRequests,
15771581
itemValue => ({ label: `${itemValue.number}: ${itemValue.title}` }),
15781582
{ placeHolder: vscode.l10n.t('Pull request to create a link for') },
15791583
);
15801584
}
1581-
if (pr) {
1582-
return vscode.env.clipboard.writeText(vscodeDevPrLink(pr));
1585+
if (item) {
1586+
return vscode.env.clipboard.writeText(vscodeDevPrLink(item));
15831587
}
15841588
}));
15851589

15861590
context.subscriptions.push(
15871591
vscode.commands.registerCommand('pr.copyPrLink', async (params: OverviewContext | undefined) => {
1588-
let pr: PullRequestModel | undefined;
1592+
let item: PullRequestModel | IssueModel | undefined;
15891593
if (params) {
1590-
pr = await reposManager.getManagerForRepository(params.owner, params.repo)?.resolvePullRequest(params.owner, params.repo, params.number, true);
1594+
const folderManager = reposManager.getManagerForRepository(params.owner, params.repo);
1595+
item = await folderManager?.resolvePullRequest(params.owner, params.repo, params.number, true);
1596+
if (!item) {
1597+
item = await folderManager?.resolveIssue(params.owner, params.repo, params.number);
1598+
}
15911599
}
1592-
if (pr) {
1593-
return vscode.env.clipboard.writeText(pr.html_url);
1600+
if (item) {
1601+
return vscode.env.clipboard.writeText(item.html_url);
15941602
}
15951603
}));
15961604

0 commit comments

Comments
 (0)