@codingame/monaco-vscode-api 2.2.0-next.2 → 2.2.0-next.4

package/api.js

@@ -29,7 +29,7 @@ function createProxy(key) {
     });
 }
 const api = {
-    version: "1.86.1",
+    version: "1.86.2",
     tasks: createProxy('tasks'),
     notebooks: createProxy('notebooks'),
     scm: createProxy('scm'),

package/extensions.d.ts

@@ -120,9 +120,10 @@ interface RegisterLocalProcessExtensionResult extends RegisterLocalExtensionResu
 }
 declare function registerRemoteExtension(directory: string): Promise<RegisterRemoteExtensionResult>;
 declare function getExtensionManifests(): IExtension[];
+declare function getForcedExtensionHostKind(id: string): ExtensionHostKind | undefined;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind: ExtensionHostKind.LocalProcess, params?: RegisterExtensionParams): RegisterLocalProcessExtensionResult;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind: ExtensionHostKind.LocalWebWorker, params?: RegisterExtensionParams): RegisterLocalExtensionResult;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind: ExtensionHostKind.Remote, params?: RegisterRemoteExtensionParams): RegisterRemoteExtensionResult;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind?: ExtensionHostKind, params?: RegisterExtensionParams): RegisterExtensionResult;
 
-export { type ApiFactory, ExtensionHostKind, IExtensionManifest, getExtensionManifests, registerExtension, registerLocalApiFactory, registerRemoteExtension };
+export { type ApiFactory, ExtensionHostKind, IExtensionManifest, getExtensionManifests, getForcedExtensionHostKind, registerExtension, registerLocalApiFactory, registerRemoteExtension };

package/extensions.js

@@ -50,10 +50,14 @@ async function registerRemoteExtension(directory) {
     const manifest = parse(( content.value.toString()));
     return registerExtension(manifest, 3 , { path: directory });
 }
+const forcedExtensionHostKinds = new Map();
 const extensions = [];
 function getExtensionManifests() {
     return extensions;
 }
