fix #126475

src/vs/workbench/api/browser/mainThreadComments.ts

@@ -290,6 +290,10 @@ export class MainThreadCommentController {
 		}
 	}
 
+	updateCommentingRanges() {
+		this._commentService.updateCommentingRanges(this._uniqueId);
+	}
+
 	private getKnownThread(commentThreadHandle: number): MainThreadCommentThread {
 		const thread = this._threads.get(commentThreadHandle);
 		if (!thread) {
@@ -473,6 +477,16 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		return provider.deleteCommentThread(commentThreadHandle);
 	}
 
+	$updateCommentingRanges(handle: number) {
+		let provider = this._commentControllers.get(handle);
+
+		if (!provider) {
+			return;
+		}
+
+		provider.updateCommentingRanges();
+	}
+
 	private registerView(commentsViewAlreadyRegistered: boolean) {
 		if (!commentsViewAlreadyRegistered) {
 			const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({

src/vs/workbench/api/common/extHost.protocol.ts

@@ -167,6 +167,7 @@ export interface MainThreadCommentsShape extends IDisposable {
 	$createCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, range: IRange, extensionId: ExtensionIdentifier): modes.CommentThread | undefined;
 	$updateCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, changes: CommentThreadChanges): void;
 	$deleteCommentThread(handle: number, commentThreadHandle: number): void;
+	$updateCommentingRanges(handle: number): void;
 	$onDidCommentThreadsChange(handle: number, event: modes.CommentThreadChangedEvent): void;
 }
 

src/vs/workbench/api/common/extHostComments.ts

@@ -483,7 +483,16 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 		}
 
 		private _threads: Map<number, ExtHostCommentThread> = new Map<number, ExtHostCommentThread>();
-		commentingRangeProvider?: vscode.CommentingRangeProvider;
+
+		private _commentingRangeProvider?: vscode.CommentingRangeProvider;
+		get commentingRangeProvider(): vscode.CommentingRangeProvider | undefined {
+			return this._commentingRangeProvider;
+		}
+
+		set commentingRangeProvider(provider: vscode.CommentingRangeProvider | undefined) {
+			this._commentingRangeProvider = provider;
+			proxy.$updateCommentingRanges(this.handle);
+		}
 
 		private _reactionHandler?: ReactionHandler;
 

src/vs/workbench/contrib/comments/browser/commentService.ts

@@ -37,6 +37,7 @@ export interface ICommentService {
 	readonly onDidSetAllCommentThreads: Event<IWorkspaceCommentThreadsEvent>;
 	readonly onDidUpdateCommentThreads: Event<ICommentThreadChangedEvent>;
 	readonly onDidChangeActiveCommentThread: Event<CommentThread | null>;
+	readonly onDidUpdateCommentingRanges: Event<{ owner: string; }>
 	readonly onDidChangeActiveCommentingRange: Event<{ range: Range, commentingRangesInfo: CommentingRanges }>;
 	readonly onDidSetDataProvider: Event<void>;
 	readonly onDidDeleteDataProvider: Event<string>;
@@ -52,6 +53,7 @@ export interface ICommentService {
 	updateComments(ownerId: string, event: CommentThreadChangedEvent): void;
 	disposeCommentThread(ownerId: string, threadId: string): void;
 	getComments(resource: URI): Promise<(ICommentInfo | null)[]>;
+	updateCommentingRanges(ownerId: string): void;
 	getCommentingRanges(resource: URI): Promise<IRange[]>;
 	hasReactionHandler(owner: string): boolean;
 	toggleReaction(owner: string, resource: URI, thread: CommentThread, comment: Comment, reaction: CommentReaction): Promise<void>;
@@ -76,6 +78,9 @@ export class CommentService extends Disposable implements ICommentService {
 	private readonly _onDidUpdateCommentThreads: Emitter<ICommentThreadChangedEvent> = this._register(new Emitter<ICommentThreadChangedEvent>());
 	readonly onDidUpdateCommentThreads: Event<ICommentThreadChangedEvent> = this._onDidUpdateCommentThreads.event;
 
+	private readonly _onDidUpdateCommentingRanges: Emitter<{ owner: string; }> = this._register(new Emitter<{ owner: string; }>());
+	readonly onDidUpdateCommentingRanges: Event<{ owner: string; }> = this._onDidUpdateCommentingRanges.event;
+
 	private readonly _onDidChangeActiveCommentThread = this._register(new Emitter<CommentThread | null>());
 	readonly onDidChangeActiveCommentThread = this._onDidChangeActiveCommentThread.event;
 
@@ -169,6 +174,10 @@ export class CommentService extends Disposable implements ICommentService {
 		this._onDidUpdateCommentThreads.fire(evt);
 	}
 
+	updateCommentingRanges(ownerId: string) {
+		this._onDidUpdateCommentingRanges.fire({ owner: ownerId });
+	}
+
 	async toggleReaction(owner: string, resource: URI, thread: CommentThread, comment: Comment, reaction: CommentReaction): Promise<void> {
 		const commentController = this._commentControls.get(owner);
 

src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts

@@ -187,6 +187,7 @@ export class CommentController implements IEditorContribution {
 			this.beginCompute();
 		}));
 		this.globalToDispose.add(this.commentService.onDidSetDataProvider(_ => this.beginCompute()));
+		this.globalToDispose.add(this.commentService.onDidUpdateCommentingRanges(_ => this.beginCompute()));
 
 		this.globalToDispose.add(this.commentService.onDidSetResourceCommentInfos(e => {
 			const editorURI = this.editor && this.editor.hasModel() && this.editor.getModel().uri;