@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/simpleBrowserEditorOverlay.js

@@ -13,8 +13,7 @@ import { EditorGroupView } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { joinPath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
@@ -30,7 +29,8 @@ import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IBrowserElementsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/browserElements/browser/browserElementsService.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { BrowserType } from '../../../../../platform/browserElements/common/browserElements.js';
+import { getDisplayNameFromOuterHTML } from '../../../../../platform/browserElements/common/browserElements.js';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
@@ -38,7 +38,20 @@ import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 
 registerCss(simpleBrowserOverlay);
 let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
-    constructor(_editor, _container, _hostService, _chatWidgetService, fileService, environmentService, logService, configurationService, _preferencesService, _browserElementsService, contextMenuService) {
+    constructor(
+        _editor,
+        _container,
+        _hostService,
+        _chatWidgetService,
+        fileService,
+        environmentService,
+        logService,
+        configurationService,
+        _preferencesService,
+        _browserElementsService,
+        contextMenuService,
+        telemetryService
+    ) {
         this._editor = _editor;
         this._container = _container;
         this._hostService = _hostService;
@@ -50,58 +63,60 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         this._preferencesService = _preferencesService;
         this._browserElementsService = _browserElementsService;
         this.contextMenuService = contextMenuService;
+        this.telemetryService = telemetryService;
         this._showStore = ( new DisposableStore());
         this._timeout = undefined;
-        this._activeBrowserType = undefined;
+        this._activeLocator = undefined;
+        this._browserType = undefined;
         this._showStore.add(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration('chat.sendElementsToChat.enabled')) {
-                if (this.configurationService.getValue('chat.sendElementsToChat.enabled')) {
+            if (e.affectsConfiguration("chat.sendElementsToChat.enabled")) {
+                if (this.configurationService.getValue("chat.sendElementsToChat.enabled")) {
                     this.showElement(this._domNode);
-                }
-                else {
+                } else {
                     this.hideElement(this._domNode);
                 }
             }
         }));
-        this.imagesFolder = joinPath(this.environmentService.workspaceStorageHome, 'vscode-chat-images');
+        this.imagesFolder = joinPath(this.environmentService.workspaceStorageHome, "vscode-chat-images");
         cleanupOldImages(this.fileService, this.logService, this.imagesFolder);
-        this._domNode = createElement('div');
-        this._domNode.className = 'element-selection-message';
-        const mainContent = createElement('div');
-        mainContent.className = 'element-selection-main-content';
-        const message = createElement('span');
-        const startSelectionMessage = ( localize(4976, 'Add element to chat'));
+        this._domNode = createElement("div");
+        this._domNode.className = "element-selection-message";
+        const mainContent = createElement("div");
+        mainContent.className = "element-selection-main-content";
+        const message = createElement("span");
+        const startSelectionMessage = ( localize(5105, "Add element to chat"));
         message.textContent = startSelectionMessage;
         mainContent.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
-            id: 'singleSelection',
-            label: ( localize(4977, 'Select an Element')),
+            id: "singleSelection",
+            label: ( localize(5106, "Select an Element")),
             enabled: true,
-            run: async () => { await startElementSelection(); }
+            run: async () => {
+                await startElementSelection();
+            }
         }), toAction({
-            id: 'continuousSelection',
-            label: ( localize(4978, 'Continuous Selection')),
+            id: "continuousSelection",
+            label: ( localize(5107, "Continuous Selection")),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(4979, 'Selecting element...'));
+                message.textContent = ( localize(5108, "Selecting element..."));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(4980, 'Done'));
+                cancelButton.label = ( localize(5109, "Done"));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
-                    }
-                    catch (err) {
-                        this.logService.error('Failed to select this element.', err);
+                    } catch (err) {
+                        this.logService.error("Failed to select this element.", err);
                         cts.cancel();
                         break;
                     }
                 }
-                message.textContent = ( localize(4981, 'Element added to chat'));
+                message.textContent = ( localize(5110, "Element added to chat"));
                 finishedSelecting();
             }
         }));
