@codingame/monaco-vscode-api 8.0.4 → 9.0.2

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

@@ -1,11 +1,10 @@
 import { Event } from '../../../../base/common/event.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { CloseDirection, IEditorPane, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorWillMoveEvent, GroupIdentifier, IVisibleEditorPane, EditorsOrder, IFindEditorOptions, EditorInputWithOptions, IUntypedEditorInput, IMatchEditorOptions, IEditorPartOptions, IToolbarActions } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.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';
@@ -362,6 +361,10 @@ interface IEditorPart extends IEditorGroupsContainer {
      * An event for when the editor part is scrolled.
      */
     readonly onDidScroll: Event<void>;
+    /**
+     * An event for when the editor part is disposed.
+     */
+    readonly onWillDispose: Event<void>;
     /**
      * The identifier of the window the editor part is contained in.
      */
@@ -396,11 +399,6 @@ interface IAuxiliaryEditorPart extends IEditorPart {
      */
     close(): boolean;
 }
-interface IAuxiliaryEditorPartCreateEvent {
-    readonly part: IAuxiliaryEditorPart;
-    readonly instantiationService: IInstantiationService;
-    readonly disposables: DisposableStore;
-}
 interface IEditorWorkingSet {
     readonly id: string;
     readonly name: string;
@@ -713,4 +711,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 IEditorGroupContextKeyProvider, type IEditorGroupsContainer, type IEditorPart, type IEditorReplacement, type IEditorSideGroup, type IEditorWorkingSet, type IEditorWorkingSetOptions, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };
+export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IActiveEditorActions, type IAuxiliaryEditorPart, 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.service.d.ts

@@ -1,10 +1,10 @@
-import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceIdentifier, IInstantiationService } 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, IEditorWorkingSetOptions, IEditorGroupContextKeyProvider } from './editorGroupsService.js';
+import { IEditorGroupsContainer, IAuxiliaryEditorPart, IEditorPart, IEditorGroup, IEditorWorkingSet, IEditorWorkingSetOptions, IEditorGroupContextKeyProvider } from './editorGroupsService.js';
 
 declare const IEditorGroupsService: ServiceIdentifier<IEditorGroupsService>;
 /**
@@ -15,7 +15,7 @@ interface IEditorGroupsService extends IEditorGroupsContainer {
     /**
     * An event for when a new auxiliary editor part is created.
     */
-    readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent>;
+    readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPart>;
     /**
     * Provides access to the main window editor part.
     */
@@ -48,6 +48,13 @@ interface IEditorGroupsService extends IEditorGroupsContainer {
         bounds?: Partial<IRectangle>;
     }): Promise<IAuxiliaryEditorPart>;
     /**
+    * Returns the instantiation service that is scoped to the
+    * provided editor part. Use this method when building UI
+    * that contributes to auxiliary editor parts to ensure the
+    * UI is scoped to that part.
+    */
+    getScopedInstantiationService(part: IEditorPart): IInstantiationService;
+    /**
     * Save a new editor working set from the currently opened
     * editors and group layout.
     */

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

