@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/contrib/chat/common/chatWordCounter.js

@@ -1,5 +1,5 @@
 function getNWords(str, numWordsToCount) {
-    const allWordMatches = Array.from(str.matchAll(/\[([^\]]+)\]\(([^)]+)\)|[^\s\|\-]+/g));
+    const allWordMatches = Array.from(str.matchAll(/\[([^\]]+)\]\(([^)]+)\)|\p{sc=Han}|[^\s\|\-|\p{sc=Han}]+/gu));
     const targetWords = allWordMatches.slice(0, numWordsToCount);
     const endIndex = numWordsToCount > allWordMatches.length
         ? str.length
@@ -7,12 +7,13 @@ function getNWords(str, numWordsToCount) {
     const value = str.substring(0, endIndex);
     return {
         value,
-        actualWordCount: targetWords.length === 0 ? (value.length ? 1 : 0) : targetWords.length,
-        isFullString: endIndex >= str.length
+        returnedWordCount: targetWords.length === 0 ? (value.length ? 1 : 0) : targetWords.length,
+        isFullString: endIndex >= str.length,
+        totalWordCount: allWordMatches.length
     };
 }
 function countWords(str) {
     const result = getNWords(str, Number.MAX_SAFE_INTEGER);
-    return result.actualWordCount;
+    return result.returnedWordCount;
 }
 export { countWords, getNWords };

package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js

@@ -15,6 +15,7 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
         this.languageService = languageService;
         this.textModelService = textModelService;
         this._models = ( new ResourceMap());
+        this.maxModelCount = 100;
     }
     dispose() {
         super.dispose();
@@ -36,8 +37,23 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
         const uri = this.getUri(sessionId, chat, codeBlockIndex);
         const ref = this.textModelService.createModelReference(uri);
         this._models.set(uri, { model: ref, vulns: [] });
+        while (this._models.size > this.maxModelCount) {
+            const first = Array.from(( this._models.keys())).at(0);
+            if (!first) {
+                break;
+            }
+            this.delete(first);
+        }
         return { model: ref.then(ref => ref.object), vulns: [] };
     }
+    delete(codeBlockUri) {
+        const entry = this._models.get(codeBlockUri);
+        if (!entry) {
+            return;
+        }
+        entry.model.then(ref => ref.dispose());
+        this._models.delete(codeBlockUri);
+    }
     clear() {
         this._models.forEach(async (entry) => (await entry.model).dispose());
         this._models.clear();

package/vscode/src/vs/workbench/contrib/chat/common/languageModelToolsService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const ILanguageModelToolsService = ( createDecorator('ILanguageModelToolsService'));
+export { ILanguageModelToolsService };

package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js

@@ -148,12 +148,12 @@ let LanguageModelsService = class LanguageModelsService {
             }
         });
     }