@@ -110,29 +125,42 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(4982, 'Click to select an element.')),
+            title: ( localize(5111, "Click to select an element.")),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(4983, 'Start'));
-        startButton.element.classList.add('element-selection-start');
-        const cancelButton = this._showStore.add(( new Button(
-            mainContent,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4984, 'Click to cancel selection.')) }
-        )));
-        cancelButton.element.className = 'element-selection-cancel hidden';
-        const cancelButtonLabel = ( localize(4985, 'Cancel'));
+        startButton.primaryButton.label = ( localize(5112, "Start"));
+        startButton.element.classList.add("element-selection-start");
+        const cancelButton = this._showStore.add(( new Button(mainContent, {
+            ...defaultButtonStyles,
+            supportIcons: true,
+            title: ( localize(5113, "Click to cancel selection."))
+        })));
+        cancelButton.element.className = "element-selection-cancel hidden";
+        const cancelButtonLabel = ( localize(5114, "Cancel"));
         cancelButton.label = cancelButtonLabel;
-        const configure = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(4986, "Configure Attachments Sent")) })));
+        const configure = this._showStore.add(( new Button(mainContent, {
+            supportIcons: true,
+            title: ( localize(5115, "Configure Attachments Sent"))
+        })));
         configure.icon = Codicon.gear;
-        const collapseOverlay = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(4987, "Collapse Overlay")) })));
+        const collapseOverlay = this._showStore.add(( new Button(mainContent, {
+            supportIcons: true,
+            title: ( localize(5116, "Collapse Overlay"))
+        })));
         collapseOverlay.icon = Codicon.chevronRight;
-        const nextSelection = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(4988, "Select Again")) })));
+        const nextSelection = this._showStore.add(( new Button(mainContent, {
+            supportIcons: true,
+            title: ( localize(5117, "Select Again"))
+        })));
         nextSelection.icon = Codicon.close;
-        nextSelection.element.classList.add('hidden');
-        const expandContainer = createElement('div');
-        expandContainer.className = 'element-expand-container hidden';
-        const expandOverlay = this._showStore.add(( new Button(expandContainer, { supportIcons: true, title: ( localize(4989, "Expand Overlay")) })));
+        nextSelection.element.classList.add("hidden");
+        const expandContainer = createElement("div");
+        expandContainer.className = "element-expand-container hidden";
+        const expandOverlay = this._showStore.add(( new Button(expandContainer, {
+            supportIcons: true,
+            title: ( localize(5118, "Expand Overlay"))
+        })));
         expandOverlay.icon = Codicon.layout;
         this._domNode.appendChild(mainContent);
         this._domNode.appendChild(expandContainer);
@@ -154,106 +182,118 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(4979, 'Selecting element...'));
+            message.textContent = ( localize(5108, "Selecting element..."));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(4981, 'Element added to chat'));
+            message.textContent = ( localize(5110, "Element added to chat"));
             finishedSelecting();
         };
