@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/services/language/common/languageService.js

@@ -17,6 +17,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { index } from '../../../../base/common/arrays.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { isString } from '../../../../base/common/types.js';
 const _moduleId = "vs/workbench/services/language/common/languageService";
 const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languages',
@@ -139,6 +140,9 @@ class LanguageTableRenderer extends Disposable {
         const byId = index(languages, l => l.id);
         const grammars = contributes?.grammars || [];
         grammars.forEach(grammar => {
+            if (!isString(grammar.language)) {
+                return;
+            }
             let language = byId[grammar.language];
             if (language) {
                 language.hasGrammar = true;
@@ -151,6 +155,9 @@ class LanguageTableRenderer extends Disposable {
         });
         const snippets = contributes?.snippets || [];
         snippets.forEach(snippet => {
+            if (!isString(snippet.language)) {
+                return;
+            }
             let language = byId[snippet.language];
             if (language) {
                 language.hasSnippets = true;

package/vscode/src/vs/workbench/services/layout/browser/layoutService.js

@@ -97,7 +97,7 @@ function panelOpensMaximizedFromString(str) {
 }
 function shouldShowCustomTitleBar(configurationService, window, menuBarToggled, zenModeActive) {
     if (zenModeActive) {
-        return false;
+        return !configurationService.getValue(ZenModeSettings.FULLSCREEN);
     }
     const inFullscreen = isFullscreen(window);
     const nativeTitleBarEnabled = hasNativeTitlebar(configurationService);

package/vscode/src/vs/workbench/services/preferences/common/preferences.d.ts

@@ -4,7 +4,7 @@ import { IJSONSchemaMap, IJSONSchema } from '../../../../base/common/jsonSchema.
 import { URI } from '../../../../base/common/uri.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import '../../../../editor/editor.api.js';
-import { ConfigurationScope, IExtensionInfo, EditPresentationTypes } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ConfigurationScope, IExtensionInfo, EditPresentationTypes, ConfigurationDefaultValueSource } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 
@@ -54,7 +54,7 @@ interface ISetting {
     enumItemLabels?: string[];
     allKeysAreBoolean?: boolean;
     editPresentation?: EditPresentationTypes;
-    nonLanguageSpecificDefaultValueSource?: string | IExtensionInfo;
+    nonLanguageSpecificDefaultValueSource?: ConfigurationDefaultValueSource;
     isLanguageTagSetting?: boolean;
     categoryLabel?: string;
     displayExtensionId?: string;

package/vscode/src/vs/workbench/services/search/common/search.js

@@ -11,6 +11,7 @@ const VIEWLET_ID = 'workbench.view.search';
 const VIEW_ID = 'workbench.view.search';
 const SEARCH_RESULT_LANGUAGE_ID = 'search-result';
 const SEARCH_EXCLUDE_CONFIG = 'search.exclude';
+const DEFAULT_MAX_SEARCH_RESULTS = 20000;
 const SEARCH_ELIDED_PREFIX = '⟪ ';
 const SEARCH_ELIDED_SUFFIX = ' characters skipped ⟫';
 const SEARCH_ELIDED_MIN_LEN = (SEARCH_ELIDED_PREFIX.length + SEARCH_ELIDED_SUFFIX.length + 5) * 2;
@@ -303,4 +304,4 @@ function listToMap(list) {
     }
     return map;
 }
-export { FileMatch, OneLineRange, QueryGlobTester, QueryType, SEARCH_EXCLUDE_CONFIG, SEARCH_RESULT_LANGUAGE_ID, SearchCompletionExitCode, SearchError, SearchErrorCode, SearchProviderType, SearchRange, SearchSortOrder, TextSearchMatch, VIEWLET_ID, VIEW_ID, ViewMode, deserializeSearchError, getExcludes, hasSiblingFn, hasSiblingPromiseFn, isFileMatch, isProgressMessage, pathIncludedInQuery, resolvePatternsForProvider, resultIsMatch };
+export { DEFAULT_MAX_SEARCH_RESULTS, FileMatch, OneLineRange, QueryGlobTester, QueryType, SEARCH_EXCLUDE_CONFIG, SEARCH_RESULT_LANGUAGE_ID, SearchCompletionExitCode, SearchError, SearchErrorCode, SearchProviderType, SearchRange, SearchSortOrder, TextSearchMatch, VIEWLET_ID, VIEW_ID, ViewMode, deserializeSearchError, getExcludes, hasSiblingFn, hasSiblingPromiseFn, isFileMatch, isProgressMessage, pathIncludedInQuery, resolvePatternsForProvider, resultIsMatch };

package/vscode/src/vs/workbench/services/search/common/textSearchManager.js

@@ -6,7 +6,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { basename } from '../../../../base/common/path.js';
 import { isEqual, relativePath, dirname } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
-import { QueryType, resolvePatternsForProvider, QueryGlobTester, hasSiblingPromiseFn } from './search.js';
+import { QueryType, resolvePatternsForProvider, DEFAULT_MAX_SEARCH_RESULTS, QueryGlobTester, hasSiblingPromiseFn } from './search.js';
 class TextSearchManager {
     constructor(queryProviderPair, fileUtils, processType) {
         this.queryProviderPair = queryProviderPair;
@@ -172,7 +172,7 @@ class TextSearchManager {
             followSymlinks: !fq.ignoreSymlinks,
             encoding: fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding),
             maxFileSize: this.query.maxFileSize,
-            maxResults: this.query.maxResults ?? Number.MAX_SAFE_INTEGER,
+            maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
             previewOptions: this.query.previewOptions,
             afterContext: this.query.afterContext,
             beforeContext: this.query.beforeContext

package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.d.ts

@@ -107,9 +107,9 @@ interface IStatusbarEntry {
     readonly showBeak?: boolean;
     /**
      * Will enable a spinning icon in front of the text to indicate progress. When `true` is
-     * specified, `syncing` will be used.
+     * specified, `loading` will be used.
      */
-    readonly showProgress?: boolean | 'syncing' | 'loading';
+    readonly showProgress?: boolean | 'loading' | 'syncing';
     /**
      * The kind of status bar entry. This applies different colors to the entry.
      */

package/vscode/src/vs/workbench/services/textfile/common/encoding.js

@@ -1,6 +1,7 @@
 import { listenStream, newWriteableStream } from '../../../../base/common/stream.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { coalesce } from '../../../../base/common/arrays.js';
 const UTF8 = 'utf8';
 const UTF8_with_bom = 'utf8bom';
 const UTF16be = 'utf16be';
@@ -67,7 +68,7 @@ function toDecodeStream(source, options) {
                 const detected = await detectEncodingFromBuffer({
                     buffer: VSBuffer.concat(bufferedChunks),
                     bytesRead: bytesBuffered
-                }, options.guessEncoding);
+                }, options.guessEncoding, options.candidateGuessEncodings);
                 if (detected.seemsBinary && options.acceptTextOnly) {
                     throw ( new DecodeStreamError(
                         'Stream is binary but only text is accepted for decoding',
@@ -184,11 +185,17 @@ function detectEncodingByBOMFromBuffer(buffer, bytesRead) {
     return null;
 }
 const IGNORE_ENCODINGS = ['ascii', 'utf-16', 'utf-32'];
-async function guessEncodingByBuffer(buffer) {
+async function guessEncodingByBuffer(buffer, candidateGuessEncodings) {
     const jschardet = await import('jschardet').then(module => module.default ?? module);
     const limitedBuffer = buffer.slice(0, AUTO_ENCODING_GUESS_MAX_BYTES);
     const binaryString = encodeLatin1(limitedBuffer.buffer);
-    const guessed = jschardet.detect(binaryString);
+    if (candidateGuessEncodings) {
+        candidateGuessEncodings = coalesce(( candidateGuessEncodings.map(e => toJschardetEncoding(e))));
+        if (candidateGuessEncodings.length === 0) {
+            candidateGuessEncodings = undefined;
+        }
+    }
+    const guessed = jschardet.detect(binaryString, candidateGuessEncodings ? { detectEncodings: candidateGuessEncodings } : undefined);
     if (!guessed || !guessed.encoding) {
         return null;
     }
@@ -202,11 +209,19 @@ const JSCHARDET_TO_ICONV_ENCODINGS = {
     'ibm866': 'cp866',
     'big5': 'cp950'
 };
+function normalizeEncoding(encodingName) {
+    return encodingName.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+}
 function toIconvLiteEncoding(encodingName) {
-    const normalizedEncodingName = encodingName.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+    const normalizedEncodingName = normalizeEncoding(encodingName);
     const mapped = JSCHARDET_TO_ICONV_ENCODINGS[normalizedEncodingName];
     return mapped || normalizedEncodingName;
 }
+function toJschardetEncoding(encodingName) {
+    const normalizedEncodingName = normalizeEncoding(encodingName);
+    const mapped = GUESSABLE_ENCODINGS[normalizedEncodingName];
+    return mapped.guessableName;
+}
 function encodeLatin1(buffer) {
     let result = '';
     for (let i = 0; i < buffer.length; i++) {
@@ -214,7 +229,7 @@ function encodeLatin1(buffer) {
     }
     return result;
 }
-function detectEncodingFromBuffer({ buffer, bytesRead }, autoGuessEncoding) {
+function detectEncodingFromBuffer({ buffer, bytesRead }, autoGuessEncoding, candidateGuessEncodings) {
     let encoding = detectEncodingByBOMFromBuffer(buffer, bytesRead);
     let seemsBinary = false;
     if (encoding !== UTF16be && encoding !== UTF16le && buffer) {
@@ -250,7 +265,7 @@ function detectEncodingFromBuffer({ buffer, bytesRead }, autoGuessEncoding) {
         }
     }
     if (autoGuessEncoding && !seemsBinary && !encoding && buffer) {
-        return guessEncodingByBuffer(buffer.slice(0, bytesRead)).then(guessedEncoding => {
+        return guessEncodingByBuffer(buffer.slice(0, bytesRead), candidateGuessEncodings).then(guessedEncoding => {
             return {
                 seemsBinary: false,
                 encoding: guessedEncoding
@@ -264,7 +279,8 @@ const SUPPORTED_ENCODINGS = {
         labelLong: 'UTF-8',
         labelShort: 'UTF-8',
         order: 1,
-        alias: 'utf8bom'
+        alias: 'utf8bom',
+        guessableName: 'UTF-8'
     },
     utf8bom: {
         labelLong: 'UTF-8 with BOM',
@@ -276,17 +292,20 @@ const SUPPORTED_ENCODINGS = {
     utf16le: {
         labelLong: 'UTF-16 LE',
         labelShort: 'UTF-16 LE',
-        order: 3
+        order: 3,
+        guessableName: 'UTF-16LE'
     },
     utf16be: {
         labelLong: 'UTF-16 BE',
         labelShort: 'UTF-16 BE',
-        order: 4
+        order: 4,
+        guessableName: 'UTF-16BE'
     },
     windows1252: {
         labelLong: 'Western (Windows 1252)',
         labelShort: 'Windows 1252',
-        order: 5
+        order: 5,
+        guessableName: 'windows-1252'
     },
     iso88591: {
         labelLong: 'Western (ISO 8859-1)',
@@ -341,12 +360,14 @@ const SUPPORTED_ENCODINGS = {
     windows1250: {
         labelLong: 'Central European (Windows 1250)',
         labelShort: 'Windows 1250',
-        order: 16
+        order: 16,
+        guessableName: 'windows-1250'
     },
     iso88592: {
         labelLong: 'Central European (ISO 8859-2)',
         labelShort: 'ISO 8859-2',
-        order: 17
+        order: 17,
+        guessableName: 'ISO-8859-2'
     },
     cp852: {
         labelLong: 'Central European (CP 852)',
@@ -356,22 +377,26 @@ const SUPPORTED_ENCODINGS = {
     windows1251: {
         labelLong: 'Cyrillic (Windows 1251)',
         labelShort: 'Windows 1251',
-        order: 19
+        order: 19,
+        guessableName: 'windows-1251'
     },
     cp866: {
         labelLong: 'Cyrillic (CP 866)',
         labelShort: 'CP 866',
-        order: 20
+        order: 20,
+        guessableName: 'IBM866'
     },
     iso88595: {
         labelLong: 'Cyrillic (ISO 8859-5)',
         labelShort: 'ISO 8859-5',
-        order: 21
+        order: 21,
+        guessableName: 'ISO-8859-5'
     },
     koi8r: {
         labelLong: 'Cyrillic (KOI8-R)',
         labelShort: 'KOI8-R',
-        order: 22
+        order: 22,
+        guessableName: 'KOI8-R'
     },
     koi8u: {
         labelLong: 'Cyrillic (KOI8-U)',
@@ -386,22 +411,26 @@ const SUPPORTED_ENCODINGS = {
     windows1253: {
         labelLong: 'Greek (Windows 1253)',
         labelShort: 'Windows 1253',
-        order: 25
+        order: 25,
+        guessableName: 'windows-1253'
     },
     iso88597: {
         labelLong: 'Greek (ISO 8859-7)',
         labelShort: 'ISO 8859-7',
-        order: 26
+        order: 26,
+        guessableName: 'ISO-8859-7'
     },
     windows1255: {
         labelLong: 'Hebrew (Windows 1255)',
         labelShort: 'Windows 1255',
-        order: 27
+        order: 27,
+        guessableName: 'windows-1255'
     },
     iso88598: {
         labelLong: 'Hebrew (ISO 8859-8)',
         labelShort: 'ISO 8859-8',
-        order: 28
+        order: 28,
+        guessableName: 'ISO-8859-8'
     },
     iso885910: {
         labelLong: 'Nordic (ISO 8859-10)',
@@ -441,7 +470,8 @@ const SUPPORTED_ENCODINGS = {
     cp950: {
         labelLong: 'Traditional Chinese (Big5)',
         labelShort: 'Big5',
-        order: 36
+        order: 36,
+        guessableName: 'Big5'
     },
     big5hkscs: {
         labelLong: 'Traditional Chinese (Big5-HKSCS)',
@@ -451,17 +481,20 @@ const SUPPORTED_ENCODINGS = {
     shiftjis: {
         labelLong: 'Japanese (Shift JIS)',
         labelShort: 'Shift JIS',
-        order: 38
+        order: 38,
+        guessableName: 'SHIFT_JIS'
     },
     eucjp: {
         labelLong: 'Japanese (EUC-JP)',
         labelShort: 'EUC-JP',
-        order: 39
+        order: 39,
+        guessableName: 'EUC-JP'
     },
     euckr: {
         labelLong: 'Korean (EUC-KR)',
         labelShort: 'EUC-KR',
-        order: 40
+        order: 40,
+        guessableName: 'EUC-KR'
     },
     windows874: {
         labelLong: 'Thai (Windows 874)',
@@ -486,7 +519,8 @@ const SUPPORTED_ENCODINGS = {
     gb2312: {
         labelLong: 'Simplified Chinese (GB 2312)',
         labelShort: 'GB 2312',
-        order: 45
+        order: 45,
+        guessableName: 'GB2312'
     },
     cp865: {
         labelLong: 'Nordic DOS (CP 865)',
@@ -499,4 +533,13 @@ const SUPPORTED_ENCODINGS = {
         order: 47
     }
 };
-export { DecodeStreamError, DecodeStreamErrorKind, SUPPORTED_ENCODINGS, UTF16be, UTF16be_BOM, UTF16le, UTF16le_BOM, UTF8, UTF8_BOM, UTF8_with_bom, detectEncodingByBOMFromBuffer, detectEncodingFromBuffer, encodingExists, toDecodeStream, toEncodeReadable, toNodeEncoding };
+const GUESSABLE_ENCODINGS = (() => {
+    const guessableEncodings = {};
+    for (const encoding in SUPPORTED_ENCODINGS) {
+        if (SUPPORTED_ENCODINGS[encoding].guessableName) {
+            guessableEncodings[encoding] = SUPPORTED_ENCODINGS[encoding];
+        }
+    }
+    return guessableEncodings;
+})();
+export { DecodeStreamError, DecodeStreamErrorKind, GUESSABLE_ENCODINGS, SUPPORTED_ENCODINGS, UTF16be, UTF16be_BOM, UTF16le, UTF16le_BOM, UTF8, UTF8_BOM, UTF8_with_bom, detectEncodingByBOMFromBuffer, detectEncodingFromBuffer, encodingExists, toDecodeStream, toEncodeReadable, toNodeEncoding };

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js

@@ -28,6 +28,8 @@ import { extUri } from '../../../../base/common/resources.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 var TextFileEditorModel_1;
 const _moduleId = "vs/workbench/services/textfile/common/textFileEditorModel";
 let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel {
@@ -35,7 +37,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
     static { this.TEXTFILE_SAVE_ENCODING_SOURCE = SaveSourceRegistry.registerSource('textFileEncoding.source', ( localizeWithPath(_moduleId, 0, "File Encoding Changed"))); }
     static { this.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD = 500; }
     constructor(resource, preferredEncoding,
-    preferredLanguageId, languageService, modelService, fileService, textFileService, workingCopyBackupService, logService, workingCopyService, filesConfigurationService, labelService, languageDetectionService, accessibilityService, pathService, extensionService) {
+    preferredLanguageId, languageService, modelService, fileService, textFileService, workingCopyBackupService, logService, workingCopyService, filesConfigurationService, labelService, languageDetectionService, accessibilityService, pathService, extensionService, progressService) {
         super(modelService, languageService, languageDetectionService, accessibilityService);
         this.resource = resource;
         this.preferredEncoding = preferredEncoding;
@@ -49,6 +51,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         this.labelService = labelService;
         this.pathService = pathService;
         this.extensionService = extensionService;
+        this.progressService = progressService;
         this._onDidChangeContent = this._register(( (new Emitter())));
         this.onDidChangeContent = this._onDidChangeContent.event;
         this._onDidResolve = this._register(( (new Emitter())));
@@ -476,7 +479,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         if (typeof options.reason !== 'number') {
             options.reason = SaveReason.EXPLICIT;
         }
-        let versionId = this.versionId;
+        const versionId = this.versionId;
         this.trace(`doSave(${versionId}) - enter with versionId ${versionId}`);
         if (this.ignoreSaveFromSaveParticipants) {
             this.trace(`doSave(${versionId}) - exit - refusing to save() recursively from save participant`);
@@ -499,6 +502,20 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             this.textEditorModel.pushStackElement();
         }
         const saveCancellation = ( (new CancellationTokenSource()));
+        return this.progressService.withProgress({
+            title: ( localizeWithPath(_moduleId, 1, "Saving '{0}'", this.name)),
+            location: ProgressLocation.Window,
+            cancellable: true,
+            delay: this.isDirty() ? 3000 : 5000
+        }, progress => {
+            return this.doSaveSequential(versionId, options, progress, saveCancellation);
+        }, () => {
+            saveCancellation.cancel();
+        }).finally(() => {
+            saveCancellation.dispose();
+        });
+    }
+    doSaveSequential(versionId, options, progress, saveCancellation) {
         return this.saveSequentializer.run(versionId, (async () => {
             if (this.isResolved() && !options.skipSaveParticipants) {
                 try {
@@ -511,7 +528,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
                     if (!saveCancellation.token.isCancellationRequested) {
                         this.ignoreSaveFromSaveParticipants = true;
                         try {
-                            await this.textFileService.files.runSaveParticipants(this, { reason: options.reason ?? SaveReason.EXPLICIT, savedFrom: options.from }, saveCancellation.token);
+                            await this.textFileService.files.runSaveParticipants(this, { reason: options.reason ?? SaveReason.EXPLICIT, savedFrom: options.from }, progress, saveCancellation.token);
                         }
                         finally {
                             this.ignoreSaveFromSaveParticipants = false;
@@ -536,6 +553,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             }
             versionId = this.versionId;
             this.inErrorMode = false;
+            progress.report({ message: ( localizeWithPath(_moduleId, 2, "Writing into file...")) });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
             const resolvedTextFileEditorModel = this;
@@ -719,6 +737,7 @@ TextFileEditorModel = TextFileEditorModel_1 = ( (__decorate([
     ( (__param(12, ILanguageDetectionService))),
     ( (__param(13, IAccessibilityService))),
     ( (__param(14, IPathService))),
-    ( (__param(15, IExtensionService)))
+    ( (__param(15, IExtensionService))),
+    ( (__param(16, IProgressService)))
 ], TextFileEditorModel)));
 export { TextFileEditorModel };

package/vscode/src/vs/workbench/services/textfile/common/textfiles.d.ts

@@ -19,6 +19,10 @@ interface IReadTextFileEncodingOptions {
      * The optional guessEncoding parameter allows to guess encoding from content of the file.
      */
     readonly autoGuessEncoding?: boolean;
+    /**
+     * The optional candidateGuessEncodings parameter limits the allowed encodings to guess from.
+     */
+    readonly candidateGuessEncodings?: string[];
     /**
      * The optional acceptTextOnly parameter allows to fail this request early if the file
      * contents are not textual.
@@ -201,7 +205,7 @@ interface ITextFileEditorModelManager {
     /**
      * Runs the registered save participants on the provided model.
      */
-    runSaveParticipants(model: ITextFileEditorModel, context: ITextFileSaveParticipantContext, token: CancellationToken): Promise<void>;
+    runSaveParticipants(model: ITextFileEditorModel, context: ITextFileSaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
     /**
      * Waits for the model to be ready to be disposed. There may be conditions
      * under which the model cannot be disposed, e.g. when it is dirty. Once the

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js

@@ -55,7 +55,7 @@ const ICONS = [
     Codicon.pulse,
     Codicon.radioTower,
     Codicon.smiley,
-    Codicon.symbolEvent,
+    Codicon.zap,
     Codicon.squirrel,
     Codicon.symbolColor,
     Codicon.mail,

package/vscode/src/vs/workbench/services/views/browser/viewsService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ViewContainerLocation } from '../../../common/views.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { FocusedViewContext, getVisbileViewContextKey } from '../../../common/contextkeys.js';
@@ -44,6 +44,7 @@ let ViewsService = class ViewsService extends Disposable {
         this.onDidChangeViewContainerVisibility = this._onDidChangeViewContainerVisibility.event;
         this._onDidChangeFocusedView = this._register(( (new Emitter())));
         this.onDidChangeFocusedView = this._onDidChangeFocusedView.event;
+        this.viewContainerDisposables = this._register(( (new DisposableMap())));
         this.viewDisposable = ( (new Map()));
         this.enabledViewContainersContextKeys = ( (new Map()));
         this.visibleViewContextKeys = ( (new Map()));
@@ -84,7 +85,7 @@ let ViewsService = class ViewsService extends Disposable {
     }
     onDidChangeContainers(added, removed) {
         for (const { container, location } of removed) {
-            this.deregisterPaneComposite(container, location);
+            this.onDidDeregisterViewContainer(container, location);
         }
         for (const { container, location } of added) {
             this.onDidRegisterViewContainer(container, location);
@@ -92,15 +93,21 @@ let ViewsService = class ViewsService extends Disposable {
     }
     onDidRegisterViewContainer(viewContainer, viewContainerLocation) {
         this.registerPaneComposite(viewContainer, viewContainerLocation);
+        const disposables = ( (new DisposableStore()));
         const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
         this.onViewDescriptorsAdded(viewContainerModel.allViewDescriptors, viewContainer);
-        this._register(viewContainerModel.onDidChangeAllViewDescriptors(({ added, removed }) => {
+        disposables.add(viewContainerModel.onDidChangeAllViewDescriptors(({ added, removed }) => {
             this.onViewDescriptorsAdded(added, viewContainer);
             this.onViewDescriptorsRemoved(removed);
         }));
         this.updateViewContainerEnablementContextKey(viewContainer);
-        this._register(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.updateViewContainerEnablementContextKey(viewContainer)));
-        this._register(this.registerOpenViewContainerAction(viewContainer));
+        disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.updateViewContainerEnablementContextKey(viewContainer)));
+        disposables.add(this.registerOpenViewContainerAction(viewContainer));
+        this.viewContainerDisposables.set(viewContainer.id, disposables);
+    }
+    onDidDeregisterViewContainer(viewContainer, viewContainerLocation) {
+        this.deregisterPaneComposite(viewContainer, viewContainerLocation);
+        this.viewContainerDisposables.deleteAndDispose(viewContainer.id);
     }
     onDidChangeContainerLocation(viewContainer, from, to) {
         this.deregisterPaneComposite(viewContainer, from);