Skip to content

Comments don't show when PR is on non-default repo #8126

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
alexr00 merged 1 commit into from
Nov 10, 2025
Merged

Comments don't show when PR is on non-default repo #8126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/github/githubRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,12 @@ export class GitHubRepository extends Disposable {

public async ensureCommentsController(): Promise<void> {
try {
await this.ensure();
if (this.commentsController) {
return;
}

await this.ensure();
this.commentsController = vscode.comments.createCommentController(
`${PullRequestCommentController.PREFIX}-${this.remote.gitProtocol.normalizeUri()?.authority}-${this.remote.owner}-${this.remote.repositoryName}`,
`${PullRequestCommentController.PREFIX}-${this.remote.gitProtocol.normalizeUri()?.authority}-${this.remote.remoteName}-${this.remote.owner}-${this.remote.repositoryName}`,
`Pull Request (${this.remote.owner}/${this.remote.repositoryName})`,
);
this.commentsHandler = new PRCommentControllerRegistry(this.commentsController, this.telemetry);
Expand Down
32 changes: 26 additions & 6 deletions src/view/pullRequestCommentControllerRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@ interface PullRequestCommentHandlerInfo {
dispose: () => void;
}

interface PRCommentingRangeProviderInfo {
provider: vscode.CommentingRangeProvider2;
refCount: number;
dispose: () => void;
}
Comment on lines +23 to +27
Copy link
Member

@Tyriar Tyriar Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extends IDisposable?


export class PRCommentControllerRegistry extends Disposable implements vscode.CommentingRangeProvider, CommentReactionHandler {
private _prCommentHandlers: { [key: number]: PullRequestCommentHandlerInfo } = {};
private _prCommentingRangeProviders: { [key: number]: vscode.CommentingRangeProvider2 } = {};
private _prCommentingRangeProviders: { [key: number]: PRCommentingRangeProviderInfo } = {};
private readonly _activeChangeListeners: Map<FolderRepositoryManager, vscode.Disposable> = new Map();
public readonly resourceHints = { schemes: [Schemes.Pr] };

Expand All @@ -40,8 +46,8 @@ export class PRCommentControllerRegistry extends Disposable implements vscode.Co
return;
}

const provideCommentingRanges = this._prCommentingRangeProviders[params.prNumber].provideCommentingRanges.bind(
this._prCommentingRangeProviders[params.prNumber],
const provideCommentingRanges = this._prCommentingRangeProviders[params.prNumber].provider.provideCommentingRanges.bind(
this._prCommentingRangeProviders[params.prNumber].provider,
);

return provideCommentingRanges(document, token);
Expand Down Expand Up @@ -108,13 +114,27 @@ export class PRCommentControllerRegistry extends Disposable implements vscode.Co
}

public registerCommentingRangeProvider(prNumber: number, provider: vscode.CommentingRangeProvider2): vscode.Disposable {
this._prCommentingRangeProviders[prNumber] = provider;
if (this._prCommentingRangeProviders[prNumber]) {
this._prCommentingRangeProviders[prNumber].refCount += 1;
return this._prCommentingRangeProviders[prNumber];
}

return {
this._prCommentingRangeProviders[prNumber] = {
provider,
refCount: 1,
dispose: () => {
delete this._prCommentingRangeProviders[prNumber];
if (!this._prCommentingRangeProviders[prNumber]) {
return;
}

this._prCommentingRangeProviders[prNumber].refCount -= 1;
if (this._prCommentingRangeProviders[prNumber].refCount === 0) {
delete this._prCommentingRangeProviders[prNumber];
}
}
};

return this._prCommentingRangeProviders[prNumber];
}

override dispose() {
Expand Down
Loading