Fix rapid focus flickering (#212153)

Fixes #211831
This commit is contained in:
Alex Ross
2024-05-07 10:49:52 +02:00
committed by GitHub
parent f8d3bd3909
commit a812bde8e5
10 changed files with 90 additions and 72 deletions

View File

@@ -160,14 +160,14 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
return commentController.value;
}
async $createCommentThreadTemplate(commentControllerHandle: number, uriComponents: UriComponents, range: IRange | undefined): Promise<void> {
async $createCommentThreadTemplate(commentControllerHandle: number, uriComponents: UriComponents, range: IRange | undefined, editorId?: string): Promise<void> {
const commentController = this._commentControllers.get(commentControllerHandle);
if (!commentController) {
return;
}
commentController.$createCommentThreadTemplate(uriComponents, range);
commentController.$createCommentThreadTemplate(uriComponents, range, editorId);
}
async $setActiveComment(controllerHandle: number, commentInfo: { commentThreadHandle: number; uniqueIdInThread?: number }): Promise<void> {
@@ -409,7 +409,8 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
private _range: vscode.Range | undefined,
private _comments: vscode.Comment[],
public readonly extensionDescription: IExtensionDescription,
private _isTemplate: boolean
private _isTemplate: boolean,
editorId?: string
) {
this._acceptInputDisposables.value = new DisposableStore();
@@ -424,7 +425,8 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
this._uri,
extHostTypeConverter.Range.from(this._range),
extensionDescription.identifier,
this._isTemplate
this._isTemplate,
editorId
);
this._localDisposables = [];
@@ -680,8 +682,8 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
}
}
$createCommentThreadTemplate(uriComponents: UriComponents, range: IRange | undefined): ExtHostCommentThread {
const commentThread = new ExtHostCommentThread(this.id, this.handle, undefined, URI.revive(uriComponents), extHostTypeConverter.Range.to(range), [], this._extension, true);
$createCommentThreadTemplate(uriComponents: UriComponents, range: IRange | undefined, editorId?: string): ExtHostCommentThread {
const commentThread = new ExtHostCommentThread(this.id, this.handle, undefined, URI.revive(uriComponents), extHostTypeConverter.Range.to(range), [], this._extension, true, editorId);
commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
this._threads.set(commentThread.handle, commentThread);
return commentThread;