Skip to content

Commit 44e1793

Browse files
Copilotalexr00
andcommitted
Simplify PR header change to only modify display layer
Instead of modifying GraphQL queries and utils, construct the owner/repo:branch format directly in the PR overview and activity bar view provider using existing owner, name, and ref properties from GitHubRef. Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>
1 parent 5260290 commit 44e1793

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

src/@types/vscode.proposed.chatParticipantAdditions.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ declare module 'vscode' {
105105
isComplete?: boolean;
106106
toolSpecificData?: ChatTerminalToolInvocationData;
107107
fromSubAgent?: boolean;
108+
presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
108109

109110
constructor(toolName: string, toolCallId: string, isError?: boolean);
110111
}

src/@types/vscode.proposed.chatSessionsProvider.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ declare module 'vscode' {
9595
*/
9696
description?: string | MarkdownString;
9797

98+
/**
99+
* An optional badge that provides additional context about the chat session.
100+
*/
101+
badge?: string | MarkdownString;
102+
98103
/**
99104
* An optional status indicating the current state of the session.
100105
*/

src/github/activityBarViewProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
252252
state: pullRequest.state,
253253
isCurrentlyCheckedOut: isCurrentlyCheckedOut,
254254
isRemoteBaseDeleted: pullRequest.isRemoteBaseDeleted,
255-
base: pullRequest.base.label,
255+
base: `${pullRequest.base.owner}/${pullRequest.base.name}:${pullRequest.base.ref}`,
256256
isRemoteHeadDeleted: pullRequest.isRemoteHeadDeleted,
257257
isLocalHeadDeleted: !branchInfo,
258-
head: pullRequest.head?.label ?? '',
258+
head: pullRequest.head ? `${pullRequest.head.owner}/${pullRequest.head.name}:${pullRequest.head.ref}` : '',
259259
canEdit: canEdit,
260260
hasWritePermission,
261261
mergeable: pullRequest.item.mergeable,

src/github/graphql.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ export interface RefRepository {
609609
login: string;
610610
};
611611
url: string;
612-
name: string;
613612
}
614613

615614
export interface BaseRefRepository extends RefRepository {

src/github/pullRequestOverview.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
310310
...baseContext,
311311
isCurrentlyCheckedOut: isCurrentlyCheckedOut,
312312
isRemoteBaseDeleted: pullRequest.isRemoteBaseDeleted,
313-
base: pullRequest.base.label,
313+
base: `${pullRequest.base.owner}/${pullRequest.base.name}:${pullRequest.base.ref}`,
314314
isRemoteHeadDeleted: pullRequest.isRemoteHeadDeleted,
315315
isLocalHeadDeleted: !branchInfo,
316-
head: pullRequest.head?.label ?? '',
316+
head: pullRequest.head ? `${pullRequest.head.owner}/${pullRequest.head.name}:${pullRequest.head.ref}` : '',
317317
repositoryDefaultBranch: defaultBranch,
318318
status: status[0],
319319
reviewRequirement: status[1],

src/github/queries.gql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ fragment PullRequestFragment on PullRequest {
207207
login
208208
}
209209
url
210-
name
211210
}
212211
baseRef {
213212
...Ref
@@ -220,7 +219,6 @@ fragment PullRequestFragment on PullRequest {
220219
login
221220
}
222221
url
223-
name
224222
squashMergeCommitTitle
225223
squashMergeCommitMessage
226224
mergeCommitMessage

src/github/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export function convertRESTUserToAccount(
297297

298298
export function convertRESTHeadToIGitHubRef(head: OctokitCommon.PullsListResponseItemHead): IGitHubRef {
299299
return {
300-
label: `${head.repo.owner!.login}/${head.repo.name}:${head.ref}`,
300+
label: head.label,
301301
ref: head.ref,
302302
sha: head.sha,
303303
repo: {
@@ -596,14 +596,14 @@ function parseRef(refName: string, oid: string, repository?: GraphQL.RefReposito
596596
}
597597

598598
return {
599-
label: `${repository.owner.login}/${repository.name}:${refName}`,
599+
label: `${repository.owner.login}:${refName}`,
600600
ref: refName,
601601
sha: oid,
602602
repo: {
603603
cloneUrl: repository.url,
604604
isInOrganization: repository.isInOrganization,
605605
owner: repository.owner.login,
606-
name: repository.name
606+
name: refName
607607
},
608608
};
609609
}

src/test/builders/graphql/pullRequestBuilder.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ const RefRepositoryBuilder = createBuilderClass<RefRepository>()({
1515
login: { default: 'me' },
1616
}),
1717
url: { default: 'https://github.com/owner/repo' },
18-
name: { default: 'repo' },
1918
});
2019

2120
const BaseRefRepositoryBuilder = createBuilderClass<BaseRefRepository>()({
@@ -24,7 +23,6 @@ const BaseRefRepositoryBuilder = createBuilderClass<BaseRefRepository>()({
2423
login: { default: 'me' },
2524
}),
2625
url: { default: 'https://github.com/owner/repo' },
27-
name: { default: 'repo' },
2826
mergeCommitMessage: { default: DefaultCommitMessage.commitMessages },
2927
mergeCommitTitle: { default: DefaultCommitTitle.mergeMessage },
3028
squashMergeCommitMessage: { default: DefaultCommitMessage.prBody },

0 commit comments

Comments
 (0)