@@ -14,7 +14,7 @@ const editorAssociationsConfigurationNode = {
         'workbench.editorAssociations': {
             type: 'object',
             markdownDescription: ( localize(
-                5659,
+                5580,
                 "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
             )),
             additionalProperties: {

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

@@ -10,7 +10,7 @@ const getDefaultIconPath = () => ( (( (FileAccess.asBrowserUri('vs/workbench/ser
 const extensionsConfigurationNodeBase = {
     id: 'extensions',
     order: 30,
-    title: ( localize(7542, "Extensions")),
+    title: ( localize(7490, "Extensions")),
     type: 'object'
 };
 var EnablementState;

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

@@ -70,8 +70,8 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const recommendedWorksapceFolders = workspace.folders.filter(workspaceFolder => workspaceFolderExtensionsConfigContents.get(workspaceFolder.uri)?.recommendations?.some(r => r.toLowerCase() === extensionId));
         const isRecommended = isWorkspaceRecommended || recommendedWorksapceFolders.length > 0;
         const workspaceOrFolders = isRecommended
-            ? await this.pickWorkspaceOrFolders(recommendedWorksapceFolders, isWorkspaceRecommended ? workspace : undefined, ( localize(3847, "Remove extension recommendation from")))
-            : await this.pickWorkspaceOrFolders(workspace.folders, workspace.configuration ? workspace : undefined, ( localize(3848, "Add extension recommendation to")));
+            ? await this.pickWorkspaceOrFolders(recommendedWorksapceFolders, isWorkspaceRecommended ? workspace : undefined, ( localize(3813, "Remove extension recommendation from")))
+            : await this.pickWorkspaceOrFolders(workspace.folders, workspace.configuration ? workspace : undefined, ( localize(3814, "Add extension recommendation to")));
         for (const workspaceOrWorkspaceFolder of workspaceOrFolders) {
             if (isWorkspace(workspaceOrWorkspaceFolder)) {
                 await this.addOrRemoveWorkspaceRecommendation(extensionId, workspaceOrWorkspaceFolder, workspaceExtensionsConfigContent, !isRecommended);
@@ -93,8 +93,8 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const unWantedWorksapceFolders = workspace.folders.filter(workspaceFolder => workspaceFolderExtensionsConfigContents.get(workspaceFolder.uri)?.unwantedRecommendations?.some(r => r === extensionId));
         const isUnwanted = isWorkspaceUnwanted || unWantedWorksapceFolders.length > 0;
         const workspaceOrFolders = isUnwanted
-            ? await this.pickWorkspaceOrFolders(unWantedWorksapceFolders, isWorkspaceUnwanted ? workspace : undefined, ( localize(3847, "Remove extension recommendation from")))
-            : await this.pickWorkspaceOrFolders(workspace.folders, workspace.configuration ? workspace : undefined, ( localize(3848, "Add extension recommendation to")));
+            ? await this.pickWorkspaceOrFolders(unWantedWorksapceFolders, isWorkspaceUnwanted ? workspace : undefined, ( localize(3813, "Remove extension recommendation from")))
+            : await this.pickWorkspaceOrFolders(workspace.folders, workspace.configuration ? workspace : undefined, ( localize(3814, "Add extension recommendation to")));
         for (const workspaceOrWorkspaceFolder of workspaceOrFolders) {
             if (isWorkspace(workspaceOrWorkspaceFolder)) {
                 await this.addOrRemoveWorkspaceUnwantedRecommendation(extensionId, workspaceOrWorkspaceFolder, workspaceExtensionsConfigContent, !isUnwanted);
@@ -221,7 +221,7 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const folderPicks = ( (workspaceFolders.map(workspaceFolder => {
             return {
                 label: workspaceFolder.name,
-                description: ( localize(3849, "Workspace Folder")),
+                description: ( localize(3815, "Workspace Folder")),
                 workspaceOrFolder: workspaceFolder,
                 iconClasses: getIconClasses(this.modelService, this.languageService, workspaceFolder.uri, FileKind.ROOT_FOLDER)
             };
@@ -229,7 +229,7 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         if (workspace) {
             folderPicks.push({ type: 'separator' });
             folderPicks.push({
-                label: ( localize(3850, "Workspace")),
+                label: ( localize(3816, "Workspace")),
                 workspaceOrFolder: workspace,
             });
         }

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts

@@ -96,7 +96,7 @@ declare abstract class AbstractExtensionService extends Disposable implements IE
     private _resolveAuthorityWithLogging;
     protected _resolveAuthorityOnExtensionHosts(kind: ExtensionHostKind, remoteAuthority: string): Promise<ResolverResult>;
     stopExtensionHosts(reason: string, auto?: boolean): Promise<boolean>;
-    protected _doStopExtensionHosts(): void;
+    protected _doStopExtensionHosts(): Promise<void>;
     private _doStopExtensionHostsWithVeto;
     private _startExtensionHostsIfNecessary;
     private _createExtensionHostManager;
@@ -141,7 +141,7 @@ declare abstract class AbstractExtensionService extends Disposable implements IE
     private _onDidActivateExtensionError;
     private _onExtensionRuntimeError;
     protected abstract _resolveExtensions(): Promise<ResolvedExtensions>;
-    protected abstract _onExtensionHostExit(code: number): void;
+    protected abstract _onExtensionHostExit(code: number): Promise<void>;
     protected abstract _resolveAuthority(remoteAuthority: string): Promise<ResolverResult>;
 }
 declare class ResolvedExtensions {

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts

@@ -15,6 +15,7 @@ interface IExtensionHostManager {
     readonly friendyName: string;
     readonly onDidExit: Event<[number, string | null]>;
     readonly onDidChangeResponsiveState: Event<ResponsiveState>;
+    disconnect(): Promise<void>;
     dispose(): void;
     ready(): Promise<void>;
     representsRunningLocation(runningLocation: ExtensionRunningLocation): boolean;

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

@@ -55,6 +55,7 @@ interface IExtensionHost {
         host: string;
     } | undefined;
     enableInspectPort(): Promise<boolean>;
+    disconnect?(): Promise<void>;
     dispose(): void;
 }
 declare class ExtensionHostExtensions {
@@ -116,6 +117,10 @@ interface WillStopExtensionHostsEvent {
      * user.
      */
     readonly reason: string;
+    /**
+     * A flag to indicate if the operation was triggered automatically
+     */
+    readonly auto: boolean;
     /**
      * Allows to veto the stopping of extension hosts. The veto can be a long running
      * operation.