-    makeLanguageModelChatRequest(identifier, from, messages, options, progress, token) {
+    async sendChatRequest(identifier, from, messages, options, token) {
         const provider = this._providers.get(identifier);
         if (!provider) {
             throw ( (new Error(`Chat response provider with identifier ${identifier} is not registered.`)));
         }
-        return provider.provideChatResponse(messages, from, options, progress, token);
+        return provider.sendChatRequest(messages, from, options, token);
     }
     computeTokenLength(identifier, message, token) {
         const provider = this._providers.get(identifier);

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -3,6 +3,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
 import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -37,18 +38,10 @@ const createCodeActionsAutoSave = (description) => {
         description: description
     };
 };
-const codeActionsOnSaveDefaultProperties = ( (Object.freeze({
-    'source.fixAll': createCodeActionsAutoSave(( localizeWithPath(
-        _moduleId,
-        5,
-        "Controls whether auto fix action should be run on file save."
-    ))),
-})));
 const codeActionsOnSaveSchema = {
     oneOf: [
         {
             type: 'object',
-            properties: codeActionsOnSaveDefaultProperties,
             additionalProperties: {
                 type: 'string'
             },
@@ -60,7 +53,7 @@ const codeActionsOnSaveSchema = {
     ],
     markdownDescription: ( localizeWithPath(
         _moduleId,
-        6,
+        5,
         'Run Code Actions for the editor on save. Code Actions must be specified and the editor must not be shutting down. Example: `"source.organizeImports": "explicit" `'
     )),
     type: ['object', 'array'],
@@ -78,10 +71,16 @@ const editorConfiguration = ( (Object.freeze({
     }
 })));
 let CodeActionsContribution = class CodeActionsContribution extends Disposable {
-    constructor(codeActionsExtensionPoint, keybindingService) {
+    constructor(codeActionsExtensionPoint, keybindingService, languageFeatures) {
         super();
+        this.languageFeatures = languageFeatures;
         this._contributedCodeActions = [];
+        this.settings = ( (new Set()));
         this._onDidChangeContributions = this._register(( (new Emitter())));
+        languageFeatures.codeActionProvider.onDidChange(() => {
+            this.updateSettingsFromCodeActionProviders();
+            this.updateConfigurationSchemaFromContribs();
+        }, 2000);
         codeActionsExtensionPoint.setHandler(extensionPoints => {
             this._contributedCodeActions = extensionPoints.flatMap(x => x.value).filter(x => Array.isArray(x.actions));
             this.updateConfigurationSchema(this._contributedCodeActions);
@@ -92,12 +91,25 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
             onDidChange: this._onDidChangeContributions.event,
         });
     }
+    updateSettingsFromCodeActionProviders() {
+        const providers = this.languageFeatures.codeActionProvider.allNoModel();
+        providers.forEach(provider => {
+            if (provider.providedCodeActionKinds) {
+                provider.providedCodeActionKinds.forEach(kind => {
+                    if (!( (this.settings.has(kind))) && CodeActionKind.Source.contains(( (new HierarchicalKind(kind))))) {
+                        this.settings.add(kind);
+                    }
+                });
+            }
+        });
+    }
     updateConfigurationSchema(codeActionContributions) {
-        const newProperties = { ...codeActionsOnSaveDefaultProperties };
+        const newProperties = {};
         for (const [sourceAction, props] of this.getSourceActions(codeActionContributions)) {
+            this.settings.add(sourceAction);
             newProperties[sourceAction] = createCodeActionsAutoSave(( localizeWithPath(
                 _moduleId,
-                7,
+                6,
                 "Controls whether '{0}' actions should be run on file save.",
                 props.title
             )));
@@ -106,14 +118,28 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
         ( (Registry.as(Extensions.Configuration)))
             .notifyConfigurationSchemaUpdated(editorConfiguration);
     }
+    updateConfigurationSchemaFromContribs() {
+        const properties = { ...codeActionsOnSaveSchema.properties };
+        for (const codeActionKind of this.settings) {
+            if (!properties[codeActionKind]) {
+                properties[codeActionKind] = createCodeActionsAutoSave(( localizeWithPath(
+                    _moduleId,
+                    6,
+                    "Controls whether '{0}' actions should be run on file save.",
+                    codeActionKind
+                )));
+            }
+        }
+        codeActionsOnSaveSchema.properties = properties;
+        ( (Registry.as(Extensions.Configuration)))
+            .notifyConfigurationSchemaUpdated(editorConfiguration);
+    }
     getSourceActions(contributions) {
-        const defaultKinds = ( (( (Object.keys(codeActionsOnSaveDefaultProperties))).map(value => ( (new HierarchicalKind(value))))));
         const sourceActions = ( (new Map()));
         for (const contribution of contributions) {
             for (const action of contribution.actions) {
                 const kind = ( (new HierarchicalKind(action.kind)));
-                if (CodeActionKind.Source.contains(kind)
-                    && !( (defaultKinds.some(defaultKind => defaultKind.contains(kind))))) {
+                if (CodeActionKind.Source.contains(kind)) {
                     sourceActions.set(kind.value, action);
                 }
             }
@@ -167,6 +193,7 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
     }
 };
 CodeActionsContribution = ( (__decorate([
-    ( (__param(1, IKeybindingService)))
+    ( (__param(1, IKeybindingService))),
+    ( (__param(2, ILanguageFeaturesService)))
 ], CodeActionsContribution)));
 export { CodeActionsContribution, editorConfiguration };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -29,7 +29,7 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
         this._notificationService = _notificationService;
         const isEmbeddedDiffEditor = this._diffEditor instanceof EmbeddedDiffEditorWidget;
         if (!isEmbeddedDiffEditor) {
-            const computationResult = observableFromEvent(e => this._diffEditor.onDidUpdateDiff(e), () =>  this._diffEditor.getDiffComputationResult());
+            const computationResult = observableFromEvent(this, e => this._diffEditor.onDidUpdateDiff(e), () =>  this._diffEditor.getDiffComputationResult());
             const onlyWhiteSpaceChange = ( (computationResult.map(r => r && !r.identical && r.changes2.length === 0)));
             this._register(autorunWithStore((reader, store) => {
                 if (onlyWhiteSpaceChange.read(reader)) {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js

@@ -203,9 +203,7 @@ class SimpleFindWidget extends Widget {
     }
     dispose() {
         super.dispose();
-        if (this._domNode && this._domNode.parentElement) {
-            this._domNode.parentElement.removeChild(this._domNode);
-        }
+        this._domNode?.remove();
     }
     isVisible() {
         return this._isVisible;

package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js

@@ -59,7 +59,7 @@ let SuggestEnabledInput = class SuggestEnabledInput extends Widget {
         editorOptions.overflowWidgetsDomNode = options.overflowWidgetsDomNode;
         const scopedContextKeyService = this.getScopedContextKeyService(contextKeyService);
         const instantiationService = scopedContextKeyService
-            ? defaultInstantiationService.createChild(( (new ServiceCollection([IContextKeyService, scopedContextKeyService]))))
+            ? this._register(defaultInstantiationService.createChild(( (new ServiceCollection([IContextKeyService, scopedContextKeyService])))))
             : defaultInstantiationService;
         this.inputWidget = this._register(instantiationService.createInstance(CodeEditorWidget, this.stylingContainer, editorOptions, {
             contributions: EditorExtensionsRegistry.getSomeEditorContributions([

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js

@@ -1,13 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { Action2, registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 const _moduleId = "vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier";
 class ToggleMultiCursorModifierAction extends Action2 {
     static { this.ID = 'workbench.action.toggleMultiCursorModifier'; }
@@ -27,16 +28,17 @@ class ToggleMultiCursorModifierAction extends Action2 {
     }
 }
 const multiCursorModifier = ( (new RawContextKey('multiCursorModifier', 'altKey')));
-let MultiCursorModifierContextKeyController = class MultiCursorModifierContextKeyController {
+let MultiCursorModifierContextKeyController = class MultiCursorModifierContextKeyController extends Disposable {
     constructor(configurationService, contextKeyService) {
+        super();
         this.configurationService = configurationService;
         this._multiCursorModifier = multiCursorModifier.bindTo(contextKeyService);
         this._update();
-        configurationService.onDidChangeConfiguration((e) => {
+        this._register(configurationService.onDidChangeConfiguration((e) => {
             if (e.affectsConfiguration('editor.multiCursorModifier')) {
                 this._update();
             }
-        });
+        }));
     }
     _update() {
         const editorConf = this.configurationService.getValue('editor');

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js

@@ -1,21 +1,21 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { onDidRegisterWindow, addDisposableListener } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Event } from '../../../../base/common/event.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { registerEditorContribution, registerDiffEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { localizeWithPath } from '../../../../nls.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { Codicon } from '../../../../base/common/codicons.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
-import { Event } from '../../../../base/common/event.js';
-import { onDidRegisterWindow, addDisposableListener } from '../../../../base/browser/dom.js';
-import { mainWindow } from '../../../../base/browser/window.js';
 const _moduleId = "vs/workbench/contrib/codeEditor/browser/toggleWordWrap";
 const transientWordWrapState = 'transientWordWrapState';
 const isWordWrapMinifiedKey = 'isWordWrapMinified';
@@ -202,7 +202,7 @@ let EditorWordWrapContextKeyTracker = class EditorWordWrapContextKeyTracker exte
             disposables.add(addDisposableListener(window, 'focus', () => this._update(), true));
             disposables.add(addDisposableListener(window, 'blur', () => this._update(), true));
         }, { window: mainWindow, disposables: this._store }));
-        this._editorService.onDidActiveEditorChange(() => this._update());
+        this._register(this._editorService.onDidActiveEditorChange(() => this._update()));
         this._canToggleWordWrap = CAN_TOGGLE_WORD_WRAP.bindTo(this._contextService);
         this._editorWordWrap = EDITOR_WORD_WRAP.bindTo(this._contextService);
         this._activeEditor = null;

package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js

@@ -15,11 +15,11 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 const _moduleId = "vs/workbench/contrib/comments/browser/commentColors";
 const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 0, 'Icon color for resolved comments.')));
 const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 1, 'Icon color for unresolved comments.')));
-registerColor('editorCommentsWidget.replyInputBackground', { dark: peekViewTitleBackground, light: peekViewTitleBackground, hcDark: peekViewTitleBackground, hcLight: peekViewTitleBackground }, ( localizeWithPath(_moduleId, 2, 'Background color for comment reply input box.')));
+registerColor('editorCommentsWidget.replyInputBackground', peekViewTitleBackground, ( localizeWithPath(_moduleId, 2, 'Background color for comment reply input box.')));
 const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 3, 'Color of borders and arrow for resolved comments.')));
 const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 4, 'Color of borders and arrow for unresolved comments.')));
-registerColor('editorCommentsWidget.rangeBackground', { dark: ( (transparent(unresolvedCommentBorder, .1))), light: ( (transparent(unresolvedCommentBorder, .1))), hcDark: ( (transparent(unresolvedCommentBorder, .1))), hcLight: ( (transparent(unresolvedCommentBorder, .1))) }, ( localizeWithPath(_moduleId, 5, 'Color of background for comment ranges.')));
-registerColor('editorCommentsWidget.rangeActiveBackground', { dark: ( (transparent(unresolvedCommentBorder, .1))), light: ( (transparent(unresolvedCommentBorder, .1))), hcDark: ( (transparent(unresolvedCommentBorder, .1))), hcLight: ( (transparent(unresolvedCommentBorder, .1))) }, ( localizeWithPath(
+registerColor('editorCommentsWidget.rangeBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localizeWithPath(_moduleId, 5, 'Color of background for comment ranges.')));
+registerColor('editorCommentsWidget.rangeActiveBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localizeWithPath(
     _moduleId,
     6,
     'Color of background for currently selected or hovered comment range.'

package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js

@@ -22,18 +22,18 @@ const overviewRulerCommentingRangeForeground = registerColor('editorGutter.comme
     0,
     'Editor gutter decoration color for commenting ranges. This color should be opaque.'
 )));
-const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, ( localizeWithPath(
+const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', overviewRulerCommentingRangeForeground, ( localizeWithPath(
     _moduleId,
     1,
     'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
 )));
-const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, ( localizeWithPath(
+const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', overviewRulerCommentForeground, ( localizeWithPath(
     _moduleId,
     2,
     'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'
 )));
 const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localizeWithPath(_moduleId, 3, 'Editor gutter decoration color for commenting glyphs.')));
-registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, ( localizeWithPath(
+registerColor('editorGutter.commentUnresolvedGlyphForeground', editorGutterCommentGlyphForeground, ( localizeWithPath(
     _moduleId,
     4,
     'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'

package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js

@@ -93,7 +93,7 @@ let CommentReply = class CommentReply extends Disposable {
         else if (hasExistingComments) {
             this.createReplyButton(this.commentEditor, this.form);
         }
-        else if (focus && (this._commentThread.comments && this._commentThread.comments.length === 0)) {
+        else if (focus && (!this._commentThread.comments || this._commentThread.comments.length === 0)) {
             this.expandReplyArea();
         }
         this._error = append(this.form, $('.validation-error.hidden'));
@@ -310,7 +310,7 @@ let CommentReply = class CommentReply extends Disposable {
     }
     createReplyButton(commentEditor, commentForm) {
         this._reviewThreadReplyButton = append(commentForm, $(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localizeWithPath(_moduleId, 0, "Reply..."))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localizeWithPath(_moduleId, 0, "Reply..."))));
         this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localizeWithPath(_moduleId, 0, "Reply..."));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js

@@ -143,7 +143,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
             this._commentDisposable.get(commentToDelete)?.dispose();
             this._commentDisposable.delete(commentToDelete);
             this._commentElements.splice(commentElementsToDelIndex[i], 1);
-            this._commentsElement.removeChild(commentToDelete.domNode);
+            commentToDelete.domNode.remove();
         }
         let lastCommentElement = null;
         const newCommentNodeList = [];

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js

@@ -2,7 +2,7 @@ import { $, append, addDisposableListener, EventType, getWindow } from '../../..
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Action, ActionRunner } from '../../../../base/common/actions.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { escape } from '../../../../base/common/strings.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -24,6 +24,7 @@ class CommentThreadHeader extends Disposable {
         this._contextMenuService = _contextMenuService;
         this._headElement = $('.head');
         container.appendChild(this._headElement);
+        this._register(toDisposable(() => this._headElement.remove()));
         this._fillHead();
     }
     _fillHead() {

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/review.css.js';
 import { $, trackFocus, createStyleSheet, addDisposableListener, EventType } from '../../../../base/browser/dom.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Disposable, toDisposable, dispose } from '../../../../base/common/lifecycle.js';
 import { CommentThreadCollapsibleState, CommentThreadState } from '../../../../editor/common/languages.js';
 import { CommentReply } from './commentReply.js';
 import { ICommentService } from './commentService.service.js';
@@ -66,6 +66,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this._header.updateCommentThread(this._commentThread);
         const bodyElement = $('.body');
         container.appendChild(bodyElement);
+        this._register(toDisposable(() => bodyElement.remove()));
         const tracker = this._register(trackFocus(bodyElement));
         this._register(registerNavigableContainer({
             name: 'commentThreadWidget',

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js

@@ -80,7 +80,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this._globalToDispose = ( new DisposableStore());
         this._commentThreadDisposables = [];
         this._contextKeyService = contextKeyService.createScoped(this.domNode);
-        this._scopedInstantiationService = instantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService])));
+        this._scopedInstantiationService = this._globalToDispose.add(instantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService]))));
         const controller = this.commentService.getCommentController(this._uniqueOwner);
         if (controller) {
             this._commentOptions = controller.options;

package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js

@@ -625,10 +625,12 @@ let CommentController = class CommentController {
             }
             return Promise.resolve([]);
         });
-        return this._computePromise.then(async (commentInfos) => {
+        this._computeAndSetPromise = this._computePromise.then(async (commentInfos) => {
             await this.setComments(coalesce(commentInfos));
             this._computePromise = null;
         }, error => console.log(error));
+        this._computePromise.then(() => this._computeAndSetPromise = undefined);
+        return this._computeAndSetPromise;
     }
     beginComputeCommentingRanges() {
         if (this._computeCommentingRangeScheduler) {
@@ -662,8 +664,8 @@ let CommentController = class CommentController {
             commentThreadWidget[0].reveal(commentUniqueId, focus);
         }
         else if (fetchOnceIfNotExist) {
-            if (this._computePromise) {
-                this._computePromise.then(_ => {
+            if (this._computeAndSetPromise) {
+                this._computeAndSetPromise.then(_ => {
                     this.revealCommentThread(threadId, commentUniqueId, false, focus);
                 });
             }
@@ -698,7 +700,7 @@ let CommentController = class CommentController {
         if (!this._commentWidgets.length || !this.editor?.hasModel()) {
             return;
         }
-        const after = this.editor.getSelection().getEndPosition();
+        const after = reverse ? this.editor.getSelection().getStartPosition() : this.editor.getSelection().getEndPosition();
         const sortedWidgets = this._commentWidgets.sort((a, b) => {
             if (reverse) {
                 const temp = a;
@@ -817,7 +819,8 @@ let CommentController = class CommentController {
         const pendingCommentText = (this._pendingNewCommentCache[uniqueOwner] && this._pendingNewCommentCache[uniqueOwner][thread.threadId])
             ?? continueOnCommentText;
         const pendingEdits = this._pendingEditsCache[uniqueOwner] && this._pendingEditsCache[uniqueOwner][thread.threadId];
-        const shouldReveal = thread.canReply && thread.isTemplate && (!thread.comments || (thread.comments.length === 0)) && (!thread.editorId || (thread.editorId === editorId));
+        const isThreadTemplateOrEmpty = (thread.isTemplate || (!thread.comments || (thread.comments.length === 0)));
+        const shouldReveal = thread.canReply && isThreadTemplateOrEmpty && (!thread.editorId || (thread.editorId === editorId));
         await this.displayCommentThread(uniqueOwner, thread, shouldReveal, pendingCommentText, pendingEdits);
         this._commentInfos.filter(info => info.uniqueOwner === uniqueOwner)[0].threads.push(thread);
         this.tryUpdateReservedSpace();

package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js

@@ -243,7 +243,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             const renderedComment = this.getRenderedComment(originalComment.comment.body, disposables);
             templateData.disposables.push(renderedComment);
             templateData.threadMetadata.commentPreview.appendChild(renderedComment.element.firstElementChild ?? renderedComment.element);
-            templateData.disposables.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.threadMetadata.commentPreview, renderedComment.element.textContent ?? ''));
+            templateData.disposables.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), templateData.threadMetadata.commentPreview, renderedComment.element.textContent ?? ''));
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {

package/vscode/src/vs/workbench/contrib/comments/browser/media/panel.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".comments-panel .comments-panel-container{height:100%}.comments-panel .comments-panel-container .hidden{display:none}.comments-panel .comments-panel-container .tree-container{height:100%}.comments-panel .comments-panel-container .tree-container.hidden{display:none;visibility:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container{display:block}.comments-panel .comments-panel-container .tree-container .comment-thread-container div{overflow:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container,.comments-panel .comments-panel-container .tree-container .resource-container{display:flex;overflow:hidden;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata{display:flex;flex:1}.comments-panel .count,.comments-panel .user{padding-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .icon{min-width:fit-content;padding-right:5px;padding-top:4px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .relevance,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .user,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .count{min-width:fit-content}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .relevance{background-color:var(--vscode-badge-background);border-radius:2px;color:var(--vscode-badge-foreground);font-size:.9em;line-height:14px;margin-bottom:3px;margin-right:4px;margin-top:4px;padding:0 4px 1px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text{display:flex;flex:1;min-width:0}.comments-panel .comments-panel-container .tree-container .comment-thread-container .reply-detail,.comments-panel .comments-panel-container .tree-container .comment-thread-container .timestamp,.comments-panel .comments-panel-container .tree-container .resource-container .owner{display:block;font-size:.9em;opacity:.8;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .text *{margin:0;max-width:500px;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .range{opacity:.8}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text code{font-family:var(--monaco-monospace-font)}.comments-panel .comments-panel-container .tree-container .monaco-icon-label{padding-right:5px}.comments-panel .comments-panel-container .tree-container .separator{opacity:.8;padding-right:5px}.comments-panel .comments-panel-container .message-box-container{height:inherit;line-height:22px;padding-left:20px}.comments-panel .comments-panel-container .tree-container .count-badge-wrapper{margin-left:10px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{line-height:22px;margin-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{padding-left:16px}.comments-panel .hide{display:none}.comments-panel .comments-panel-container .text a{color:var(--vscode-textLink-foreground)}.comments-panel .comments-panel-container .text a:hover,.comments-panel .comments-panel-container a:active{color:var(--vscode-textLink-activeForeground)}.comments-panel .comments-panel-container .text a:focus{outline-color:var(--vscode-focusBorder)}.comments-panel .comments-panel-container .text code{color:var(--vscode-textPreformat-foreground)}.comments-panel .comments-panel-container .actions{display:none}.comments-panel .comments-panel-container .actions .action-label{padding:2px}.comments-panel .monaco-list .monaco-list-row.focused .comment-metadata-container .actions,.comments-panel .monaco-list .monaco-list-row.selected .comment-metadata-container .actions,.comments-panel .monaco-list .monaco-list-row:hover .comment-metadata-container .actions{display:block}";
+var css = ".comments-panel .comments-panel-container{height:100%}.comments-panel .comments-panel-container .hidden{display:none}.comments-panel .comments-panel-container .tree-container{height:100%}.comments-panel .comments-panel-container .tree-container.hidden{display:none;visibility:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container{display:block}.comments-panel .comments-panel-container .tree-container .comment-thread-container div{overflow:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container,.comments-panel .comments-panel-container .tree-container .resource-container{display:flex;overflow:hidden;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata{display:flex;flex:1}.comments-panel .count,.comments-panel .user{padding-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .icon{min-width:fit-content;padding-right:5px;padding-top:4px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .relevance,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .user,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .count{min-width:fit-content}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .relevance{background-color:var(--vscode-badge-background);border-radius:2px;color:var(--vscode-badge-foreground);font-size:.9em;line-height:14px;margin-bottom:3px;margin-right:4px;margin-top:4px;padding:0 4px 1px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text{display:flex;flex:1;min-width:0}.comments-panel .comments-panel-container .tree-container .comment-thread-container .reply-detail,.comments-panel .comments-panel-container .tree-container .comment-thread-container .timestamp,.comments-panel .comments-panel-container .tree-container .resource-container .owner{display:block;font-size:.9em;opacity:.8;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .text *{margin:0;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata .text *{max-width:700px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .range{opacity:.8}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text code{font-family:var(--monaco-monospace-font)}.comments-panel .comments-panel-container .tree-container .monaco-icon-label{padding-right:5px}.comments-panel .comments-panel-container .tree-container .separator{opacity:.8;padding-right:5px}.comments-panel .comments-panel-container .message-box-container{height:inherit;line-height:22px;padding-left:20px}.comments-panel .comments-panel-container .tree-container .count-badge-wrapper{margin-left:10px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{line-height:22px;margin-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{padding-left:16px}.comments-panel .hide{display:none}.comments-panel .comments-panel-container .text a{color:var(--vscode-textLink-foreground)}.comments-panel .comments-panel-container .text a:hover,.comments-panel .comments-panel-container a:active{color:var(--vscode-textLink-activeForeground)}.comments-panel .comments-panel-container .text a:focus{outline-color:var(--vscode-focusBorder)}.comments-panel .comments-panel-container .text code{color:var(--vscode-textPreformat-foreground)}.comments-panel .comments-panel-container .actions{display:none}.comments-panel .comments-panel-container .actions .action-label{padding:2px}.comments-panel .monaco-list .monaco-list-row.focused .comment-metadata-container .actions,.comments-panel .monaco-list .monaco-list-row.selected .comment-metadata-container .actions,.comments-panel .monaco-list .monaco-list-row:hover .comment-metadata-container .actions{display:block}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/comments/browser/media/review.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".review-widget{position:absolute;width:100%}.monaco-editor .review-widget{background-color:var(--vscode-peekViewResult-background)}.review-widget .hidden{display:none!important}.review-widget .body{overflow:hidden}.review-widget .body .review-comment{display:flex;padding:8px 16px 8px 20px}@keyframes monaco-review-widget-focus{0%{background:var(--vscode-peekViewResult-selectionBackground)}to{background:transparent}}.review-widget .body .review-comment.focus{animation:monaco-review-widget-focus 3s ease 0s}.review-widget .body .review-comment .comment-actions{margin-left:auto}.review-widget .body .review-comment .comment-actions .monaco-toolbar{height:22px}.review-widget .body .review-comment .comment-title .comment-header-info{overflow:hidden;text-overflow:ellipsis}.review-widget .body .review-comment .comment-title{display:flex;width:100%}.review-widget .body .review-comment .comment-title .action-label.codicon{line-height:18px}.review-widget .body .review-comment .comment-title .monaco-dropdown .toolbar-toggle-more{height:18px;line-height:18px;vertical-align:middle;width:16px}.review-widget .body .comment-body blockquote{border-left-style:solid;border-left-width:5px;margin:0 7px 0 5px;padding:0 16px 0 10px}.review-widget .body .review-comment .avatar-container{margin-top:4px!important}.review-widget .body .review-comment .avatar-container img.avatar{border-radius:3px;border-style:none;display:inline-block;height:28px;line-height:1;overflow:hidden;vertical-align:middle;width:28px}.review-widget .body .comment-reactions .monaco-text-button{background-color:transparent;border:1px solid grey;border-radius:3px;margin:0 7px 0 0;width:30px}.review-widget .body .review-comment .review-comment-contents{overflow:hidden;padding-left:20px;user-select:text;-webkit-user-select:text;width:100%}.review-widget .body pre{word-wrap:normal;overflow:auto;white-space:pre}.review-widget .body .review-comment .review-comment-contents .author{line-height:22px}.review-widget .body .review-comment .review-comment-contents .isPending{font-style:italic;line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .timestamp{line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .comment-body .comment-body-plainstring{white-space:pre-wrap}.review-widget .body .review-comment .review-comment-contents .comment-body{padding-top:4px}.review-widget .body .review-comment .review-comment-contents .comment-body-max-height{max-height:20em}.review-widget .body .review-comment .review-comment-contents .comment-reactions{margin-top:8px;min-height:25px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label{display:flex;font-size:12px;padding:1px 4px;text-align:center;white-space:pre}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-position:0;background-repeat:no-repeat;background-size:14px;display:inline-block;margin-right:4px;width:14px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-label{line-height:20px;margin-right:4px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.toolbar-toggle-pickReactions{background-position:50%;background-repeat:no-repeat;background-size:16px;border:none;display:none;font-size:16px;height:16px;margin-top:3px;width:26px}.review-widget .body .review-comment .review-comment-contents .comment-reactions:hover .action-item a.action-label.toolbar-toggle-pickReactions{background-size:16px;display:inline-block}.review-widget .body .review-comment .comment-title .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block;height:16px;line-height:16px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label{border:1px solid}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.disabled{opacity:.6}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover{background-color:var(--vscode-statusBarItem-hoverBackground)}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active{background-color:var(--vscode-statusBarItem-activeBackground);border:1px solid transparent}.review-widget .body .review-comment .review-comment-contents a{cursor:pointer}.review-widget .body .comment-body p,.review-widget .body .comment-body ul{margin:8px 0}.review-widget .body .comment-body p:first-child,.review-widget .body .comment-body ul:first-child{margin-top:0}.review-widget .body .comment-body p:last-child,.review-widget .body.comment-body ul:last-child{margin-bottom:0}.review-widget .body .comment-body ul{padding-left:20px}.review-widget .body .comment-body li>p{margin-bottom:0}.review-widget .body .comment-body li>ul{margin-top:0}.review-widget .body .comment-body code{border-radius:3px;padding:0 .4em}.review-widget .body .comment-body span{white-space:pre}.review-widget .body .comment-body img{max-width:100%}.review-widget .body .comment-form{margin:8px 20px}.review-widget .validation-error{word-wrap:break-word;box-sizing:border-box;display:inline-block;font-size:12px;line-height:17px;margin-left:-1px;margin-top:-1px;min-height:34px;overflow:hidden;padding:.4em;text-align:left;width:100%}.review-widget .body .comment-additional-actions{margin:10px 20px}.review-widget .body .comment-additional-actions .section-separator{border-top:1px solid var(--vscode-menu-separatorBackground);margin:10px 0 14px}.review-widget .body .comment-additional-actions .button-bar{display:flex;white-space:nowrap}.review-widget .body .comment-additional-actions .monaco-button,.review-widget .body .comment-additional-actions .monaco-button-dropdown,.review-widget .body .comment-additional-actions .monaco-text-button{display:flex;width:auto}.review-widget .body .comment-additional-actions .button-bar>.monaco-button-dropdown,.review-widget .body .comment-additional-actions .button-bar>.monaco-text-button{margin:0 10px 0 0}.review-widget .body .comment-additional-actions .button-bar .monaco-text-button{padding:4px 10px}.review-widget .body .comment-additional-actions .codicon-drop-down-button{align-items:center}.review-widget .body .monaco-editor{color:var(--vscode-editor-foreground)}.review-widget .body .comment-form.expand .review-thread-reply-button{display:none}.review-widget .body .comment-form.expand .form-actions,.review-widget .body .comment-form.expand .monaco-editor{box-sizing:content-box;display:block}.review-widget .body .comment-form .review-thread-reply-button{background-color:var(--vscode-editorCommentsWidget-replyInputBackground);border:0;border-radius:0;box-sizing:border-box;color:var(--vscode-editor-foreground);display:block;font-family:var(--monaco-monospace-font);font-size:inherit;font-weight:600;line-height:20px;outline:1px solid transparent;padding:6px 12px;resize:vertical;text-align:left;white-space:nowrap;width:100%}.review-widget .body .comment-form .review-thread-reply-button:focus{outline-style:solid;outline-width:1px}.review-widget .body .comment-form .monaco-editor,.review-widget .body .comment-form .monaco-editor .monaco-editor-background,.review-widget .body .edit-container .monaco-editor .monaco-editor-background{background-color:var(--vscode-editorCommentsWidget-replyInputBackground)}.review-widget .body .comment-form .monaco-editor,.review-widget .body .edit-container .monaco-editor{border:0;border-radius:3px;box-sizing:content-box;max-height:500px;min-height:90px;padding:6px 0 6px 12px;width:100%}.review-widget .body .comment-form .form-actions,.review-widget .body .comment-form .monaco-editor{display:none}.review-widget .body .comment-form .form-actions,.review-widget .body .edit-container .form-actions{margin:10px 0;overflow:auto}.review-widget .body .edit-container .form-actions{padding-top:10px}.review-widget .body .edit-textarea{margin:5px 12px 10px 0}.review-widget .body .comment-form .form-actions .monaco-text-button,.review-widget .body .edit-container .monaco-text-button{margin-left:5px;padding:4px 10px;width:auto}.review-widget .body .form-actions .monaco-text-button{float:right}.review-widget .head{box-sizing:border-box;display:flex;height:100%}.review-widget .head .review-title{cursor:default;display:inline-block;font-size:13px;margin-left:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.review-widget .head .review-title .dirname:not(:empty){font-size:.9em;margin-left:.5em}.review-widget .head .review-actions{flex:1;padding-right:2px;text-align:right}.review-widget .head .review-actions>.monaco-action-bar{display:inline-block}.review-widget .head .review-actions>.monaco-action-bar,.review-widget .head .review-actions>.monaco-action-bar>.actions-container{height:100%}.review-widget .action-item{margin-left:4px;min-height:20px;min-width:18px}.review-widget .head .review-actions>.monaco-action-bar .action-label{background-position:50%;background-repeat:no-repeat;line-height:inherit;margin:0}.review-widget .head .review-actions>.monaco-action-bar .action-label.codicon{margin:0}.review-widget>.body{border-top:1px solid;position:relative}.monaco-editor .comment-range-glyph{cursor:pointer;margin-left:10px;width:4px!important;z-index:10}div.preview.inline .monaco-editor .comment-range-glyph{display:none!important}.monaco-editor .comment-diff-added{border-left-style:solid;border-left-width:3px}.monaco-editor .comment-diff-added,.monaco-editor .comment-range-glyph.multiline-add{border-left-color:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-diff-added:before,.monaco-editor .comment-range-glyph.line-hover:before,.monaco-editor .comment-thread-unresolved:before,.monaco-editor .comment-thread:before{background:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-thread-range{background-color:var(--vscode-editorCommentsWidget-rangeBackground)}.monaco-editor .comment-thread-range-current{background-color:var(--vscode-editorCommentsWidget-rangeActiveBackground)}.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread,.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover{margin-left:13px}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{align-items:center;color:var(--vscode-editorGutter-commentGlyphForeground);display:flex;flex-direction:row;height:100%;justify-content:center;left:-6px;position:absolute;text-align:center;width:9px;z-index:10}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{color:var(--vscode-editorGutter-commentUnresolvedGlyphForeground)}.monaco-editor .margin-view-overlays .comment-range-glyph.multiline-add{border-left-style:dotted;border-left-width:3px;height:16px;margin-top:2px}.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{border-radius:3px;content:var(--vscode-icon-plus-content);font-family:var(--vscode-icon-plus-font-family);font-family:codicon;margin-left:-5px;padding-left:1px;width:18px!important}.monaco-editor .comment-range-glyph.comment-thread,.monaco-editor .comment-range-glyph.comment-thread-unresolved{z-index:20}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before{border-radius:3px;font-family:codicon;font-size:13px;line-height:100%;margin-left:-5px;padding-left:1px;padding-top:1px;width:18px!important;z-index:20}.monaco-editor .comment-range-glyph.comment-thread:before{content:var(--vscode-icon-comment-add-content);font-family:var(--vscode-icon-comment-add-font-family)}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{content:var(--vscode-icon-comment-unresolved-content);font-family:var(--vscode-icon-comment-unresolved-font-family)}.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-collapsed,.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-expanded{margin-left:11px}.monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph{margin-left:25px}";
+var css = ".review-widget{position:absolute;width:100%}.monaco-editor .review-widget{background-color:var(--vscode-peekViewResult-background)}.review-widget .hidden{display:none!important}.review-widget .body{overflow:hidden}.review-widget .body .review-comment{display:flex;padding:8px 16px 8px 20px}@keyframes monaco-review-widget-focus{0%{background:var(--vscode-peekViewResult-selectionBackground)}to{background:transparent}}.review-widget .body .review-comment.focus{animation:monaco-review-widget-focus 3s ease 0s}.review-widget .body .review-comment .comment-actions{margin-left:auto}.review-widget .body .review-comment .comment-actions .monaco-toolbar{height:22px}.review-widget .body .review-comment .comment-title .comment-header-info{overflow:hidden;text-overflow:ellipsis}.review-widget .body .review-comment .comment-title{display:flex;width:100%}.review-widget .body .review-comment .comment-title .action-label.codicon{line-height:18px}.review-widget .body .review-comment .comment-title .monaco-dropdown .toolbar-toggle-more{height:18px;line-height:18px;vertical-align:middle;width:16px}.review-widget .body .comment-body blockquote{border-left-style:solid;border-left-width:5px;margin:0 7px 0 5px;padding:0 16px 0 10px}.review-widget .body .review-comment .avatar-container{margin-top:4px!important}.review-widget .body .review-comment .avatar-container img.avatar{border-radius:3px;border-style:none;display:inline-block;height:28px;line-height:1;overflow:hidden;vertical-align:middle;width:28px}.review-widget .body .comment-reactions .monaco-text-button{background-color:transparent;border:1px solid grey;border-radius:3px;margin:0 7px 0 0;width:30px}.review-widget .body .review-comment .review-comment-contents{overflow:hidden;padding-left:20px;user-select:text;-webkit-user-select:text;width:100%}.review-widget .body pre{word-wrap:normal;overflow:auto;white-space:pre}.review-widget .body .review-comment .review-comment-contents .author{line-height:22px}.review-widget .body .review-comment .review-comment-contents .isPending{font-style:italic;line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .timestamp{line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .comment-body .comment-body-plainstring{white-space:pre-wrap}.review-widget .body .review-comment .review-comment-contents .comment-body{padding-top:4px}.review-widget .body .review-comment .review-comment-contents .comment-body-max-height{max-height:20em}.review-widget .body .review-comment .review-comment-contents .comment-reactions{margin-top:8px;min-height:25px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label{display:flex;font-size:12px;padding:1px 4px;text-align:center;white-space:pre}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-position:0;background-repeat:no-repeat;background-size:14px;display:inline-block;margin-right:4px;width:14px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-label{line-height:20px;margin-right:4px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.toolbar-toggle-pickReactions{background-position:50%;background-repeat:no-repeat;background-size:16px;border:none;display:none;font-size:16px;height:16px;margin-top:3px;width:26px}.review-widget .body .review-comment .review-comment-contents .comment-reactions:hover .action-item a.action-label.toolbar-toggle-pickReactions{background-size:16px;display:inline-block}.review-widget .body .review-comment .comment-title .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block;height:16px;line-height:16px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label{border:1px solid}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.disabled{opacity:.6}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover{background-color:var(--vscode-statusBarItem-hoverBackground)}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active{background-color:var(--vscode-statusBarItem-activeBackground);border:1px solid transparent}.review-widget .body .review-comment .review-comment-contents a{cursor:pointer}.review-widget .body .comment-body p,.review-widget .body .comment-body ul{margin:8px 0}.review-widget .body .comment-body p:first-child,.review-widget .body .comment-body ul:first-child{margin-top:0}.review-widget .body .comment-body p:last-child,.review-widget .body.comment-body ul:last-child{margin-bottom:0}.review-widget .body .comment-body ul{padding-left:20px}.review-widget .body .comment-body li>p{margin-bottom:0}.review-widget .body .comment-body li>ul{margin-top:0}.review-widget .body .comment-body span{white-space:pre}.review-widget .body .comment-body img{max-width:100%}.review-widget .body .comment-form{margin:8px 20px}.review-widget .validation-error{word-wrap:break-word;box-sizing:border-box;display:inline-block;font-size:12px;line-height:17px;margin-left:-1px;margin-top:-1px;min-height:34px;overflow:hidden;padding:.4em;text-align:left;width:100%}.review-widget .body .comment-additional-actions{margin:10px 20px}.review-widget .body .comment-additional-actions .section-separator{border-top:1px solid var(--vscode-menu-separatorBackground);margin:10px 0 14px}.review-widget .body .comment-additional-actions .button-bar{display:flex;white-space:nowrap}.review-widget .body .comment-additional-actions .monaco-button,.review-widget .body .comment-additional-actions .monaco-button-dropdown,.review-widget .body .comment-additional-actions .monaco-text-button{display:flex;width:auto}.review-widget .body .comment-additional-actions .button-bar>.monaco-button-dropdown,.review-widget .body .comment-additional-actions .button-bar>.monaco-text-button{margin:0 10px 0 0}.review-widget .body .comment-additional-actions .button-bar .monaco-text-button{padding:4px 10px}.review-widget .body .comment-additional-actions .codicon-drop-down-button{align-items:center}.review-widget .body .monaco-editor{color:var(--vscode-editor-foreground)}.review-widget .body .comment-form.expand .review-thread-reply-button{display:none}.review-widget .body .comment-form.expand .form-actions,.review-widget .body .comment-form.expand .monaco-editor{box-sizing:content-box;display:block}.review-widget .body .comment-form .review-thread-reply-button{background-color:var(--vscode-editorCommentsWidget-replyInputBackground);border:0;border-radius:0;box-sizing:border-box;color:var(--vscode-editor-foreground);display:block;font-family:var(--monaco-monospace-font);font-size:inherit;font-weight:600;line-height:20px;outline:1px solid transparent;padding:6px 12px;resize:vertical;text-align:left;white-space:nowrap;width:100%}.review-widget .body .comment-form .review-thread-reply-button:focus{outline-style:solid;outline-width:1px}.review-widget .body .comment-form .monaco-editor,.review-widget .body .comment-form .monaco-editor .monaco-editor-background,.review-widget .body .edit-container .monaco-editor .monaco-editor-background{background-color:var(--vscode-editorCommentsWidget-replyInputBackground)}.review-widget .body .comment-form .monaco-editor,.review-widget .body .edit-container .monaco-editor{border:0;border-radius:3px;box-sizing:content-box;max-height:500px;min-height:90px;padding:6px 0 6px 12px;width:100%}.review-widget .body .comment-form .form-actions,.review-widget .body .comment-form .monaco-editor{display:none}.review-widget .body .comment-form .form-actions,.review-widget .body .edit-container .form-actions{margin:10px 0;overflow:auto}.review-widget .body .edit-container .form-actions{padding-top:10px}.review-widget .body .edit-textarea{margin:5px 12px 10px 0}.review-widget .body .comment-form .form-actions .monaco-text-button,.review-widget .body .edit-container .monaco-text-button{margin-left:5px;padding:4px 10px;width:auto}.review-widget .body .form-actions .monaco-text-button{float:right}.review-widget .head{box-sizing:border-box;display:flex;height:100%}.review-widget .head .review-title{cursor:default;display:inline-block;font-size:13px;margin-left:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.review-widget .head .review-title .dirname:not(:empty){font-size:.9em;margin-left:.5em}.review-widget .head .review-actions{flex:1;padding-right:2px;text-align:right}.review-widget .head .review-actions>.monaco-action-bar{display:inline-block}.review-widget .head .review-actions>.monaco-action-bar,.review-widget .head .review-actions>.monaco-action-bar>.actions-container{height:100%}.review-widget .action-item{margin-left:4px;min-height:20px;min-width:18px}.review-widget .head .review-actions>.monaco-action-bar .action-label{background-position:50%;background-repeat:no-repeat;line-height:inherit;margin:0}.review-widget .head .review-actions>.monaco-action-bar .action-label.codicon{margin:0}.review-widget>.body{border-top:1px solid;position:relative}.monaco-editor .comment-range-glyph{cursor:pointer;margin-left:10px;width:4px!important;z-index:10}div.preview.inline .monaco-editor .comment-range-glyph{display:none!important}.monaco-editor .comment-diff-added{border-left-style:solid;border-left-width:3px}.monaco-editor .comment-diff-added,.monaco-editor .comment-range-glyph.multiline-add{border-left-color:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-diff-added:before,.monaco-editor .comment-range-glyph.line-hover:before,.monaco-editor .comment-thread-unresolved:before,.monaco-editor .comment-thread:before{background:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-thread-range{background-color:var(--vscode-editorCommentsWidget-rangeBackground)}.monaco-editor .comment-thread-range-current{background-color:var(--vscode-editorCommentsWidget-rangeActiveBackground)}.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread,.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover{margin-left:13px}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{align-items:center;color:var(--vscode-editorGutter-commentGlyphForeground);display:flex;flex-direction:row;height:100%;justify-content:center;left:-6px;position:absolute;text-align:center;width:9px;z-index:10}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{color:var(--vscode-editorGutter-commentUnresolvedGlyphForeground)}.monaco-editor .margin-view-overlays .comment-range-glyph.multiline-add{border-left-style:dotted;border-left-width:3px;height:16px;margin-top:2px}.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{border-radius:3px;content:var(--vscode-icon-plus-content);font-family:var(--vscode-icon-plus-font-family);font-family:codicon;margin-left:-5px;padding-left:1px;width:18px!important}.monaco-editor .comment-range-glyph.comment-thread,.monaco-editor .comment-range-glyph.comment-thread-unresolved{z-index:20}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before{border-radius:3px;font-family:codicon;font-size:13px;line-height:100%;margin-left:-5px;padding-left:1px;padding-top:1px;width:18px!important;z-index:20}.monaco-editor .comment-range-glyph.comment-thread:before{content:var(--vscode-icon-comment-add-content);font-family:var(--vscode-icon-comment-add-font-family)}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{content:var(--vscode-icon-comment-unresolved-content);font-family:var(--vscode-icon-comment-unresolved-font-family)}.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-collapsed,.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-expanded{margin-left:11px}.monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph{margin-left:25px}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/comments/browser/timestamp.js

@@ -11,7 +11,7 @@ class TimestampWidget extends Disposable {
         this._date = append(container, $('span.timestamp'));
         this._date.style.display = 'none';
         this._useRelativeTime = this.useRelativeTimeSetting;
-        this.hover = this._register(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this._date, ''));
+        this.hover = this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this._date, ''));
         this.setTimestamp(timeStamp);
     }
     get useRelativeTimeSetting() {

package/vscode/src/vs/workbench/contrib/contextmenu/browser/contextmenu.contribution.js

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
-let ContextMenuContribution = class ContextMenuContribution {
+let ContextMenuContribution = class ContextMenuContribution extends Disposable {
     constructor(layoutService, contextMenuService) {
-        this.disposables = ( new DisposableStore());
+        super();
         const update = (visible) => layoutService.activeContainer.classList.toggle('context-menu-visible', visible);
-        contextMenuService.onDidShowContextMenu(() => update(true), null, this.disposables);
-        contextMenuService.onDidHideContextMenu(() => update(false), null, this.disposables);
+        this._register(contextMenuService.onDidShowContextMenu(() => update(true)));
+        this._register(contextMenuService.onDidHideContextMenu(() => update(false)));
     }
 };
 ContextMenuContribution = ( __decorate([