Skip to content

Commit 20a06d8

Browse files
alexr00alexr00
authored
Remove description node (#6769)
1 parent 4bdcd88 commit 20a06d8

7 files changed

Lines changed: 89 additions & 118 deletions

File tree

‎package.json‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,63 +2399,73 @@
23992399
"view/item/context": [
24002400
{
24012401
"command": "pr.pick",
2402-
"when": "view == pr:github && viewItem =~ /description:nonactive/",
2403-
"group": "inline@0"
2404-
},
2405-
{
2406-
"command": "pr.pick",
2407-
"when": "view == pr:github && viewItem =~ /(pullrequest(:local)?:nonactive)|(description:nonactive)/",
2402+
"when": "view == pr:github && viewItem =~ /(pullrequest(:local)?:nonactive)/",
24082403
"group": "1_pullrequest@1"
24092404
},
24102405
{
24112406
"command": "pr.exit",
2412-
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:active|description:active/",
2407+
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:active/",
24132408
"group": "1_pullrequest@1"
24142409
},
24152410
{
24162411
"command": "pr.pickOnVscodeDev",
2417-
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:nonactive|description/ && (!isWeb || remoteName != codespaces && virtualWorkspace != vscode-vfs)",
2412+
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:nonactive/ && (!isWeb || remoteName != codespaces && virtualWorkspace != vscode-vfs)",
24182413
"group": "1_pullrequest@2"
24192414
},
2415+
{
2416+
"command": "pr.openChanges",
2417+
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/ && config.multiDiffEditor.experimental.enabled",
2418+
"group": "2_pullrequest@1"
2419+
},
2420+
{
2421+
"command": "pr.openDescriptionToTheSide",
2422+
"group": "2_pullrequest@2",
2423+
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/"
2424+
},
24202425
{
24212426
"command": "pr.openPullRequestOnGitHub",
2422-
"when": "view == pr:github && viewItem =~ /pullrequest|description/",
2423-
"group": "1_pullrequest@3"
2427+
"when": "view == pr:github && viewItem =~ /pullrequest/",
2428+
"group": "2_pullrequest@3"
24242429
},
24252430
{
24262431
"command": "pr.refreshPullRequest",
2427-
"when": "view == pr:github && viewItem =~ /pullrequest|description/",
2428-
"group": "2_pullrequest@1"
2432+
"when": "view == pr:github && viewItem =~ /pullrequest/",
2433+
"group": "3_pullrequest@1"
24292434
},
24302435
{
24312436
"command": "pr.deleteLocalBranch",
24322437
"when": "view == pr:github && viewItem =~ /pullrequest:local:nonactive/",
2433-
"group": "3_pullrequest@4"
2438+
"group": "4_pullrequest@4"
24342439
},
24352440
{
24362441
"command": "pr.dismissNotification",
24372442
"when": "view == pr:github && viewItem =~ /pullrequest(.*):notification/",
2438-
"group": "3_pullrequest@5"
2443+
"group": "4_pullrequest@5"
24392444
},
24402445
{
24412446
"command": "issue.chatSummarizeIssue",
24422447
"when": "view == pr:github && viewItem =~ /pullrequest/ && github.copilot-chat.activated && config.githubPullRequests.experimental.chat",
2443-
"group": "4_pullrequest@2"
2448+
"group": "5_pullrequest@2"
24442449
},
24452450
{
2446-
"command": "pr.openChanges",
2447-
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /description/ && config.multiDiffEditor.experimental.enabled",
2451+
"command": "pr.pick",
2452+
"when": "view == pr:github && viewItem =~ /(pullrequest(:local)?:nonactive)/",
24482453
"group": "inline@1"
24492454
},
2455+
{
2456+
"command": "pr.openChanges",
2457+
"when": "view =~ /prStatus:github/ && viewItem =~ /(description)/ && config.multiDiffEditor.experimental.enabled",
2458+
"group": "inline@0"
2459+
},
24502460
{
24512461
"command": "pr.showDiffSinceLastReview",
24522462
"group": "inline@1",
2453-
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /description:(active|nonactive):hasChangesSinceReview:showingAllChanges/"
2463+
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description):(active|nonactive):hasChangesSinceReview:showingAllChanges/"
24542464
},
24552465
{
24562466
"command": "pr.showDiffAll",
24572467
"group": "inline@1",
2458-
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /description:(active|nonactive):hasChangesSinceReview:showingChangesSinceReview/"
2468+
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description):(active|nonactive):hasChangesSinceReview:showingChangesSinceReview/"
24592469
},
24602470
{
24612471
"command": "notification.chatSummarizeNotification",
@@ -2497,11 +2507,6 @@
24972507
"group": "issues_0@3",
24982508
"when": "view == notifications:github && (viewItem == 'Issue' || viewItem == 'PullRequest') && config.githubPullRequests.experimental.notificationsView"
24992509
},
2500-
{
2501-
"command": "pr.openDescriptionToTheSide",
2502-
"group": "inline@2",
2503-
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /description/"
2504-
},
25052510
{
25062511
"command": "pr.openPullRequestOnGitHub",
25072512
"group": "inline@3",

‎src/commands.ts‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import { ReviewManager } from './view/reviewManager';
3535
import { ReviewsManager } from './view/reviewsManager';
3636
import { CategoryTreeNode } from './view/treeNodes/categoryNode';
3737
import { CommitNode } from './view/treeNodes/commitNode';
38-
import { DescriptionNode } from './view/treeNodes/descriptionNode';
3938
import {
4039
FileChangeNode,
4140
GitFileChangeNode,
@@ -68,7 +67,7 @@ function ensurePR<TIssue extends Issue, TIssueModel extends IssueModel<TIssue>>(
6867
export async function openDescription(
6968
telemetry: ITelemetry,
7069
issueModel: IssueModel,
71-
descriptionNode: DescriptionNode | undefined,
70+
descriptionNode: PRNode | RepositoryChangesNode | undefined,
7271
folderManager: FolderRepositoryManager,
7372
revealNode: boolean,
7473
preserveFocus: boolean = true,
@@ -120,8 +119,8 @@ async function chooseItem<T>(
120119
return (await vscode.window.showQuickPick(items, options))?.itemValue;
121120
}
122121

123-
export async function openPullRequestOnGitHub(e: PRNode | DescriptionNode | IssueModel | NotificationTreeItem, telemetry: ITelemetry) {
124-
if (e instanceof PRNode || e instanceof DescriptionNode) {
122+
export async function openPullRequestOnGitHub(e: PRNode | RepositoryChangesNode | IssueModel | NotificationTreeItem, telemetry: ITelemetry) {
123+
if (e instanceof PRNode || e instanceof RepositoryChangesNode) {
125124
vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(e.pullRequestModel.html_url));
126125
} else if (isNotificationTreeItem(e)) {
127126
vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(e.model.html_url));
@@ -158,7 +157,7 @@ export function registerCommands(
158157
context.subscriptions.push(
159158
vscode.commands.registerCommand(
160159
'pr.openPullRequestOnGitHub',
161-
async (e: PRNode | DescriptionNode | PullRequestModel | undefined) => {
160+
async (e: PRNode | RepositoryChangesNode | PullRequestModel | undefined) => {
162161
if (!e) {
163162
const activePullRequests: PullRequestModel[] = reposManager.folderManagers
164163
.map(folderManager => folderManager.activePullRequest!)
@@ -514,7 +513,7 @@ export function registerCommands(
514513
);
515514

516515
context.subscriptions.push(
517-
vscode.commands.registerCommand('pr.pick', async (pr: PRNode | DescriptionNode | PullRequestModel) => {
516+
vscode.commands.registerCommand('pr.pick', async (pr: PRNode | RepositoryChangesNode | PullRequestModel) => {
518517
if (pr === undefined) {
519518
// This is unexpected, but has happened a few times.
520519
Logger.error('Unexpectedly received undefined when picking a PR.', logId);
@@ -524,7 +523,7 @@ export function registerCommands(
524523
let pullRequestModel: PullRequestModel;
525524
let repository: Repository | undefined;
526525

527-
if (pr instanceof PRNode || pr instanceof DescriptionNode) {
526+
if (pr instanceof PRNode || pr instanceof RepositoryChangesNode) {
528527
pullRequestModel = pr.pullRequestModel;
529528
repository = pr.repository;
530529
} else {
@@ -555,7 +554,7 @@ export function registerCommands(
555554
}),
556555
);
557556
context.subscriptions.push(
558-
vscode.commands.registerCommand('pr.openChanges', async (pr: PRNode | DescriptionNode | PullRequestModel) => {
557+
vscode.commands.registerCommand('pr.openChanges', async (pr: PRNode | RepositoryChangesNode | PullRequestModel) => {
559558
if (pr === undefined) {
560559
// This is unexpected, but has happened a few times.
561560
Logger.error('Unexpectedly received undefined when picking a PR.', logId);
@@ -564,7 +563,7 @@ export function registerCommands(
564563

565564
let pullRequestModel: PullRequestModel;
566565

567-
if (pr instanceof PRNode || pr instanceof DescriptionNode) {
566+
if (pr instanceof PRNode || pr instanceof RepositoryChangesNode) {
568567
pullRequestModel = pr.pullRequestModel;
569568
} else {
570569
pullRequestModel = pr;
@@ -609,7 +608,7 @@ export function registerCommands(
609608
}));
610609

611610
context.subscriptions.push(
612-
vscode.commands.registerCommand('pr.pickOnVscodeDev', async (pr: PRNode | DescriptionNode | PullRequestModel) => {
611+
vscode.commands.registerCommand('pr.pickOnVscodeDev', async (pr: PRNode | RepositoryChangesNode | PullRequestModel) => {
613612
if (pr === undefined) {
614613
// This is unexpected, but has happened a few times.
615614
Logger.error('Unexpectedly received undefined when picking a PR.', logId);
@@ -618,7 +617,7 @@ export function registerCommands(
618617

619618
let pullRequestModel: PullRequestModel;
620619

621-
if (pr instanceof PRNode || pr instanceof DescriptionNode) {
620+
if (pr instanceof PRNode || pr instanceof RepositoryChangesNode) {
622621
pullRequestModel = pr.pullRequestModel;
623622
} else {
624623
pullRequestModel = pr;
@@ -629,10 +628,10 @@ export function registerCommands(
629628
);
630629

631630
context.subscriptions.push(
632-
vscode.commands.registerCommand('pr.exit', async (pr: PRNode | DescriptionNode | PullRequestModel | undefined) => {
631+
vscode.commands.registerCommand('pr.exit', async (pr: PRNode | RepositoryChangesNode | PullRequestModel | undefined) => {
633632
let pullRequestModel: PullRequestModel | undefined;
634633

635-
if (pr instanceof PRNode || pr instanceof DescriptionNode) {
634+
if (pr instanceof PRNode || pr instanceof RepositoryChangesNode) {
636635
pullRequestModel = pr.pullRequestModel;
637636
} else if (pr === undefined) {
638637
pullRequestModel = await chooseItem<PullRequestModel>(reposManager.folderManagers
@@ -810,7 +809,7 @@ export function registerCommands(
810809
}),
811810
);
812811

813-
async function openDescriptionCommand(argument: DescriptionNode | IssueModel | undefined) {
812+
async function openDescriptionCommand(argument: PRNode | IssueModel | undefined) {
814813
let issueModel: IssueModel | undefined;
815814
if (!argument) {
816815
const activePullRequests: PullRequestModel[] = reposManager.folderManagers
@@ -823,7 +822,7 @@ export function registerCommands(
823822
);
824823
}
825824
} else {
826-
issueModel = argument instanceof DescriptionNode ? argument.pullRequestModel : argument;
825+
issueModel = argument instanceof PRNode ? argument.pullRequestModel : argument;
827826
}
828827

829828
if (!issueModel) {
@@ -836,8 +835,8 @@ export function registerCommands(
836835
return;
837836
}
838837

839-
let descriptionNode: DescriptionNode | undefined;
840-
if (argument instanceof DescriptionNode) {
838+
let descriptionNode: PRNode | RepositoryChangesNode | undefined;
839+
if (argument instanceof PRNode) {
841840
descriptionNode = argument;
842841
} else {
843842
const reviewManager = ReviewManager.getReviewManagerForFolderManager(reviewsManager.reviewManagers, folderManager);
@@ -848,7 +847,7 @@ export function registerCommands(
848847
descriptionNode = reviewManager.changesInPrDataProvider.getDescriptionNode(folderManager);
849848
}
850849

851-
const revealDescription = !(argument instanceof DescriptionNode) && (!(argument instanceof IssueModel) || (argument instanceof PullRequestModel));
850+
const revealDescription = !(argument instanceof PRNode) && (!(argument instanceof IssueModel) || (argument instanceof PullRequestModel));
852851

853852
await openDescription(telemetry, issueModel, descriptionNode, folderManager, revealDescription, !(argument instanceof RepositoryChangesNode), tree.notificationProvider);
854853
}
@@ -884,7 +883,7 @@ export function registerCommands(
884883
));
885884

886885
context.subscriptions.push(
887-
vscode.commands.registerCommand('pr.openDescriptionToTheSide', async (descriptionNode: DescriptionNode) => {
886+
vscode.commands.registerCommand('pr.openDescriptionToTheSide', async (descriptionNode: RepositoryChangesNode) => {
888887
const folderManager = reposManager.getManagerForIssueModel(descriptionNode.pullRequestModel);
889888
if (!folderManager) {
890889
return;
@@ -903,13 +902,13 @@ export function registerCommands(
903902
);
904903

905904
context.subscriptions.push(
906-
vscode.commands.registerCommand('pr.showDiffSinceLastReview', async (descriptionNode: DescriptionNode) => {
905+
vscode.commands.registerCommand('pr.showDiffSinceLastReview', async (descriptionNode: RepositoryChangesNode) => {
907906
descriptionNode.pullRequestModel.showChangesSinceReview = true;
908907
}),
909908
);
910909

911910
context.subscriptions.push(
912-
vscode.commands.registerCommand('pr.showDiffAll', async (descriptionNode: DescriptionNode) => {
911+
vscode.commands.registerCommand('pr.showDiffAll', async (descriptionNode: RepositoryChangesNode) => {
913912
descriptionNode.pullRequestModel.showChangesSinceReview = false;
914913
}),
915914
);

‎src/github/issueOverview.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { ITelemetry } from '../common/telemetry';
1212
import { CommentEvent, EventType, TimelineEvent } from '../common/timelineEvent';
1313
import { asPromise, formatError } from '../common/utils';
1414
import { getNonce, IRequestMessage, WebviewBase } from '../common/webview';
15-
import { DescriptionNode } from '../view/treeNodes/descriptionNode';
1615
import { FolderRepositoryManager } from './folderRepositoryManager';
1716
import { IAccount, ILabel, IMilestone, IProject, IProjectItem, RepoAccessAndMergeMethods } from './interface';
1817
import { IssueModel } from './issueModel';
@@ -30,7 +29,6 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
3029
private static readonly _viewType: string = 'IssueOverview';
3130

3231
protected readonly _panel: vscode.WebviewPanel;
33-
protected _descriptionNode: DescriptionNode;
3432
protected _item: TItem;
3533
protected _folderRepositoryManager: FolderRepositoryManager;
3634
protected _scrollPosition = { x: 0, y: 0 };

‎src/view/prChangesTreeDataProvider.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { PullRequestModel } from '../github/pullRequestModel';
1515
import { RepositoriesManager } from '../github/repositoriesManager';
1616
import { ProgressHelper } from './progress';
1717
import { ReviewModel } from './reviewModel';
18-
import { DescriptionNode } from './treeNodes/descriptionNode';
1918
import { GitFileChangeNode } from './treeNodes/fileChangeNode';
2019
import { RepositoryChangesNode } from './treeNodes/repositoryChangesNode';
2120
import { BaseTreeNode, TreeNode } from './treeNodes/treeNode';
@@ -205,7 +204,7 @@ export class PullRequestChangesTreeDataProvider extends Disposable implements vs
205204
}
206205
}
207206

208-
getDescriptionNode(folderRepoManager: FolderRepositoryManager): DescriptionNode | undefined {
207+
getDescriptionNode(folderRepoManager: FolderRepositoryManager): RepositoryChangesNode | undefined {
209208
return this._pullRequestManagerMap.get(folderRepoManager);
210209
}
211210

‎src/view/treeNodes/descriptionNode.ts‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)