+function getForcedExtensionHostKind(id) {
+    return forcedExtensionHostKinds.get(id);
+}
 function registerExtension(manifest, extHostKind, { path = '/', system = false, readmePath, changelogPath } = {}) {
     const id = getExtensionId(manifest.publisher, manifest.name);
     const location = ( URI.from({ scheme: CustomSchemas.extensionFile, authority: id, path }));
@@ -79,6 +83,9 @@ function registerExtension(manifest, extHostKind, { path = '/', system = false,
             readmeUrl: readmePath != null ? URI.joinPath(realLocation, readmePath) : undefined,
             changelogUrl: changelogPath != null ? URI.joinPath(realLocation, changelogPath) : undefined
         };
+        if (extHostKind != null) {
+            forcedExtensionHostKinds.set(id, extHostKind);
+        }
         if (extHostKind !== 3 ) {
             extensions.push(extension);
         }
@@ -104,6 +111,7 @@ function registerExtension(manifest, extHostKind, { path = '/', system = false,
             if (index >= 0) {
                 extensions.splice(extensions.indexOf(extension), 1);
             }
+            forcedExtensionHostKinds.delete(id);
             await deltaExtensions({ toAdd: [], toRemove: [extension] });
         }
     };
@@ -134,4 +142,4 @@ function registerExtension(manifest, extHostKind, { path = '/', system = false,
     }
     return api;
 }
-export { getExtensionManifests, registerExtension, registerLocalApiFactory, registerRemoteExtension };
+export { getExtensionManifests, getForcedExtensionHostKind, registerExtension, registerLocalApiFactory, registerRemoteExtension };

package/missing-services.js

@@ -525,8 +525,8 @@ registerSingleton(IPathService, BrowserPathService, 1 );
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.86.1";
-        this.commit = "1.86.1";
+        this.version = "1.86.2";
+        this.commit = "1.86.2";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "2.2.0-next.2",
+  "version": "2.2.0-next.4",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -96,12 +96,12 @@
   "dependencies": {
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.2",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.2",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.2",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.2",
-    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.2",
-    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.2"
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.4"
   }
 }

package/service-override/tools/views.d.ts

@@ -1,4 +1,5 @@
-import { ViewContainerLocation, ViewContainer } from '../../vscode/src/vs/workbench/common/views.js';
+import { ViewContainerLocation, ViewContainer, IViewContainersRegistry, IViewsRegistry } from '../../vscode/src/vs/workbench/common/views.js';
+export { IViewContainerDescriptor, IViewDescriptor } from '../../vscode/src/vs/workbench/common/views.js';
 import { BrandedService, ServicesAccessor } from '../../vscode/src/vs/platform/instantiation/common/instantiation.js';
 import { IDisposable } from '../../vscode/src/vs/base/common/lifecycle.js';
 import { Dimension } from '../../vscode/src/vs/base/browser/dom.js';
@@ -87,6 +88,8 @@ interface CustomViewOption {
     hideByDefault?: boolean;
     collapsed?: boolean;
 }
+declare const viewContainerRegistry: IViewContainersRegistry;
+declare const viewRegistry: IViewsRegistry;
 declare function registerCustomView(options: CustomViewOption): IDisposable;
 declare function isPartVisibile(part: Parts): boolean;
 declare function setPartVisibility(part: Exclude<Parts, Parts.STATUSBAR_PART | Parts.TITLEBAR_PART>, visible: boolean): void;
@@ -95,4 +98,4 @@ declare function getPanelPosition(): Position;
 declare const onDidChangeSideBarPosition: Event<string>;
 declare function getSideBarPosition(): Position;
 
-export { type CustomViewOption, EditorInput, EditorInputCapabilities, EditorInputFactoryObject, EditorPane, IEditorCloseHandler, IEditorSerializer, Parts, RegisteredEditorInfo, RegisteredEditorOptions, SimpleEditorInput, SimpleEditorPane, ViewContainerLocation, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility };
+export { type CustomViewOption, EditorInput, EditorInputCapabilities, EditorInputFactoryObject, EditorPane, IEditorCloseHandler, IEditorSerializer, Parts, RegisteredEditorInfo, RegisteredEditorOptions, SimpleEditorInput, SimpleEditorPane, ViewContainer, ViewContainerLocation, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/service-override/tools/views.js

@@ -143,9 +143,11 @@ function registerEditor(globPattern, editorInfo, editorOptions, factory) {
 function registerEditorSerializer(editorTypeId, ctor) {
     return ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(editorTypeId, ctor);
 }
+const viewContainerRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
+const viewRegistry = ( Registry.as(Extensions.ViewsRegistry));
 function registerCustomView(options) {
     const iconUrl = options.icon != null ? ( URI.parse(options.icon)) : undefined;
-    const viewContainer = options.viewContainer ?? ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
+    const viewContainer = options.viewContainer ?? viewContainerRegistry.registerViewContainer({
         id: options.id,
         title: { value: options.name, original: options.name },
         order: options.order,
@@ -194,13 +196,13 @@ function registerCustomView(options) {
             order: options.order,
             containerIcon: iconUrl
         }];
-    ( Registry.as(Extensions.ViewsRegistry)).registerViews(views, viewContainer);
+    viewRegistry.registerViews(views, viewContainer);
     const disposableCollection = new DisposableStore();
     disposableCollection.add({
         dispose() {
-            ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(views, viewContainer);
+            viewRegistry.deregisterViews(views, viewContainer);
             if (options.viewContainer == null) {
-                ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(viewContainer);
+                viewContainerRegistry.deregisterViewContainer(viewContainer);
             }
         }
     });
@@ -246,4 +248,4 @@ const onDidChangeSideBarPosition = (listener) => {
 function getSideBarPosition() {
     return StandaloneServices.get(IWorkbenchLayoutService).getSideBarPosition();
 }
-export { EditorInput, EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility };
+export { EditorInput, EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/services.js

@@ -145,9 +145,9 @@ async function initialize(overrides, container = document.body, configuration =
     initialize$1(container, configuration);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.86.1",
+            version: "1.86.2",
             quality: 'oss',
-            commit: "1.86.1",
+            commit: "1.86.2",
             nameShort: 'Code - OSS Dev',
             nameLong: 'Code - OSS Dev',
             applicationName: 'code-oss',

package/vscode/src/vs/base/browser/ui/table/tableWidget.js

@@ -1,4 +1,4 @@
-import { append, $, clearNode, createStyleSheet, getContentHeight, getContentWidth } from '../../dom.js';
+import { append, $, createStyleSheet, getContentHeight, getContentWidth, clearNode } from '../../dom.js';
 import { List, unthemedListStyles } from '../list/listWidget.js';
 import { SplitView } from '../splitview/splitview.js';
 import { Event, Emitter } from '../../../common/event.js';

package/vscode/src/vs/base/browser/ui/tree/abstractTree.js

@@ -1,4 +1,4 @@
-import { append, $, clearNode, createStyleSheet, isActiveElement, asCssValueWithDefault, isKeyboardEvent, hasParentWithClass, h, getWindow } from '../../dom.js';
+import { createStyleSheet, isActiveElement, asCssValueWithDefault, isKeyboardEvent, append, $, clearNode, hasParentWithClass, h, getWindow } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { ActionBar } from '../actionbar/actionbar.js';
@@ -17,7 +17,7 @@ import { ThemeIcon } from '../../../common/themables.js';
 import { SetMap } from '../../../common/map.js';
 import { Event, EventBufferer, Emitter, Relay } from '../../../common/event.js';
 import { FuzzyScore, fuzzyScore } from '../../../common/filters.js';
-import { Disposable, DisposableStore, toDisposable, dispose } from '../../../common/lifecycle.js';
+import { DisposableStore, dispose, Disposable, toDisposable } from '../../../common/lifecycle.js';
 import { clamp } from '../../../common/numbers.js';
 import { isNumber } from '../../../common/types.js';
 import './media/tree.css.js';

package/vscode/src/vs/base/common/labels.js

@@ -1,7 +1,7 @@
 import { firstOrDefault } from './arrays.js';
 import { hasDriveLetter, toSlashes } from './extpath.js';
-import { posix, sep, win32 } from './path.js';
-import { isWindows, OS, isMacintosh } from './platform.js';
+import { sep, posix, win32 } from './path.js';
+import { isWindows, isMacintosh, OS } from './platform.js';
 import { extUri, extUriIgnorePathCase } from './resources.js';
 import { rtrim, startsWithIgnoreCase } from './strings.js';
 function getPathLabel(resource, formatting) {

package/vscode/src/vs/base/common/lifecycle.js

@@ -1,123 +1,5 @@
-import { compareBy, numberComparator } from './arrays.js';
-import { groupBy } from './collections.js';
-import { SetMap } from './map.js';
 import { createSingleCallFunction } from './functional.js';
 import { Iterable } from './iterator.js';
-class DisposableTracker {
-    constructor() {
-        this.livingDisposables = ( new Map());
-    }
-    static { this.idx = 0; }
-    getDisposableData(d) {
-        let val = this.livingDisposables.get(d);
-        if (!val) {
-            val = { parent: null, source: null, isSingleton: false, value: d, idx: DisposableTracker.idx++ };
-            this.livingDisposables.set(d, val);
-        }
-        return val;
-    }
-    trackDisposable(d) {
-        const data = this.getDisposableData(d);
-        if (!data.source) {
-            data.source =
-                ( new Error()).stack;
-        }
-    }
-    setParent(child, parent) {
-        const data = this.getDisposableData(child);
-        data.parent = parent;
-    }
-    markAsDisposed(x) {
-        this.livingDisposables.delete(x);
-    }
-    markAsSingleton(disposable) {
-        this.getDisposableData(disposable).isSingleton = true;
-    }
-    getRootParent(data, cache) {
-        const cacheValue = cache.get(data);
-        if (cacheValue) {
-            return cacheValue;
-        }
-        const result = data.parent ? this.getRootParent(this.getDisposableData(data.parent), cache) : data;
-        cache.set(data, result);
-        return result;
-    }
-    getTrackedDisposables() {
-        const rootParentCache = ( new Map());
-        const leaking = [...this.livingDisposables.entries()]
-            .filter(([, v]) => v.source !== null && !this.getRootParent(v, rootParentCache).isSingleton)
-            .flatMap(([k]) => k);
-        return leaking;
-    }
-    computeLeakingDisposables(maxReported = 10, preComputedLeaks) {
-        let uncoveredLeakingObjs;
-        if (preComputedLeaks) {
-            uncoveredLeakingObjs = preComputedLeaks;
-        }
-        else {
-            const rootParentCache = ( new Map());
-            const leakingObjects = [...( this.livingDisposables.values())]
-                .filter((info) => info.source !== null && !this.getRootParent(info, rootParentCache).isSingleton);
-            if (leakingObjects.length === 0) {
-                return;
-            }
-            const leakingObjsSet = ( new Set(( leakingObjects.map(o => o.value))));
-            uncoveredLeakingObjs = leakingObjects.filter(l => {
-                return !(l.parent && ( leakingObjsSet.has(l.parent)));
-            });
-            if (uncoveredLeakingObjs.length === 0) {
-                throw new Error('There are cyclic diposable chains!');
-            }
-        }
-        if (!uncoveredLeakingObjs) {
-            return undefined;
-        }
-        function getStackTracePath(leaking) {
-            function removePrefix(array, linesToRemove) {
-                while (array.length > 0 && ( linesToRemove.some(
-                    regexp => typeof regexp === 'string' ? regexp === array[0] : array[0].match(regexp)
-                ))) {
-                    array.shift();
-                }
-            }
-            const lines = ( leaking.source.split('\n').map(p => p.trim().replace('at ', ''))).filter(l => l !== '');
-            removePrefix(lines, ['Error', /^trackDisposable \(.*\)$/, /^DisposableTracker.trackDisposable \(.*\)$/]);
-            return lines.reverse();
-        }
-        const stackTraceStarts = ( new SetMap());
-        for (const leaking of uncoveredLeakingObjs) {
-            const stackTracePath = getStackTracePath(leaking);
-            for (let i = 0; i <= stackTracePath.length; i++) {
-                stackTraceStarts.add(stackTracePath.slice(0, i).join('\n'), leaking);
-            }
-        }
-        uncoveredLeakingObjs.sort(compareBy(l => l.idx, numberComparator));
-        let message = '';
-        let i = 0;
-        for (const leaking of uncoveredLeakingObjs.slice(0, maxReported)) {
-            i++;
-            const stackTracePath = getStackTracePath(leaking);
-            const stackTraceFormattedLines = [];
-            for (let i = 0; i < stackTracePath.length; i++) {
-                let line = stackTracePath[i];
-                const starts = stackTraceStarts.get(stackTracePath.slice(0, i + 1).join('\n'));
-                line = `(shared with ${starts.size}/${uncoveredLeakingObjs.length} leaks) at ${line}`;
-                const prevStarts = stackTraceStarts.get(stackTracePath.slice(0, i).join('\n'));
-                const continuations = groupBy(( [...prevStarts].map(d => getStackTracePath(d)[i])), v => v);
-                delete continuations[stackTracePath[i]];
-                for (const [cont, set] of Object.entries(continuations)) {
-                    stackTraceFormattedLines.unshift(`    - stacktraces of ${set.length} other leaks continue with ${cont}`);
-                }
-                stackTraceFormattedLines.unshift(line);
-            }
-            message += `\n\n\n==================== Leaking disposable ${i}/${uncoveredLeakingObjs.length}: ${leaking.value.constructor.name} ====================\n${stackTraceFormattedLines.join('\n')}\n============================================================\n\n`;
-        }
-        if (uncoveredLeakingObjs.length > maxReported) {
-            message += `\n\n\n... and ${uncoveredLeakingObjs.length - maxReported} more leaking disposables\n\n`;
-        }
-        return { leaks: uncoveredLeakingObjs, details: message };
-    }
-}
 function trackDisposable(x) {
     return x;
 }
@@ -417,4 +299,4 @@ class DisposableMap {
         return this._store[Symbol.iterator]();
     }
 }
-export { AsyncReferenceCollection, Disposable, DisposableMap, DisposableStore, DisposableTracker, ImmortalReference, MandatoryMutableDisposable, MutableDisposable, RefCountedDisposable, ReferenceCollection, combinedDisposable, dispose, disposeIfDisposable, isDisposable, markAsSingleton, toDisposable, trackDisposable };
+export { AsyncReferenceCollection, Disposable, DisposableMap, DisposableStore, ImmortalReference, MandatoryMutableDisposable, MutableDisposable, RefCountedDisposable, ReferenceCollection, combinedDisposable, dispose, disposeIfDisposable, isDisposable, markAsSingleton, toDisposable, trackDisposable };

package/vscode/src/vs/base/common/network.js

@@ -1,7 +1,7 @@
 import { onUnexpectedError } from './errors.js';
 import { toDisposable } from './lifecycle.js';
 import { ResourceMap } from './map.js';
-import { isNative, webWorkerOrigin, isWeb } from './platform.js';
+import { isWeb, isNative, webWorkerOrigin } from './platform.js';
 import { equalsIgnoreCase, startsWithIgnoreCase } from './strings.js';
 import { URI } from './uri.js';
 var Schemas;

package/vscode/src/vs/editor/browser/editorExtensions.js

@@ -4,7 +4,7 @@ import { ICodeEditorService } from './services/codeEditorService.js';
 import { Position } from '../common/core/position.js';
 import { IModelService } from '../common/services/model.js';
 import { ITextModelService } from '../common/services/resolverService.js';
-import { Action2, MenuId, MenuRegistry } from '../../platform/actions/common/actions.js';
+import { MenuId, MenuRegistry, Action2 } from '../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../platform/commands/common/commands.js';
 import { IContextKeyService, ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';

package/vscode/src/vs/editor/browser/view.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
-import { runAtThisOrScheduleAtNextAnimationFrame, getWindow } from '../../base/browser/dom.js';
+import { getWindow, runAtThisOrScheduleAtNextAnimationFrame } from '../../base/browser/dom.js';
 import { createFastDomNode } from '../../base/browser/fastDomNode.js';
 import { inputLatency } from '../../base/browser/performance.js';
 import { BugIndicatingError, onUnexpectedError } from '../../base/common/errors.js';

package/vscode/src/vs/editor/common/config/editorOptions.js

@@ -1,5 +1,5 @@
-import { equals } from '../../../base/common/arrays.js';
-import { equals as equals$1 } from '../../../base/common/objects.js';
+import { equals as equals$1 } from '../../../base/common/arrays.js';
+import { equals } from '../../../base/common/objects.js';
 import { isMacintosh, isLinux } from '../../../base/common/platform.js';
 import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
 import { USUAL_WORD_SEPARATORS } from '../core/wordHelper.js';
@@ -45,7 +45,7 @@ function applyUpdate(value, update) {
         return ( new ApplyUpdateResult(update, value !== update));
     }
     if (Array.isArray(value) || Array.isArray(update)) {
-        const arrayEquals = Array.isArray(value) && Array.isArray(update) && equals(value, update);
+        const arrayEquals = Array.isArray(value) && Array.isArray(update) && equals$1(value, update);
         return ( new ApplyUpdateResult(update, !arrayEquals));
     }
     let didChange = false;
@@ -2219,13 +2219,13 @@ class UnicodeHighlight extends BaseEditorOption {
     applyUpdate(value, update) {
         let didChange = false;
         if (update.allowedCharacters && value) {
-            if (!equals$1(value.allowedCharacters, update.allowedCharacters)) {
+            if (!equals(value.allowedCharacters, update.allowedCharacters)) {
                 value = { ...value, allowedCharacters: update.allowedCharacters };
                 didChange = true;
             }
         }
         if (update.allowedLocales && value) {
-            if (!equals$1(value.allowedLocales, update.allowedLocales)) {
+            if (!equals(value.allowedLocales, update.allowedLocales)) {
                 value = { ...value, allowedLocales: update.allowedLocales };
                 didChange = true;
             }

package/vscode/src/vs/editor/common/viewModel/modelLineProjection.js

@@ -1,7 +1,7 @@
 import { LineTokens } from '../tokens/lineTokens.js';
 import { Position } from '../core/position.js';
 import { LineInjectedText } from '../textModelEvents.js';
-import { ViewLineData, SingleLineInlineDecoration } from '../viewModel.js';
+import { SingleLineInlineDecoration, ViewLineData } from '../viewModel.js';
 function createModelLineProjection(lineBreakData, isVisible) {
     if (lineBreakData === null) {
         if (isVisible) {

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js

@@ -1,5 +1,5 @@
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { raceCancellation, createCancelablePromise } from '../../../../base/common/async.js';
+import { createCancelablePromise, raceCancellation } from '../../../../base/common/async.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -24,7 +24,7 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
-import { getDefinitionsAtPosition, getDeclarationsAtPosition, getTypeDefinitionsAtPosition, getImplementationsAtPosition, getReferencesAtPosition } from './goToSymbol.js';
+import { getReferencesAtPosition, getDefinitionsAtPosition, getDeclarationsAtPosition, getTypeDefinitionsAtPosition, getImplementationsAtPosition } from './goToSymbol.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';

package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js

@@ -1,7 +1,7 @@
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { TabFocus } from '../../../browser/config/tabFocus.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 class ToggleTabFocusModeAction extends Action2 {
     static { this.ID = 'editor.action.toggleTabFocusMode'; }
     constructor() {

package/vscode/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.js

@@ -1,4 +1,4 @@
-import { removeCSSRulesContainingSelector, createCSSRule, getActiveElement } from '../../../../base/browser/dom.js';
+import { getActiveElement, removeCSSRulesContainingSelector, createCSSRule } from '../../../../base/browser/dom.js';
 import { Sash } from '../../../../base/browser/ui/sash/sash.js';
 import { Color, RGBA } from '../../../../base/common/color.js';
 import { IdGenerator } from '../../../../base/common/idGenerator.js';

package/vscode/src/vs/platform/quickinput/browser/quickInputList.js

@@ -1,5 +1,5 @@
 import { __decorate } from '../../../../../../external/tslib/tslib.es6.js';
-import { append, addStandardDisposableListener, prepend, asCSSUrl, $ as $$1, EventType, addDisposableListener, isAncestor } from '../../../base/browser/dom.js';
+import { append, addDisposableListener, EventType, isAncestor, $ as $$1, addStandardDisposableListener, prepend, asCSSUrl } from '../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
 import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { IconLabel } from '../../../base/browser/ui/iconLabel/iconLabel.js';
@@ -12,7 +12,7 @@ import { isCancellationError } from '../../../base/common/errors.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { matchesFuzzyIconAware, parseLabelWithIcons, getCodiconAriaLabel } from '../../../base/common/iconLabels.js';
 import { dispose, DisposableStore } from '../../../base/common/lifecycle.js';
-import { OS, isMacintosh } from '../../../base/common/platform.js';
+import { isMacintosh, OS } from '../../../base/common/platform.js';
 import { ltrim } from '../../../base/common/strings.js';
 import './media/quickInput.css.js';
 import { localizeWithPath } from '../../../nls.js';

package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js

@@ -1,4 +1,4 @@
-import { reset, $, EventType, createCSSRule, asCSSUrl, isEventLike, EventHelper } from '../../../base/browser/dom.js';
+import { reset, $, EventType, isEventLike, EventHelper, createCSSRule, asCSSUrl } from '../../../base/browser/dom.js';
 import { DomEmitter } from '../../../base/browser/event.js';
 import { Event } from '../../../base/common/event.js';
 import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';

package/vscode/src/vs/workbench/api/common/extHost.protocol.js

@@ -19,13 +19,6 @@ var CandidatePortSource;
     CandidatePortSource[CandidatePortSource["Process"] = 1] = "Process";
     CandidatePortSource[CandidatePortSource["Output"] = 2] = "Output";
 })(CandidatePortSource || (CandidatePortSource = {})));
-class IdObject {
-    static { this._n = 0; }
-    static mixin(object) {
-        object._id = IdObject._n++;
-        return object;
-    }
-}
 const MainContext = {
     MainThreadAuthentication: ( createProxyIdentifier('MainThreadAuthentication')),
     MainThreadBulkEdits: ( createProxyIdentifier('MainThreadBulkEdits')),
@@ -167,4 +160,4 @@ const ExtHostContext = {
     ExtHostLocalization: ( createProxyIdentifier('ExtHostLocalization')),
     ExtHostIssueReporter: ( createProxyIdentifier('ExtHostIssueReporter')),
 };
-export { CandidatePortSource, ExtHostContext, IdObject, MainContext, NotebookEditorRevealType, TextEditorRevealType };
+export { CandidatePortSource, ExtHostContext, MainContext, NotebookEditorRevealType, TextEditorRevealType };

package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js

@@ -1,12 +1,12 @@
 import { URI } from '../../../base/common/uri.js';
 import { mixin, equals } from '../../../base/common/objects.js';
-import { Selection as Selection$1, Range, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
-import { CodeActionKind, Disposable, SyntaxTokenType, DocumentSymbol, Range as Range$2, InternalDataTransferItem, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, Location, CompletionList, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from './extHostTypes.js';
+import { DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Range, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, Selection as Selection$1, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
+import { Disposable, SyntaxTokenType, DocumentSymbol, Range as Range$2, CodeActionKind, InternalDataTransferItem, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, Location, CompletionList, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from './extHostTypes.js';
 import { InlineCompletionTriggerKind } from '../../../editor/common/languages.js';
 import { MainContext } from './extHost.protocol.js';
 import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
 import { Range as Range$1 } from '../../../editor/common/core/range.js';
-import { isNonEmptyArray, coalesce, isFalsyOrEmpty } from '../../../base/common/arrays.js';
+import { isFalsyOrEmpty, coalesce, isNonEmptyArray } from '../../../base/common/arrays.js';
 import { assertType, isObject } from '../../../base/common/types.js';
 import { Selection } from '../../../editor/common/core/selection.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';

package/vscode/src/vs/workbench/api/common/extHostNotebookDocument.js

@@ -2,7 +2,7 @@ import { Schemas } from '../../../base/common/network.js';
 import { URI } from '../../../base/common/uri.js';
 import { NotebookCellOutput, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutputItem } from './extHostTypeConverters.js';
 import { NotebookRange } from './extHostTypes.js';
-import { NotebookCellsChangeType, isTextStreamMime, compressOutputItemStreams } from '../../contrib/notebook/common/notebookCommon.js';
+import { isTextStreamMime, compressOutputItemStreams, NotebookCellsChangeType } from '../../contrib/notebook/common/notebookCommon.js';
 class RawContentChangeEvent {
     constructor(start, deletedCount, deletedItems, items) {
         this.start = start;

package/vscode/src/vs/workbench/api/common/extHostQuickOpen.js

@@ -3,7 +3,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { dispose } from '../../../base/common/lifecycle.js';
 import { MainContext } from './extHost.protocol.js';
 import { URI } from '../../../base/common/uri.js';
-import { QuickInputButtons, QuickPickItemKind, ThemeIcon as ThemeIcon$1, InputBoxValidationSeverity } from './extHostTypes.js';
+import { QuickPickItemKind, InputBoxValidationSeverity, QuickInputButtons, ThemeIcon as ThemeIcon$1 } from './extHostTypes.js';
 import { isCancellationError } from '../../../base/common/errors.js';
 import { coalesce } from '../../../base/common/arrays.js';
 import Severity from '../../../base/common/severity.js';

package/vscode/src/vs/workbench/api/common/extHostSCM.js

@@ -5,7 +5,7 @@ import { debounce } from '../../../base/common/decorators.js';
 import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { asPromise } from '../../../base/common/async.js';
 import { MainContext } from './extHost.protocol.js';
-import { sortedDiff, equals } from '../../../base/common/arrays.js';
+import { equals, sortedDiff } from '../../../base/common/arrays.js';
 import { comparePaths } from '../../../base/common/comparers.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';

package/vscode/src/vs/workbench/api/common/extHostStatusBar.js

@@ -1,4 +1,4 @@
-import { ThemeColor, asStatusBarItemIdentifier, StatusBarAlignment, Disposable } from './extHostTypes.js';
+import { Disposable, ThemeColor, asStatusBarItemIdentifier, StatusBarAlignment } from './extHostTypes.js';
 import { MainContext } from './extHost.protocol.js';
 import { localizeWithPath } from '../../../nls.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';

package/vscode/src/vs/workbench/api/common/extHostTextEditor.js

@@ -1,7 +1,7 @@
 import { ok } from '../../../base/common/assert.js';
 import { ReadonlyError, illegalArgument } from '../../../base/common/errors.js';
 import { IdGenerator } from '../../../base/common/idGenerator.js';
-import { DecorationRenderOptions, Position as Position$1, Range as Range$1, isDecorationOptionsArr, fromRangeOrRangeWithMessage, ViewColumn, EndOfLine, TextEditorLineNumbersStyle, Selection as Selection$1 } from './extHostTypeConverters.js';
+import { Position as Position$1, Range as Range$1, isDecorationOptionsArr, fromRangeOrRangeWithMessage, ViewColumn, EndOfLine, TextEditorLineNumbersStyle, Selection as Selection$1, DecorationRenderOptions } from './extHostTypeConverters.js';
 import { Selection, Position, Range, TextEditorRevealType, EndOfLine as EndOfLine$1 } from './extHostTypes.js';
 class TextEditorDecorationType {
     static { this._Keys = ( new IdGenerator('TextEditorDecorationType')); }

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -5,10 +5,10 @@ import { createSingleCallFunction } from '../../../base/common/functional.js';
 import { parseHrefAndDimensions, isMarkdownString } from '../../../base/common/htmlContent.js';
 import { ResourceSet, ResourceMap } from '../../../base/common/map.js';
 import marked from 'vscode-marked';
-import { revive, parse } from '../../../base/common/marshalling.js';
+import { parse, revive } from '../../../base/common/marshalling.js';
 import { Mimes } from '../../../base/common/mime.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
-import { isString, isEmptyObject, isUndefinedOrNull, isNumber } from '../../../base/common/types.js';
+import { isString, isNumber, isUndefinedOrNull, isEmptyObject } from '../../../base/common/types.js';
 import { URI, isUriComponents } from '../../../base/common/uri.js';
 import { Range as Range$2 } from '../../../editor/common/core/range.js';
 import { Command, FoldingRangeKind as FoldingRangeKind$2 } from '../../../editor/common/languages.js';
@@ -20,7 +20,7 @@ import { TestId } from '../../contrib/testing/common/testId.js';
 import { namespaceTestTag, denamespaceTestTag } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location as Location$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, CompletionTriggerKind as CompletionTriggerKind$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, StandardTokenType, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, TextEdit as TextEdit$1, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location as Location$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, TypeHierarchyItem as TypeHierarchyItem$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, Hover as Hover$1, DocumentHighlight as DocumentHighlight$1, InlayHintLabelPart as InlayHintLabelPart$1, FoldingRangeKind as FoldingRangeKind$1, NotebookCellData as NotebookCellData$1, DiagnosticTag as DiagnosticTag$1, SymbolTag as SymbolTag$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, EndOfLine as EndOfLine$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellKind as NotebookCellKind$1, DataTransfer as DataTransfer$1, StandardTokenType, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DocumentSymbol as DocumentSymbol$1, EvaluatableExpression as EvaluatableExpression$1, MultiDocumentHighlight as MultiDocumentHighlight$1, SelectionRange as SelectionRange$1, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, CodeActionTriggerKind as CodeActionTriggerKind$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DecorationRangeBehavior as DecorationRangeBehavior$1, CompletionTriggerKind as CompletionTriggerKind$1 } from './extHostTypes.js';
 var Selection;
 ( (function(Selection) {
     function to(selection) {

package/vscode/src/vs/workbench/browser/actions/layoutActions.js

@@ -1,5 +1,5 @@
 import { localizeWithPath, localize2WithPath } from '../../../nls.js';
-import { registerAction2, Action2, MenuRegistry, MenuId } from '../../../platform/actions/common/actions.js';
+import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../platform/actions/common/actions.js';
 import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 import { IWorkbenchLayoutService, positionToString } from '../../services/layout/browser/layoutService.js';

package/vscode/src/vs/workbench/browser/actions/windowActions.js

@@ -1,9 +1,9 @@
 import { localizeWithPath, localize2WithPath } from '../../../nls.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { MenuId, Action2, registerAction2, MenuRegistry } from '../../../platform/actions/common/actions.js';
+import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../platform/actions/common/actions.js';
 import { KeyChord } from '../../../base/common/keyCodes.js';
 import { IsMainWindowFullscreenContext } from '../../common/contextkeys.js';
-import { IsDevelopmentContext, IsWebContext, IsIOSContext, IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
+import { IsWebContext, IsDevelopmentContext, IsIOSContext, IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
 import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
 import { KeybindingsRegistry } from '../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService } from '../../../platform/quickinput/common/quickInput.js';

package/vscode/src/vs/workbench/browser/actions/workspaceActions.js

@@ -1,11 +1,11 @@
-import { localize2WithPath, localizeWithPath } from '../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../nls.js';
 import { IWorkspaceContextService, hasWorkspaceFileExtension } from '../../../platform/workspace/common/workspace.js';
 import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
 import { ICommandService } from '../../../platform/commands/common/commands.js';
-import { SET_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, ADD_ROOT_FOLDER_COMMAND_ID, PICK_WORKSPACE_FOLDER_COMMAND_ID } from './workspaceCommands.js';
+import { ADD_ROOT_FOLDER_COMMAND_ID, SET_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID } from './workspaceCommands.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { Action2, registerAction2, MenuRegistry, MenuId } from '../../../platform/actions/common/actions.js';
+import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../platform/actions/common/actions.js';
 import { OpenFolderWorkspaceSupportContext, WorkbenchStateContext, EnterMultiRootWorkspaceSupportContext, EmptyWorkspaceSupportContext, WorkspaceFolderCountContext } from '../../common/contextkeys.js';
 import { IHostService } from '../../services/host/browser/host.js';
 import { KeyChord } from '../../../base/common/keyCodes.js';

package/vscode/src/vs/workbench/browser/part.js

@@ -1,6 +1,6 @@
 import './media/part.css.js';
 import { Component } from '../common/component.js';
-import { size, Dimension, getActiveDocument } from '../../base/browser/dom.js';
+import { Dimension, size, getActiveDocument } from '../../base/browser/dom.js';
 import { Emitter } from '../../base/common/event.js';
 import { assertIsDefined } from '../../base/common/types.js';
 import { toDisposable } from '../../base/common/lifecycle.js';

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js

@@ -1,6 +1,6 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
-import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';

package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Action } from '../../../../base/common/actions.js';
 import { firstOrDefault } from '../../../../base/common/arrays.js';
 import { EditorResourceAccessor, DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
@@ -8,7 +8,7 @@ import { IWorkbenchLayoutService } from '../../../services/layout/browser/layout
 import { IHistoryService } from '../../../services/history/common/history.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { SPLIT_EDITOR, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, CLOSE_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, splitEditor, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, TOGGLE_MAXIMIZE_EDITOR_GROUP, resolveCommandsContext, getCommandsContext, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID } from './editorCommands.js';
+import { CLOSE_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, COPY_ACTIVE_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, splitEditor, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, TOGGLE_MAXIMIZE_EDITOR_GROUP, resolveCommandsContext, getCommandsContext, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID } from './editorCommands.js';
 import { IEditorGroupsService, preferredSideBySideGroupDirection } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { clearNode, $, EventType, addDisposableListener, EventHelper, isEventLike } from '../../../../base/browser/dom.js';
+import { addDisposableListener, clearNode, EventHelper, $, EventType, isEventLike } from '../../../../base/browser/dom.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -9,7 +9,7 @@ import { toAction, Separator, ActionRunner } from '../../../../base/common/actio
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, dispose, Disposable } from '../../../../base/common/lifecycle.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { NotificationViewItem, ChoiceAction } from '../../../common/notifications.js';
+import { ChoiceAction, NotificationViewItem } from '../../../common/notifications.js';
 import { ConfigureNotificationAction, ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction } from './notificationsActions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';

package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js

@@ -1,6 +1,6 @@
 import './media/panelpart.css.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
-import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IWorkbenchLayoutService, positionToString } from '../../../services/layout/browser/layoutService.js';
 import { PanelVisibleContext, PanelAlignmentContext, PanelPositionContext, PanelMaximizedContext, AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';

package/vscode/src/vs/workbench/common/views.d.ts

@@ -1,4 +1,5 @@
 import { ServiceIdentifier } from '../../platform/instantiation/common/instantiation.js';
+import { IDisposable } from '../../base/common/lifecycle.js';
 import { URI } from '../../base/common/uri.js';
 import { Event } from '../../base/common/event.js';
 import { ThemeIcon } from '../../base/common/themables.js';
@@ -74,6 +75,62 @@ interface IViewContainerDescriptor {
     readonly rejectAddedViews?: boolean;
     requestedIndex?: number;
 }
+interface IViewContainersRegistry {
+    /**
+     * An event that is triggered when a view container is registered.
+     */
+    readonly onDidRegister: Event<{
+        viewContainer: ViewContainer;
+        viewContainerLocation: ViewContainerLocation;
+    }>;
+    /**
+     * An event that is triggered when a view container is deregistered.
+     */
+    readonly onDidDeregister: Event<{
+        viewContainer: ViewContainer;
+        viewContainerLocation: ViewContainerLocation;
+    }>;
+    /**
+     * All registered view containers
+     */
+    readonly all: ViewContainer[];
+    /**
+     * Registers a view container to given location.
+     * No op if a view container is already registered.
+     *
+     * @param viewContainerDescriptor descriptor of view container
+     * @param location location of the view container
+     *
+     * @returns the registered ViewContainer.
+     */
+    registerViewContainer(viewContainerDescriptor: IViewContainerDescriptor, location: ViewContainerLocation, options?: {
+        isDefault?: boolean;
+        doNotRegisterOpenCommand?: boolean;
+    }): ViewContainer;
+    /**
+     * Deregisters the given view container
+     * No op if the view container is not registered
+     */
+    deregisterViewContainer(viewContainer: ViewContainer): void;
+    /**
+     * Returns the view container with given id.
+     *
+     * @returns the view container with given id.
+     */
+    get(id: string): ViewContainer | undefined;
+    /**
+     * Returns all view containers in the given location
+     */
+    getViewContainers(location: ViewContainerLocation): ViewContainer[];
+    /**
+     * Returns the view container location
+     */
+    getViewContainerLocation(container: ViewContainer): ViewContainerLocation;
+    /**
+     * Return the default view container from the given location
+     */
+    getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined;
+}
 interface ViewOrderDelegate {
     getOrder(group?: string): number | undefined;
 }
@@ -150,6 +207,42 @@ interface IViewContainerModel {
     }[]): void;
     move(from: string, to: string): void;
 }
+interface IViewContentDescriptor {
+    readonly content: string;
+    readonly when?: ContextKeyExpression | 'default';
+    readonly group?: string;
+    readonly order?: number;
+    readonly precondition?: ContextKeyExpression | undefined;
+}
+interface IViewsRegistry {
+    readonly onViewsRegistered: Event<{
+        views: IViewDescriptor[];
+        viewContainer: ViewContainer;
+    }[]>;
+    readonly onViewsDeregistered: Event<{
+        views: IViewDescriptor[];
+        viewContainer: ViewContainer;
+    }>;
+    readonly onDidChangeContainer: Event<{
+        views: IViewDescriptor[];
+        from: ViewContainer;
+        to: ViewContainer;
+    }>;
+    registerViews(views: IViewDescriptor[], viewContainer: ViewContainer): void;
+    registerViews2(views: {
+        views: IViewDescriptor[];
+        viewContainer: ViewContainer;
+    }[]): void;
+    deregisterViews(views: IViewDescriptor[], viewContainer: ViewContainer): void;
+    moveViews(views: IViewDescriptor[], viewContainer: ViewContainer): void;
+    getViews(viewContainer: ViewContainer): IViewDescriptor[];
+    getView(id: string): IViewDescriptor | null;
+    getViewContainer(id: string): ViewContainer | null;
+    readonly onDidChangeViewWelcomeContent: Event<string>;
+    registerViewWelcomeContent(id: string, viewContent: IViewContentDescriptor): IDisposable;
+    registerViewWelcomeContent2<TKey>(id: string, viewContentMap: Map<TKey, IViewContentDescriptor>): Map<TKey, IDisposable>;
+    getViewWelcomeContent(id: string): IViewContentDescriptor[];
+}
 interface IView {
     readonly id: string;
     focus(): void;
@@ -231,4 +324,4 @@ interface IViewPaneContainer {
     toggleViewVisibility(viewId: string): void;
 }
 
-export { type IAddedViewDescriptorRef, type IEditableData, type IView, type IViewContainerDescriptor, type IViewContainerModel, type IViewDescriptor, type IViewDescriptorRef, IViewDescriptorService, type IViewPaneContainer, type ViewContainer, ViewContainerLocation, ViewVisibilityState };
+export { type IAddedViewDescriptorRef, type IEditableData, type IView, type IViewContainerDescriptor, type IViewContainerModel, type IViewContainersRegistry, type IViewContentDescriptor, type IViewDescriptor, type IViewDescriptorRef, IViewDescriptorService, type IViewPaneContainer, type IViewsRegistry, type ViewContainer, ViewContainerLocation, ViewVisibilityState };

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js

@@ -6,7 +6,7 @@ import { basename } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
-import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2 } from '../../../../../platform/actions/common/actions.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js

@@ -9,7 +9,7 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 import { Disposable, toDisposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { timeout } from '../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { prepareQuery } from '../../../../../base/common/fuzzyScorer.js';
 import { fuzzyScore, createMatches } from '../../../../../base/common/filters.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';

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

@@ -1,5 +1,5 @@
 import { localizeWithPath } from '../../../../nls.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
-import { Action2, registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';

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

@@ -1,5 +1,5 @@
 import { localizeWithPath } from '../../../../nls.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';

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

@@ -1,5 +1,5 @@
 import { localizeWithPath } from '../../../../nls.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';

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

@@ -4,7 +4,7 @@ import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { CommentNode, ResourceWithCommentThreads } from '../common/commentModel.js';
+import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { WorkbenchObjectTree, IListService } from '../../../../platform/list/browser/listService.js';

package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, addStandardDisposableListener, addDisposableListener, $ as $$1, isMouseEvent, hide, show } from '../../../../base/browser/dom.js';
+import { append, addStandardDisposableListener, $ as $$1, isMouseEvent, hide, show, addDisposableListener } from '../../../../base/browser/dom.js';
 import { Gesture } from '../../../../base/browser/touch.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';

package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js

@@ -9,7 +9,7 @@ import { stringHash } from '../../../../base/common/hash.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { mixin } from '../../../../base/common/objects.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
-import { isString, isUndefinedOrNull } from '../../../../base/common/types.js';
+import { isUndefinedOrNull, isString } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { Range } from '../../../../editor/common/core/range.js';

package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { OS, isWindows } from '../../../../base/common/platform.js';
-import { extname, basename as basename$1, isAbsolute } from '../../../../base/common/path.js';
-import { basename, basenameOrAuthority, joinPath, isEqualOrParent, distinctParents } from '../../../../base/common/resources.js';
+import { extname, basename, isAbsolute } from '../../../../base/common/path.js';
+import { basenameOrAuthority, joinPath, basename as basename$1, isEqualOrParent, distinctParents } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Action } from '../../../../base/common/actions.js';
@@ -19,7 +19,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
-import { ICommandService, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { Schemas } from '../../../../base/common/network.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
@@ -46,7 +46,7 @@ import { IPaneCompositePartService } from '../../../services/panecomposite/brows
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 import { IPathService } from '../../../services/path/common/pathService.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
-import { ActiveEditorContext, EmptyWorkspaceSupportContext, ActiveEditorCanToggleReadonlyContext } from '../../../common/contextkeys.js';
+import { EmptyWorkspaceSupportContext, ActiveEditorContext, ActiveEditorCanToggleReadonlyContext } from '../../../common/contextkeys.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IDialogService, getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
@@ -447,7 +447,7 @@ function incrementFileName(name, isFolder, incrementalNaming) {
         let extSuffix = '';
         if (!isFolder) {
             extSuffix = extname(name);
-            namePrefix = basename$1(name, extSuffix);
+            namePrefix = basename(name, extSuffix);
         }
         const suffixRegex = /^(.+ copy)( \d+)?$/;
         if (suffixRegex.test(namePrefix)) {
@@ -545,7 +545,7 @@ async function askForOverwrite(fileService, dialogService, targetResource) {
             'vs/workbench/contrib/files/browser/fileActions',
             'confirmOverwrite',
             "A file or folder with the name '{0}' already exists in the destination folder. Do you want to replace it?",
-            basename$1(targetResource.path)
+            basename(targetResource.path)
         )),
         primaryButton: ( localizeWithPath(
             'vs/workbench/contrib/files/browser/fileActions',
@@ -892,7 +892,7 @@ class CompareWithClipboardAction extends Action2 {
                 const provider = instantiationService.createInstance(ClipboardContentProvider);
                 this.registrationDisposal = textModelService.registerTextModelContentProvider(scheme, provider);
             }
-            const name = basename(resource);
+            const name = basename$1(resource);
             const editorLabel = ( localizeWithPath(
                 'vs/workbench/contrib/files/browser/fileActions',
                 'clipboardComparisonLabel',
@@ -1176,7 +1176,7 @@ const pasteFileHandler = async (accessor, fileList) => {
                 'vs/workbench/contrib/files/browser/fileActions',
                 'confirmPasteNative',
                 "Are you sure you want to paste '{0}'?",
-                basename$1(toPaste[0].fsPath)
+                basename(toPaste[0].fsPath)
             ));
         const detail = toPaste.length > 1 ? getFileNamesMessage(toPaste) : undefined;
         const confirmation = await dialogService.confirm({

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js

@@ -30,7 +30,7 @@ import { IWorkspaceEditingService } from '../../../../services/workspaces/common
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { findValidPasteFileTarget } from '../fileActions.js';
 import { createMatches } from '../../../../../base/common/filters.js';
-import { Emitter, EventMultiplexer, Event } from '../../../../../base/common/event.js';
+import { EventMultiplexer, Event, Emitter } from '../../../../../base/common/event.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { isStringArray, isNumber } from '../../../../../base/common/types.js';
 import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -33,7 +33,7 @@ import { isINotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webvi
 import { INotebookSearchService } from '../common/notebookSearch.js';
 import { isINotebookFileMatchNoModel, rawCellPrefix } from '../common/searchNotebookHelpers.js';
 import { ReplacePattern } from '../../../services/search/common/replace.js';
-import { OneLineRange, resultIsMatch, ISearchService } from '../../../services/search/common/search.js';
+import { resultIsMatch, OneLineRange, ISearchService } from '../../../services/search/common/search.js';
 import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from '../../../services/search/common/searchHelpers.js';
 import { CellSearchModel } from '../common/cellSearchModel.js';
 var FileMatch_1, FolderMatch_1, RangeHighlightDecorations_1;