-        this._showStore.add(addDisposableListener(startButton.primaryButton.element, 'click', async () => {
-            await startElementSelection();
-        }));
-        this._showStore.add(addDisposableListener(cancelButton.element, 'click', () => {
+        this._showStore.add(
+            addDisposableListener(startButton.primaryButton.element, "click", async () => {
+                await startElementSelection();
+            })
+        );
+        this._showStore.add(addDisposableListener(cancelButton.element, "click", () => {
             cts.cancel();
-            message.textContent = ( localize(4990, 'Selection canceled'));
+            message.textContent = ( localize(5119, "Selection canceled"));
             finishedSelecting();
         }));
-        this._showStore.add(addDisposableListener(collapseOverlay.element, 'click', () => {
+        this._showStore.add(addDisposableListener(collapseOverlay.element, "click", () => {
             this.hideElement(mainContent);
             this.showElement(expandContainer);
         }));
-        this._showStore.add(addDisposableListener(expandOverlay.element, 'click', () => {
+        this._showStore.add(addDisposableListener(expandOverlay.element, "click", () => {
             this.showElement(mainContent);
             this.hideElement(expandContainer);
         }));
-        this._showStore.add(addDisposableListener(nextSelection.element, 'click', () => {
+        this._showStore.add(addDisposableListener(nextSelection.element, "click", () => {
             clearTimeout(this._timeout);
             message.textContent = startSelectionMessage;
             resetButtons();
         }));
-        this._showStore.add(addDisposableListener(configure.element, 'click', () => {
-            this._preferencesService.openSettings({ jsonEditor: false, query: '@id:chat.sendElementsToChat.enabled,chat.sendElementsToChat.attachCSS,chat.sendElementsToChat.attachImages' });
+        this._showStore.add(addDisposableListener(configure.element, "click", () => {
+            this._preferencesService.openSettings({
+                jsonEditor: false,
+                query: "@id:chat.sendElementsToChat.enabled,chat.sendElementsToChat.attachCSS,chat.sendElementsToChat.attachImages"
+            });
         }));
     }
-    setActiveBrowserType(type) {
-        this._activeBrowserType = type;
+    setActiveLocator(locator, browserType) {
+        this._activeLocator = locator;
+        this._browserType = browserType;
     }
     hideElement(element) {
-        if (element.classList.contains('hidden')) {
+        if (element.classList.contains("hidden")) {
             return;
         }
-        element.classList.add('hidden');
+        element.classList.add("hidden");
     }
     showElement(element) {
-        if (!element.classList.contains('hidden')) {
+        if (!element.classList.contains("hidden")) {
             return;
         }
-        element.classList.remove('hidden');
+        element.classList.remove("hidden");
     }
     async addElementToChat(cts) {
-        const editorContainer = this._container.querySelector('.editor-container');
+        this.telemetryService.publicLog2("simpleBrowser.addElementToChat.start", {
+            browserType: this._browserType
+        });
+        const editorContainer = this._container.querySelector(".editor-container");
         const editorContainerPosition = editorContainer ? editorContainer.getBoundingClientRect() : this._container.getBoundingClientRect();
-        const elementData = await this._browserElementsService.getElementData(editorContainerPosition, cts.token, this._activeBrowserType);
+        const elementData = await this._browserElementsService.getElementData({
+            x: editorContainerPosition.x,
+            y: editorContainerPosition.y + 32.4,
+            width: editorContainerPosition.width,
+            height: editorContainerPosition.height - 32.4
+        }, cts.token, this._activeLocator);
         if (!elementData) {
-            throw ( new Error('Element data not found'));
+            throw ( new Error("Element data not found"));
         }
         const bounds = elementData.bounds;
         const toAttach = [];
         const widget = (await this._chatWidgetService.revealWidget()) ?? this._chatWidgetService.lastFocusedWidget;
-        let value = 'Attached HTML and CSS Context\n\n' + elementData.outerHTML;
-        if (this.configurationService.getValue('chat.sendElementsToChat.attachCSS')) {
-            value += '\n\n' + elementData.computedStyle;
+        const attachCss = this.configurationService.getValue("chat.sendElementsToChat.attachCSS");
+        let value = (attachCss ? "Attached HTML and CSS Context" : "Attached HTML Context") + "\n\n" + elementData.outerHTML;
+        if (attachCss) {
+            value += "\n\n" + elementData.computedStyle;
         }
+        const displayName = getDisplayNameFromOuterHTML(elementData.outerHTML);
         toAttach.push({
-            id: 'element-' + Date.now(),
-            name: this.getDisplayNameFromOuterHTML(elementData.outerHTML),
-            fullName: this.getDisplayNameFromOuterHTML(elementData.outerHTML),
+            id: "element-" + Date.now(),
+            name: displayName,
+            fullName: displayName,
             value: value,
-            kind: 'element',
-            icon: ThemeIcon.fromId(Codicon.layout.id),
+            kind: "element",
+            icon: ThemeIcon.fromId(Codicon.layout.id)
         });
-        if (this.configurationService.getValue('chat.sendElementsToChat.attachImages')) {
-            this._domNode.style.display = 'none';
+        if (this.configurationService.getValue("chat.sendElementsToChat.attachImages")) {
+            this._domNode.style.display = "none";
             await ( new Promise(resolve => setTimeout(resolve, 100)));
             const screenshot = await this._hostService.getScreenshot(bounds);
             if (!screenshot) {
-                throw ( new Error('Screenshot failed'));
+                throw ( new Error("Screenshot failed"));
             }
-            const fileReference = await createFileForMedia(this.fileService, this.imagesFolder, screenshot.buffer, 'image/png');
+            const fileReference = await createFileForMedia(this.fileService, this.imagesFolder, screenshot.buffer, "image/png");
             toAttach.push({
-                id: 'element-screenshot-' + Date.now(),
-                name: 'Element Screenshot',
-                fullName: 'Element Screenshot',
-                kind: 'image',
+                id: "element-screenshot-" + Date.now(),
+                name: "Element Screenshot",
+                fullName: "Element Screenshot",
+                kind: "image",
                 value: screenshot.buffer,
-                references: fileReference ? [{ reference: fileReference, kind: 'reference' }] : [],
+                references: fileReference ? [{
+                    reference: fileReference,
+                    kind: "reference"
+                }] : []
             });
-            this._domNode.style.display = '';
+            this._domNode.style.display = "";
         }
         widget?.attachmentModel?.addContext(...toAttach);
-    }
-    getDisplayNameFromOuterHTML(outerHTML) {
-        const firstElementMatch = outerHTML.match(/^<(\w+)([^>]*?)>/);
-        if (!firstElementMatch) {
-            throw ( new Error('No outer element found'));
-        }
-        const tagName = firstElementMatch[1];
-        const idMatch = firstElementMatch[2].match(/\s+id\s*=\s*["']([^"']+)["']/i);
-        const id = idMatch ? `#${idMatch[1]}` : '';
-        const classMatch = firstElementMatch[2].match(/\s+class\s*=\s*["']([^"']+)["']/i);
-        const className = classMatch ? `.${classMatch[1].replace(/\s+/g, '.')}` : '';
-        return `${tagName}${id}${className}`;
+        this.telemetryService.publicLog2("simpleBrowser.addElementToChat.added", {
+            browserType: this._browserType,
+            attachCss,
+            attachImages: this.configurationService.getValue("chat.sendElementsToChat.attachImages") ?? false
+        });
     }
     dispose() {
         this._showStore.dispose();
@@ -262,28 +302,24 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         return this._domNode;
     }
 };
-SimpleBrowserOverlayWidget = ( __decorate([
-    ( __param(2, IHostService)),
-    ( __param(3, IChatWidgetService)),
-    ( __param(4, IFileService)),
-    ( __param(5, IEnvironmentService)),
-    ( __param(6, ILogService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IPreferencesService)),
-    ( __param(9, IBrowserElementsService)),
-    ( __param(10, IContextMenuService))
-], SimpleBrowserOverlayWidget));
+SimpleBrowserOverlayWidget = ( __decorate([( __param(2, IHostService)), ( __param(3, IChatWidgetService)), ( __param(4, IFileService)), ( __param(5, IEnvironmentService)), ( __param(6, ILogService)), ( __param(7, IConfigurationService)), ( __param(8, IPreferencesService)), ( __param(9, IBrowserElementsService)), ( __param(10, IContextMenuService)), ( __param(11, ITelemetryService))], SimpleBrowserOverlayWidget));
 let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
-    constructor(container, group, instaService, configurationService, _browserElementsService) {
+    constructor(
+        container,
+        group,
+        instaService,
+        configurationService,
+        _browserElementsService
+    ) {
         this.configurationService = configurationService;
         this._browserElementsService = _browserElementsService;
         this._store = ( new DisposableStore());
-        this._domNode = createElement('div');
-        if (!this.configurationService.getValue('chat.sendElementsToChat.enabled')) {
+        this._domNode = createElement("div");
+        if (!this.configurationService.getValue("chat.sendElementsToChat.enabled")) {
             return;
         }
-        this._domNode.classList.add('chat-simple-browser-overlay');
-        this._domNode.style.position = 'absolute';
+        this._domNode.classList.add("chat-simple-browser-overlay");
+        this._domNode.style.position = "absolute";
         this._domNode.style.bottom = `5px`;
         this._domNode.style.right = `5px`;
         this._domNode.style.zIndex = `100`;
@@ -291,30 +327,25 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         this._domNode.appendChild(widget.getDomNode());
         this._store.add(toDisposable(() => this._domNode.remove()));
         this._store.add(widget);
-        const connectingWebviewElement = createElement('div');
-        connectingWebviewElement.className = 'connecting-webview-element';
-        const getActiveBrowserType = () => {
-            const editor = group.activeEditorPane;
-            const isSimpleBrowser = editor?.input.editorId === 'mainThreadWebview-simpleBrowser.view';
-            const isLiveServer = editor?.input.editorId === 'mainThreadWebview-browserPreview';
-            return isSimpleBrowser ? BrowserType.SimpleBrowser : isLiveServer ? BrowserType.LiveServer : undefined;
-        };
+        const connectingWebviewElement = createElement("div");
+        connectingWebviewElement.className = "connecting-webview-element";
         let cts = ( new CancellationTokenSource());
-        const show = async () => {
-            connectingWebviewElement.textContent = ( localize(4991, 'Connecting to webview...'));
+        const show = async (locator, browserType) => {
+            widget.setActiveLocator(locator, browserType);
+            connectingWebviewElement.textContent = ( localize(5120, "Connecting to webview..."));
             if (!container.contains(connectingWebviewElement)) {
                 container.appendChild(connectingWebviewElement);
             }
+            cts.cancel();
             cts = ( new CancellationTokenSource());
-            const activeBrowserType = getActiveBrowserType();
-            if (activeBrowserType) {
-                try {
-                    await this._browserElementsService.startDebugSession(cts.token, activeBrowserType);
-                }
-                catch (error) {
-                    connectingWebviewElement.textContent = ( localize(4992, 'Please reopen the preview.'));
-                    return;
-                }
+            try {
+                await this._browserElementsService.startDebugSession(cts.token, locator);
+            } catch (error) {
+                connectingWebviewElement.textContent = ( localize(5121, "Please reopen the preview."));
+                return;
+            }
+            if (cts.token.isCancellationRequested) {
+                return;
             }
             if (!container.contains(this._domNode)) {
                 container.appendChild(this._domNode);
@@ -322,48 +353,57 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
             connectingWebviewElement.remove();
         };
         const hide = () => {
+            widget.setActiveLocator(undefined, undefined);
+            cts.cancel();
             if (container.contains(this._domNode)) {
-                cts.cancel();
                 this._domNode.remove();
             }
             connectingWebviewElement.remove();
         };
         const activeEditorSignal = observableSignalFromEvent(this, Event.any(group.onDidActiveEditorChange, group.onDidModelChange));
-        const activeUriObs = derivedOpts({ equalsFn: isEqual }, r => {
+        const activeIdObs = derivedOpts({}, r => {
             activeEditorSignal.read(r);
             const editor = group.activeEditorPane;
-            const activeBrowser = getActiveBrowserType();
-            widget.setActiveBrowserType(activeBrowser);
-            if (activeBrowser) {
-                const uri = EditorResourceAccessor.getOriginalUri(editor?.input, { supportSideBySide: SideBySideEditor.PRIMARY });
-                return uri;
+            const isSimpleBrowser = editor?.input.editorId === "mainThreadWebview-simpleBrowser.view";
+            const isLiveServer = editor?.input.editorId === "mainThreadWebview-browserPreview";
+            if (isSimpleBrowser || isLiveServer) {
+                const webviewInput = editor.input;
+                const browserType = isSimpleBrowser ? "simpleBrowser" : "livePreview";
+                return {
+                    webviewId: webviewInput.webview.container.id,
+                    browserType
+                };
             }
             return undefined;
         });
         this._store.add(autorun(r => {
-            const data = activeUriObs.read(r);
-            if (!data) {
+            const activeEditor = activeIdObs.read(r);
+            if (!activeEditor) {
                 hide();
                 return;
             }
-            show();
+            show({
+                webviewId: activeEditor.webviewId
+            }, activeEditor.browserType);
         }));
     }
     dispose() {
         this._store.dispose();
     }
 };
-SimpleBrowserOverlayController = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IBrowserElementsService))
-], SimpleBrowserOverlayController));
+SimpleBrowserOverlayController = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IConfigurationService)), ( __param(4, IBrowserElementsService))], SimpleBrowserOverlayController));
 let SimpleBrowserOverlay = class SimpleBrowserOverlay {
-    static { this.ID = 'chat.simpleBrowser.overlay'; }
+    static {
+        this.ID = "chat.simpleBrowser.overlay";
+    }
     constructor(editorGroupsService, instantiationService) {
         this._store = ( new DisposableStore());
-        const editorGroups = observableFromEvent(this, Event.any(editorGroupsService.onDidAddGroup, editorGroupsService.onDidRemoveGroup), () => editorGroupsService.groups);
-        const overlayWidgets = ( new DisposableMap());
+        const editorGroups = observableFromEvent(
+            this,
+            Event.any(editorGroupsService.onDidAddGroup, editorGroupsService.onDidRemoveGroup),
+            () => editorGroupsService.groups
+        );
+        const overlayWidgets = this._store.add(( new DisposableMap()));
         this._store.add(autorun(r => {
             const toDelete = ( new Set(( overlayWidgets.keys())));
             const groups = editorGroups.read(r);
@@ -388,9 +428,6 @@ let SimpleBrowserOverlay = class SimpleBrowserOverlay {
         this._store.dispose();
     }
 };
-SimpleBrowserOverlay = ( __decorate([
-    ( __param(0, IEditorGroupsService)),
-    ( __param(1, IInstantiationService))
-], SimpleBrowserOverlay));
+SimpleBrowserOverlay = ( __decorate([( __param(0, IEditorGroupsService)), ( __param(1, IInstantiationService))], SimpleBrowserOverlay));
 
 export { SimpleBrowserOverlay };