@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/services/editor/browser/editorService.js

@@ -1,29 +1,33 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { EditorResourceAccessor, SideBySideEditor, isEditorInput, isEditorInputWithOptions, isResourceMergeEditorInput, isResourceDiffEditorInput, isResourceEditorInput, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
+import { EditorResourceAccessor, SideBySideEditor, EditorsOrder, isEditorInput, isEditorInputWithOptions, isResourceMergeEditorInput, isResourceDiffEditorInput, isResourceEditorInput, EditorInputCapabilities, SaveReason, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { ResourceMap, ResourceSet } from '../../../../base/common/map.js';
-import { FileChangesEvent } from '../../../../platform/files/common/files.js';
+import { FileOperation, FileChangesEvent, FileChangeType } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
 import { joinPath } from '../../../../base/common/resources.js';
 import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
-import { isEditorReplacement } from '../common/editorGroupsService.js';
+import { SideBySideEditor as SideBySideEditor$1 } from '../../../browser/parts/editor/sideBySideEditor.js';
+import { GroupsOrder, isEditorReplacement } from '../common/editorGroupsService.js';
 import { IEditorGroupsService } from '../common/editorGroupsService.service.js';
 import { isPreferredGroup } from '../common/editorService.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { Disposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { distinct, coalesce } from '../../../../base/common/arrays.js';
 import { isCodeEditor, isDiffEditor, isCompositeEditor } from '../../../../editor/browser/editorBrowser.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { isUndefined } from '../../../../base/common/types.js';
 import { EditorsObserver } from '../../../browser/parts/editor/editorsObserver.js';
 import { timeout, Promises } from '../../../../base/common/async.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { indexOfPath } from '../../../../base/common/extpath.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
+import { ResolvedStatus } from '../common/editorResolverService.js';
 import { IEditorResolverService } from '../common/editorResolverService.service.js';
+import { WorkspaceTrustUriResponse } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.service.js';
 import { IHostService } from '../../host/browser/host.service.js';
 import { findGroup } from '../common/editorGroupFinder.js';
@@ -166,10 +170,10 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
         }
     }
     async onDidRunFileOperation(e) {
-        if (e.isOperation(2 )) {
+        if (e.isOperation(FileOperation.MOVE)) {
             this.handleMovedFile(e.resource, e.target.resource);
         }
-        if (e.isOperation(1 ) || e.isOperation(2 )) {
+        if (e.isOperation(FileOperation.DELETE) || e.isOperation(FileOperation.MOVE)) {
             this.handleDeletedFile(e.resource, false, e.target ? e.target.resource : undefined);
         }
     }
@@ -258,7 +262,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
                     }
                     let matches = false;
                     if (arg1 instanceof FileChangesEvent) {
-                        matches = arg1.contains(resource, 2 );
+                        matches = arg1.contains(resource, FileChangeType.DELETED);
                     }
                     else {
                         matches = this.uriIdentityService.extUri.isEqualOrParent(resource, arg1);
@@ -281,7 +285,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
     getAllNonDirtyEditors(options) {
         const editors = [];
         function conditionallyAddEditor(editor) {
-            if (editor.hasCapability(4 ) && !options.includeUntitled) {
+            if (editor.hasCapability(EditorInputCapabilities.Untitled) && !options.includeUntitled) {
                 return;
             }
             if (editor.isDirty()) {
@@ -331,19 +335,19 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
         return this.editorsObserver.count;
     }
     get editors() {
-        return ( this.getEditors(1 ).map(({ editor }) => editor));
+        return ( this.getEditors(EditorsOrder.SEQUENTIAL).map(({ editor }) => editor));
     }
     getEditors(order, options) {
         switch (order) {
-            case 0 :
+            case EditorsOrder.MOST_RECENTLY_ACTIVE:
                 if (options?.excludeSticky) {
                     return this.editorsObserver.editors.filter(({ groupId, editor }) => !this.editorGroupsContainer.getGroup(groupId)?.isSticky(editor));
                 }
                 return this.editorsObserver.editors;
-            case 1 : {
+            case EditorsOrder.SEQUENTIAL: {
                 const editors = [];
-                for (const group of this.editorGroupsContainer.getGroups(2 )) {
-                    editors.push(...( group.getEditors(1 , options).map(editor => ({ editor, groupId: group.id }))));
+                for (const group of this.editorGroupsContainer.getGroups(GroupsOrder.GRID_APPEARANCE)) {
+                    editors.push(...( group.getEditors(EditorsOrder.SEQUENTIAL, options).map(editor => ({ editor, groupId: group.id }))));
                 }
                 return editors;
             }
@@ -359,9 +363,18 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
     get visibleTextEditorControls() {
         const visibleTextEditorControls = [];
         for (const visibleEditorPane of this.visibleEditorPanes) {
-            const control = visibleEditorPane.getControl();
-            if (isCodeEditor(control) || isDiffEditor(control)) {
-                visibleTextEditorControls.push(control);
+            const controls = [];
+            if (visibleEditorPane instanceof SideBySideEditor$1) {
+                controls.push(visibleEditorPane.getPrimaryEditorPane()?.getControl());
+                controls.push(visibleEditorPane.getSecondaryEditorPane()?.getControl());
+            }
+            else {
+                controls.push(visibleEditorPane.getControl());
+            }
+            for (const control of controls) {
+                if (isCodeEditor(control) || isDiffEditor(control)) {
+                    visibleTextEditorControls.push(control);
+                }
             }
         }
         return visibleTextEditorControls;
@@ -378,7 +391,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
         }
         if (!isEditorInput(editor)) {
             const resolvedEditor = await this.editorResolverService.resolveEditor(editor, preferredGroup);
-            if (resolvedEditor === 1 ) {
+            if (resolvedEditor === ResolvedStatus.ABORT) {
                 return;
             }
             if (isEditorInputWithOptionsAndGroup(resolvedEditor)) {
@@ -418,7 +431,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
             let group = undefined;
             if (!isEditorInputWithOptions(editor)) {
                 const resolvedEditor = await this.editorResolverService.resolveEditor(editor, preferredGroup);
-                if (resolvedEditor === 1 ) {
+                if (resolvedEditor === ResolvedStatus.ABORT) {
                     continue;
                 }
                 if (isEditorInputWithOptionsAndGroup(resolvedEditor)) {
@@ -455,12 +468,12 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
         const { resources, diffMode, mergeMode } = this.extractEditorResources(editors);
         const trustResult = await this.workspaceTrustRequestService.requestOpenFilesTrust(resources);
         switch (trustResult) {
-            case 1 :
+            case WorkspaceTrustUriResponse.Open:
                 return true;
-            case 2 :
+            case WorkspaceTrustUriResponse.OpenInNewWindow:
                 await this.hostService.openWindow(( resources.map(resource => ({ fileUri: resource }))), { forceNewWindow: true, diffMode, mergeMode });
                 return false;
-            case 3 :
+            case WorkspaceTrustUriResponse.Cancel:
                 return false;
         }
     }
@@ -591,7 +604,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
         }
         else {
             const result = [];
-            for (const group of this.editorGroupsContainer.getGroups(1 )) {
+            for (const group of this.editorGroupsContainer.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
                 const editors = [];
                 if (URI.isUri(arg1)) {
                     editors.push(...this.findEditors(arg1, options, group));
@@ -614,7 +627,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
             let typedReplacement = undefined;
             if (!isEditorInput(replacement.replacement)) {
                 const resolvedEditor = await this.editorResolverService.resolveEditor(replacement.replacement, targetGroup);
-                if (resolvedEditor === 1 ) {
+                if (resolvedEditor === ResolvedStatus.ABORT) {
                     continue;
                 }
                 if (isEditorInputWithOptionsAndGroup(resolvedEditor)) {
@@ -650,7 +663,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
         }
         else {
             for (const { groupId, editor } of uniqueEditors) {
-                if (editor.hasCapability(4 )) {
+                if (editor.hasCapability(EditorInputCapabilities.Untitled)) {
                     editorsToSaveSequentially.push({ groupId, editor });
                 }
                 else {
@@ -659,7 +672,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
             }
         }
         const saveResults = await Promises.settled(( editorsToSaveParallel.map(({ groupId, editor }) => {
-            if (options?.reason === 1 ) {
+            if (options?.reason === SaveReason.EXPLICIT) {
                 this.editorGroupsContainer.getGroup(groupId)?.pinEditor(editor);
             }
             return editor.save(groupId, options);
@@ -679,7 +692,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
                 break;
             }
             if (!editor.matches(result)) {
-                const targetGroups = editor.hasCapability(4 ) ? ( this.editorGroupsContainer.groups.map(group => group.id) ) : [groupId];
+                const targetGroups = editor.hasCapability(EditorInputCapabilities.Untitled) ? ( this.editorGroupsContainer.groups.map(group => group.id) ) : [groupId];
                 for (const targetGroup of targetGroups) {
                     if (result instanceof EditorInput) {
                         await this.replaceEditors([{ editor, replacement: result, options: editorOptions }], targetGroup);
@@ -714,16 +727,16 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
     }
     getAllModifiedEditors(options) {
         const editors = [];
-        for (const group of this.editorGroupsContainer.getGroups(1 )) {
-            for (const editor of group.getEditors(0 )) {
+        for (const group of this.editorGroupsContainer.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
+            for (const editor of group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
                 if (!editor.isModified()) {
                     continue;
                 }
                 if ((typeof options?.includeUntitled === 'boolean' || !options?.includeUntitled?.includeScratchpad)
-                    && editor.hasCapability(512 )) {
+                    && editor.hasCapability(EditorInputCapabilities.Scratchpad)) {
                     continue;
                 }
-                if (!options?.includeUntitled && editor.hasCapability(4 )) {
+                if (!options?.includeUntitled && editor.hasCapability(EditorInputCapabilities.Untitled)) {
                     continue;
                 }
                 if (options?.excludeSticky && group.isSticky(editor)) {

package/vscode/src/vs/workbench/services/editor/common/customEditorLabelService.js

@@ -5,6 +5,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isAbsolute, parse as parse$1, dirname as dirname$1 } from '../../../../base/common/path.js';
 import { relativePath, dirname } from '../../../../base/common/resources.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { MRUCache } from '../../../../base/common/map.js';
 import '../../../../platform/instantiation/common/instantiation.js';

package/vscode/src/vs/workbench/services/editor/common/editorGroupColumn.js

@@ -1,23 +1,23 @@
-import { preferredSideBySideGroupDirection } from './editorGroupsService.js';
+import { GroupsOrder, preferredSideBySideGroupDirection } from './editorGroupsService.js';
 import { ACTIVE_GROUP, SIDE_GROUP } from './editorService.js';
 function columnToEditorGroup(editorGroupService, configurationService, column = ACTIVE_GROUP) {
     if (column === ACTIVE_GROUP || column === SIDE_GROUP) {
         return column;
     }
-    let groupInColumn = editorGroupService.getGroups(2 )[column];
+    let groupInColumn = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[column];
     if (!groupInColumn && column < 9) {
         for (let i = 0; i <= column; i++) {
-            const editorGroups = editorGroupService.getGroups(2 );
+            const editorGroups = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE);
             if (!editorGroups[i]) {
                 editorGroupService.addGroup(editorGroups[i - 1], preferredSideBySideGroupDirection(configurationService));
             }
         }
-        groupInColumn = editorGroupService.getGroups(2 )[column];
+        groupInColumn = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[column];
     }
     return groupInColumn?.id ?? SIDE_GROUP;
 }
 function editorGroupToColumn(editorGroupService, editorGroup) {
     const group = (typeof editorGroup === 'number') ? editorGroupService.getGroup(editorGroup) : editorGroup;
-    return editorGroupService.getGroups(2 ).indexOf(group ?? editorGroupService.activeGroup);
+    return editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE).indexOf(group ?? editorGroupService.activeGroup);
 }
 export { columnToEditorGroup, editorGroupToColumn };

package/vscode/src/vs/workbench/services/editor/common/editorGroupFinder.js

@@ -1,7 +1,7 @@
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { EditorActivation } from '../../../../platform/editor/common/editor.js';
-import { isEditorInput, isEditorInputWithOptions } from '../../../common/editor.js';
-import { preferredSideBySideGroupDirection } from './editorGroupsService.js';
+import { isEditorInput, EditorInputCapabilities, isEditorInputWithOptions } from '../../../common/editor.js';
+import { preferredSideBySideGroupDirection, GroupsOrder } from './editorGroupsService.js';
 import { IEditorGroupsService } from './editorGroupsService.service.js';
 import { SIDE_GROUP, AUX_WINDOW_GROUP } from './editorService.js';
 function findGroup(accessor, editor, preferredGroup) {
@@ -47,7 +47,7 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
         group = editorGroupService.createAuxiliaryEditorPart().then(group => group.activeGroup);
     }
     else if (!options || typeof options.index !== 'number') {
-        const groupsByLastActive = editorGroupService.getGroups(1 );
+        const groupsByLastActive = editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
         if (options?.revealIfVisible) {
             for (const lastActiveGroup of groupsByLastActive) {
                 if (isActive(lastActiveGroup, editor)) {
@@ -57,7 +57,7 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
             }
         }
         if (!group) {
-            if (options?.revealIfOpened || configurationService.getValue('workbench.editor.revealIfOpen') || (isEditorInput(editor) && editor.hasCapability(8 ))) {
+            if (options?.revealIfOpened || configurationService.getValue('workbench.editor.revealIfOpen') || (isEditorInput(editor) && editor.hasCapability(EditorInputCapabilities.Singleton))) {
                 let groupWithInputActive = undefined;
                 let groupWithInputOpened = undefined;
                 for (const group of groupsByLastActive) {
@@ -80,7 +80,7 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
     if (!group) {
         let candidateGroup = editorGroupService.activeGroup;
         if (isGroupLockedForEditor(candidateGroup, editor)) {
-            for (const group of editorGroupService.getGroups(1 )) {
+            for (const group of editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
                 if (isGroupLockedForEditor(group, editor)) {
                     continue;
                 }

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts

@@ -6,6 +6,7 @@ import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IDimension } from '../../../../editor/common/core/dimension.js';
 import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyValue, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IGroupModelChangeEvent } from '../../../common/editor/editorGroupModel.js';
 import { IMenuChangeEvent } from '../../../../platform/actions/common/actions.js';
@@ -404,6 +405,23 @@ interface IEditorWorkingSet {
     readonly id: string;
     readonly name: string;
 }
+interface IEditorWorkingSetOptions {
+    readonly preserveFocus?: boolean;
+}
+interface IEditorGroupContextKeyProvider<T extends ContextKeyValue> {
+    /**
+     * The context key that needs to be set for each editor group context and the global context.
+     */
+    readonly contextKey: RawContextKey<T>;
+    /**
+     * Retrieves the context key value for the given editor group.
+     */
+    readonly getGroupContextKeyValue: (group: IEditorGroup) => T;
+    /**
+     * An event that is fired when there was a change leading to the context key value to be re-evaluated.
+     */
+    readonly onDidChange?: Event<void>;
+}
 interface IActiveEditorActions {
     readonly actions: IToolbarActions;
     readonly onDidChange: Event<IMenuChangeEvent | void>;
@@ -469,6 +487,11 @@ interface IEditorGroup {
      * within the current active editor pane.
      */
     readonly activeEditor: EditorInput | null;
+    /**
+     * All selected editor in this group in sequential order.
+     * The active editor is always part of the selection.
+     */
+    readonly selectedEditors: EditorInput[];
     /**
      * The editor in the group that is in preview mode if any. There can
      * only ever be one editor in preview mode.
@@ -570,6 +593,18 @@ interface IEditorGroup {
      * Find out if the provided editor is active in the group.
      */
     isActive(editor: EditorInput | IUntypedEditorInput): boolean;
+    /**
+     * Whether the editor is selected in the group.
+     */
+    isSelected(editor: EditorInput): boolean;
+    /**
+     * Set a new selection for this group. This will replace the current
+     * selection with the new selection.
+     *
+     * @param activeSelectedEditor the editor to set as active selected editor
+     * @param inactiveSelectedEditors the inactive editors to set as selected
+     */
+    setSelection(activeSelectedEditor: EditorInput, inactiveSelectedEditors: EditorInput[]): Promise<void>;
     /**
      * Find out if a certain editor is included in the group.
      *
@@ -678,4 +713,4 @@ interface IEditorGroup {
     createEditorActions(disposables: DisposableStore): IActiveEditorActions;
 }
 
-export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IActiveEditorActions, type IAuxiliaryEditorPart, type IAuxiliaryEditorPartCreateEvent, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorDropTargetDelegate, type IEditorGroup, type IEditorGroupsContainer, type IEditorPart, type IEditorReplacement, type IEditorSideGroup, type IEditorWorkingSet, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };
+export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IActiveEditorActions, type IAuxiliaryEditorPart, type IAuxiliaryEditorPartCreateEvent, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorDropTargetDelegate, type IEditorGroup, type IEditorGroupContextKeyProvider, type IEditorGroupsContainer, type IEditorPart, type IEditorReplacement, type IEditorSideGroup, type IEditorWorkingSet, type IEditorWorkingSetOptions, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.js

@@ -46,8 +46,8 @@ function isEditorGroup(obj) {
 function preferredSideBySideGroupDirection(configurationService) {
     const openSideBySideDirection = configurationService.getValue('workbench.editor.openSideBySideDirection');
     if (openSideBySideDirection === 'down') {
-        return 1 ;
+        return GroupDirection.DOWN;
     }
-    return 3 ;
+    return GroupDirection.RIGHT;
 }
 export { GroupDirection, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, MergeGroupMode, isEditorGroup, isEditorReplacement, preferredSideBySideGroupDirection };

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts

@@ -1,8 +1,10 @@
 import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
 import { Event } from '../../../../base/common/event.js';
 import { GroupIdentifier, IEditorPartOptions, IEditorPartOptionsChangeEvent } from '../../../common/editor.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyValue } from '../../../../platform/contextkey/common/contextkey.js';
 import { IRectangle } from '../../../../platform/window/common/window.js';
-import { IEditorGroupsContainer, IAuxiliaryEditorPartCreateEvent, IEditorPart, IEditorGroup, IAuxiliaryEditorPart, IEditorWorkingSet } from './editorGroupsService.js';
+import { IEditorGroupsContainer, IAuxiliaryEditorPartCreateEvent, IEditorPart, IEditorGroup, IAuxiliaryEditorPart, IEditorWorkingSet, IEditorWorkingSetOptions, IEditorGroupContextKeyProvider } from './editorGroupsService.js';
 
 declare const IEditorGroupsService: ServiceIdentifier<IEditorGroupsService>;
 /**
@@ -59,11 +61,18 @@ interface IEditorGroupsService extends IEditorGroupsContainer {
     *
     * @returns `true` when the working set as applied.
     */
-    applyWorkingSet(workingSet: IEditorWorkingSet | 'empty'): Promise<boolean>;
+    applyWorkingSet(workingSet: IEditorWorkingSet | 'empty', options?: IEditorWorkingSetOptions): Promise<boolean>;
     /**
     * Deletes a working set.
     */
     deleteWorkingSet(workingSet: IEditorWorkingSet): void;
+    /**
+    * Registers a context key provider. This provider sets a context key for each scoped editor group context and the global context.
+    *
+    * @param provider - The context key provider to be registered.
+    * @returns - A disposable object to unregister the provider.
+    */
+    registerContextKeyProvider<T extends ContextKeyValue>(provider: IEditorGroupContextKeyProvider<T>): IDisposable;
 }
 
 export { IEditorGroupsService };

package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js

@@ -33,6 +33,11 @@ var RegisteredEditorPriority;
     RegisteredEditorPriority["exclusive"] = "exclusive";
     RegisteredEditorPriority["default"] = "default";
 })(RegisteredEditorPriority || (RegisteredEditorPriority = {}))));
+var ResolvedStatus;
+( ((function(ResolvedStatus) {
+    ResolvedStatus[ResolvedStatus["ABORT"] = 1] = "ABORT";
+    ResolvedStatus[ResolvedStatus["NONE"] = 2] = "NONE";
+})(ResolvedStatus || (ResolvedStatus = {}))));
 function priorityToRank(priority) {
     switch (priority) {
         case RegisteredEditorPriority.exclusive:
@@ -60,4 +65,4 @@ function globMatchesResource(globPattern, resource) {
     const target = matchOnPath ? `${resource.scheme}:${resource.path}` : basename(resource);
     return match(typeof globPattern === 'string' ? globPattern.toLowerCase() : globPattern, target.toLowerCase());
 }
-export { RegisteredEditorPriority, editorsAssociationsSettingId, globMatchesResource, priorityToRank };
+export { RegisteredEditorPriority, ResolvedStatus, editorsAssociationsSettingId, globMatchesResource, priorityToRank };

package/vscode/src/vs/workbench/services/editor/common/editorService.service.d.ts

@@ -77,6 +77,9 @@ interface IEditorService {
     /**
     * All text editor widgets that are currently visible across all editor groups. A text editor
     * widget is either a text or a diff editor.
+    *
+    * This property supports side-by-side editors as well, by returning both sides if they are
+    * text editor widgets.
     */
     readonly visibleTextEditorControls: readonly (IEditor | IDiffEditor)[];
     /**

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

@@ -13,6 +13,7 @@ interface IExtensionManagementServer {
     readonly extensionManagementService: IProfileAwareExtensionManagementService;
 }
 interface IResourceExtension {
+    readonly type: 'resource';
     readonly identifier: IExtensionIdentifier;
     readonly location: URI;
     readonly manifest: IExtensionManifest;

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

@@ -1,6 +1,12 @@
 import { FileAccess } from '../../../../base/common/network.js';
 import { localizeWithPath } from '../../../../nls.js';
 const _moduleId = "vs/workbench/services/extensionManagement/common/extensionManagement";
+var ExtensionInstallLocation;
+( ((function(ExtensionInstallLocation) {
+    ExtensionInstallLocation[ExtensionInstallLocation["Local"] = 1] = "Local";
+    ExtensionInstallLocation[ExtensionInstallLocation["Remote"] = 2] = "Remote";
+    ExtensionInstallLocation[ExtensionInstallLocation["Web"] = 3] = "Web";
+})(ExtensionInstallLocation || (ExtensionInstallLocation = {}))));
 const getDefaultIconPath = () => ( (( (FileAccess.asBrowserUri('vs/workbench/services/extensionManagement/common/media/defaultIcon.png'))).toString(true)));
 const extensionsConfigurationNodeBase = {
     id: 'extensions',
@@ -8,4 +14,17 @@ const extensionsConfigurationNodeBase = {
     title: ( localizeWithPath(_moduleId, 0, "Extensions")),
     type: 'object'
 };
-export { extensionsConfigurationNodeBase, getDefaultIconPath };
+var EnablementState;
+( ((function(EnablementState) {
+    EnablementState[EnablementState["DisabledByTrustRequirement"] = 0] = "DisabledByTrustRequirement";
+    EnablementState[EnablementState["DisabledByExtensionKind"] = 1] = "DisabledByExtensionKind";
+    EnablementState[EnablementState["DisabledByEnvironment"] = 2] = "DisabledByEnvironment";
+    EnablementState[EnablementState["EnabledByEnvironment"] = 3] = "EnabledByEnvironment";
+    EnablementState[EnablementState["DisabledByVirtualWorkspace"] = 4] = "DisabledByVirtualWorkspace";
+    EnablementState[EnablementState["DisabledByExtensionDependency"] = 5] = "DisabledByExtensionDependency";
+    EnablementState[EnablementState["DisabledGlobally"] = 6] = "DisabledGlobally";
+    EnablementState[EnablementState["DisabledWorkspace"] = 7] = "DisabledWorkspace";
+    EnablementState[EnablementState["EnabledGlobally"] = 8] = "EnabledGlobally";
+    EnablementState[EnablementState["EnabledWorkspace"] = 9] = "EnabledWorkspace";
+})(EnablementState || (EnablementState = {}))));
+export { EnablementState, ExtensionInstallLocation, extensionsConfigurationNodeBase, getDefaultIconPath };

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts

@@ -20,6 +20,7 @@ interface IWorkbenchExtensionManagementService extends IProfileAwareExtensionMan
     onDidChangeProfile: Event<DidChangeProfileForServerEvent>;
     onDidEnableExtensions: Event<IExtension[]>;
     getExtensions(locations: URI[]): Promise<IResourceExtension[]>;
+    getInstalledWorkspaceExtensionLocations(): URI[];
     getInstalledWorkspaceExtensions(includeInvalid: boolean): Promise<ILocalExtension[]>;
     canInstall(extension: IGalleryExtension | IResourceExtension): Promise<boolean>;
     installVSIX(location: URI, manifest: IExtensionManifest, installOptions?: InstallOptions): Promise<ILocalExtension>;

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

@@ -0,0 +1,11 @@
+var ExtensionRecommendationReason;
+( (function(ExtensionRecommendationReason) {
+    ExtensionRecommendationReason[ExtensionRecommendationReason["Workspace"] = 0] = "Workspace";
+    ExtensionRecommendationReason[ExtensionRecommendationReason["File"] = 1] = "File";
+    ExtensionRecommendationReason[ExtensionRecommendationReason["Executable"] = 2] = "Executable";
+    ExtensionRecommendationReason[ExtensionRecommendationReason["WorkspaceConfig"] = 3] = "WorkspaceConfig";
+    ExtensionRecommendationReason[ExtensionRecommendationReason["DynamicWorkspace"] = 4] = "DynamicWorkspace";
+    ExtensionRecommendationReason[ExtensionRecommendationReason["Experimental"] = 5] = "Experimental";
+    ExtensionRecommendationReason[ExtensionRecommendationReason["Application"] = 6] = "Application";
+})(ExtensionRecommendationReason || (ExtensionRecommendationReason = {})));
+export { ExtensionRecommendationReason };

package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js

@@ -1,11 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { distinct, flatten } from '../../../../base/common/arrays.js';
+import { distinct } from '../../../../base/common/arrays.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { parse } from '../../../../base/common/json.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
 import { FileKind } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { isWorkspace } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
@@ -51,15 +52,11 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
     }
     async getRecommendations() {
         const configs = await this.getExtensionsConfigs();
-        return distinct(flatten(( (configs.map(
-            c => c.recommendations ? ( (c.recommendations.map(c => c.toLowerCase()))) : []
-        )))));
+        return distinct(configs.flatMap(c => c.recommendations ? ( (c.recommendations.map(c => c.toLowerCase()))) : []));
     }
     async getUnwantedRecommendations() {
         const configs = await this.getExtensionsConfigs();
-        return distinct(flatten(( (configs.map(
-            c => c.unwantedRecommendations ? ( (c.unwantedRecommendations.map(c => c.toLowerCase()))) : []
-        )))));
+        return distinct(configs.flatMap(c => c.unwantedRecommendations ? ( (c.unwantedRecommendations.map(c => c.toLowerCase()))) : []));
     }
     async toggleRecommendation(extensionId) {
         extensionId = extensionId.toLowerCase();

package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js

@@ -279,9 +279,15 @@ class Lock {
         customer.resolve(toDisposable(releaseLock));
     }
 }
+var SortBucket;
+( (function(SortBucket) {
+    SortBucket[SortBucket["Builtin"] = 0] = "Builtin";
+    SortBucket[SortBucket["User"] = 1] = "User";
+    SortBucket[SortBucket["Dev"] = 2] = "Dev";
+})(SortBucket || (SortBucket = {})));
 function extensionCmp(a, b) {
-    const aSortBucket = ((a.isBuiltin ? 0  : a.isUnderDevelopment ? 2  : 1) );
-    const bSortBucket = ((b.isBuiltin ? 0  : b.isUnderDevelopment ? 2  : 1) );
+    const aSortBucket = (a.isBuiltin ? SortBucket.Builtin : a.isUnderDevelopment ? SortBucket.Dev : SortBucket.User);
+    const bSortBucket = (b.isBuiltin ? SortBucket.Builtin : b.isUnderDevelopment ? SortBucket.Dev : SortBucket.User);
     if (aSortBucket !== bSortBucket) {
         return aSortBucket - bSortBucket;
     }

package/vscode/src/vs/workbench/services/extensions/common/extensionHostKind.js

@@ -10,18 +10,24 @@ function extensionHostKindToString(kind) {
         return 'None';
     }
     switch (kind) {
-        case 1 : return 'LocalProcess';
-        case 2 : return 'LocalWebWorker';
-        case 3 : return 'Remote';
+        case ExtensionHostKind.LocalProcess: return 'LocalProcess';
+        case ExtensionHostKind.LocalWebWorker: return 'LocalWebWorker';
+        case ExtensionHostKind.Remote: return 'Remote';
     }
 }
+var ExtensionRunningPreference;
+( (function(ExtensionRunningPreference) {
+    ExtensionRunningPreference[ExtensionRunningPreference["None"] = 0] = "None";
+    ExtensionRunningPreference[ExtensionRunningPreference["Local"] = 1] = "Local";
+    ExtensionRunningPreference[ExtensionRunningPreference["Remote"] = 2] = "Remote";
+})(ExtensionRunningPreference || (ExtensionRunningPreference = {})));
 function extensionRunningPreferenceToString(preference) {
     switch (preference) {
-        case 0 :
+        case ExtensionRunningPreference.None:
             return 'None';
-        case 1 :
+        case ExtensionRunningPreference.Local:
             return 'Local';
-        case 2 :
+        case ExtensionRunningPreference.Remote:
             return 'Remote';
     }
 }
@@ -46,12 +52,12 @@ function determineExtensionHostKinds(_localExtensions, _remoteExtensions, getExt
         const isInstalledRemotely = Boolean(ext.remote);
         const isLocallyUnderDevelopment = Boolean(ext.local && ext.local.isUnderDevelopment);
         const isRemotelyUnderDevelopment = Boolean(ext.remote && ext.remote.isUnderDevelopment);
-        let preference = 0 ;
+        let preference = ExtensionRunningPreference.None;
         if (isLocallyUnderDevelopment && !isRemotelyUnderDevelopment) {
-            preference = 1 ;
+            preference = ExtensionRunningPreference.Local;
         }
         else if (isRemotelyUnderDevelopment && !isLocallyUnderDevelopment) {
-            preference = 2 ;
+            preference = ExtensionRunningPreference.Remote;
         }
         extensionHostKinds.set(ext.key, pickExtensionHostKind(ext.identifier, ext.kind, isInstalledLocally, isInstalledRemotely, preference));
     });
@@ -101,4 +107,4 @@ class ExtensionInfo {
         return this.remote.kind;
     }
 }
-export { ExtensionHostKind, determineExtensionHostKinds, extensionHostKindToString, extensionRunningPreferenceToString };
+export { ExtensionHostKind, ExtensionRunningPreference, determineExtensionHostKinds, extensionHostKindToString, extensionRunningPreferenceToString };