Skip to content

[Nightly] Opening PR description page from tree not working when PR is not checked out #2500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rachel Macfarlane (RMacfarlane) merged 2 commits into from
Feb 17, 2021
Merged

[Nightly] Opening PR description page from tree not working when PR is not checked out #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec3145
[Nightly] Opening PR description page from tree not working when PR i…
Feb 17, 2021
72d9e60
Add getDescriptionNode method to tree
Feb 17, 2021
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
24 changes: 14 additions & 10 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,11 @@ export async function openDescription(
context: vscode.ExtensionContext,
telemetry: ITelemetry,
pullRequestModel: PullRequestModel,
folderManager: FolderRepositoryManager,
reviewManager: ReviewManager
descriptionNode: DescriptionNode | undefined,
folderManager: FolderRepositoryManager
) {
const rootNodes = await reviewManager.changesInPrDataProvider.getChildren();
const descriptionNode = rootNodes[0] as DescriptionNode;

const pullRequest = ensurePR(folderManager, pullRequestModel);
descriptionNode.reveal(descriptionNode, { select: true, focus: true });
descriptionNode?.reveal(descriptionNode, { select: true, focus: true });
// Create and show a new webview
PullRequestOverviewPanel.createOrShow(context.extensionPath, folderManager, pullRequest);

Expand Down Expand Up @@ -416,12 +413,19 @@ export function registerCommands(context: vscode.ExtensionContext, reposManager:
return;
}

const reviewManager = await ReviewManager.getReviewManagerForFolderManager(reviewManagers, folderManager);
if (!reviewManager) {
return;
let descriptionNode: DescriptionNode | undefined;
if (argument instanceof DescriptionNode) {
descriptionNode = argument;
} else {
const reviewManager = await ReviewManager.getReviewManagerForFolderManager(reviewManagers, folderManager);
if (!reviewManager) {
return;
}

descriptionNode = reviewManager.changesInPrDataProvider.getDescriptionNode(folderManager);
}

await openDescription(context, telemetry, pullRequestModel, folderManager, reviewManager);
await openDescription(context, telemetry, pullRequestModel, descriptionNode, folderManager);
}));

context.subscriptions.push(vscode.commands.registerCommand('pr.refreshDescription', async () => {
Expand Down
5 changes: 5 additions & 0 deletions src/view/prChangesTreeDataProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { IComment } from '../common/comment';
import { FolderRepositoryManager, SETTINGS_NAMESPACE } from '../github/folderRepositoryManager';
import { PullRequestModel } from '../github/pullRequestModel';
import { RepositoryChangesNode } from './treeNodes/repositoryChangesNode';
import { DescriptionNode } from './treeNodes/descriptionNode';

export class PullRequestChangesTreeDataProvider extends vscode.Disposable implements vscode.TreeDataProvider<TreeNode> {
private _onDidChangeTreeData = new vscode.EventEmitter<void>();
Expand Down Expand Up @@ -118,6 +119,10 @@ export class PullRequestChangesTreeDataProvider extends vscode.Disposable implem
}
}

getDescriptionNode(folderRepoManager: FolderRepositoryManager): DescriptionNode | undefined {
return this._pullRequestManagerMap.get(folderRepoManager);
}

async resolveTreeItem?(item: vscode.TreeItem, element: TreeNode): Promise<vscode.TreeItem> {
if (element instanceof GitFileChangeNode) {
await element.resolve();
Expand Down
3 changes: 2 additions & 1 deletion src/view/reviewManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,8 @@ export class ReviewManager {
this._createPullRequestHelper = new CreatePullRequestHelper(this.repository);
this._createPullRequestHelper.onDidCreate(async createdPR => {
await this.updateState();
await openDescription(this._context, this._telemetry, createdPR, this._folderRepoManager, this);
const descriptionNode = this.changesInPrDataProvider.getDescriptionNode(this._folderRepoManager);
await openDescription(this._context, this._telemetry, createdPR, descriptionNode, this._folderRepoManager);
});
}

Expand Down