@codingame/monaco-vscode-layout-service-override 25.1.1 → 26.0.0

package/index.d.ts

@@ -1,15 +1,15 @@
+import type { IDisposable } from "@xterm/headless";
+import * as dom from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
+import type { IViewSize } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/gridview";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable, DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { type IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
-import { type PanelAlignment, Parts, Position } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";
-import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import type { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import type { ILayoutOffsetInfo } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService";
 import { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
-import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import * as dom from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
 import { Part } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part";
-import type { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { Disposable, DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import type { IDisposable } from "@xterm/headless";
-import type { IViewSize } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/gridview";
+import { type IPartVisibilityChangeEvent, type PanelAlignment, Parts, Position } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";
+import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { unsupported } from "@codingame/monaco-vscode-api/tools";
 export declare class LayoutService extends Disposable implements ILayoutService, IWorkbenchLayoutService {
     mainContainer: HTMLElement;
@@ -115,7 +115,7 @@ export declare class LayoutService extends Disposable implements ILayoutService,
     registerPart(part: Part): IDisposable;
     isRestored(): boolean;
     private _onDidChangePartVisibility;
-    onDidChangePartVisibility: Event<void>;
+    onDidChangePartVisibility: Event<IPartVisibilityChangeEvent>;
     readonly offset: ILayoutOffsetInfo;
     private readonly _onDidLayout;
     readonly onDidLayout: Event<dom.IDimension>;

package/index.js

@@ -1,30 +1,32 @@
 
-import { StandaloneServices } from '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
-import { LayoutSettings, Parts, positionFromString, ActivityBarPosition, positionToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
-import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { getActiveDocument, getWindows, isActiveDocument, getWindow, Dimension, isAncestorUsingFlowTo, getClientArea } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isWindows, isLinux, isChrome, isFirefox, isSafari } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { StandaloneCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneCodeEditor';
+import { StandaloneServices } from '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
+import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
+import { getMenuBarVisibility, getTitleBarStyle } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part';
-import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { isWindows, isLinux, isChrome, isFirefox, isSafari } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IAuxiliaryWindowService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
-import { StandaloneCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneCodeEditor';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
-import { getMenuBarVisibility, getTitleBarStyle } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
+import { LayoutSettings, Parts, positionFromString, ActivityBarPosition, positionToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { WorkbenchModeService } from './vscode/src/vs/workbench/services/layout/browser/workbenchModeService.js';
+import { IWorkbenchModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/common/workbenchModeService.service';
+import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { onRenderWorkbench } from '@codingame/monaco-vscode-api/lifecycle';
-import { getWorkbenchContainer } from '@codingame/monaco-vscode-api/workbench';
 import { unsupported } from '@codingame/monaco-vscode-api/tools';
+import { getWorkbenchContainer } from '@codingame/monaco-vscode-api/workbench';
 
 class LayoutService extends Disposable {
     constructor(mainContainer = getWorkbenchContainer()) {
@@ -305,7 +307,7 @@ class LayoutService extends Disposable {
         else {
             this.hiddenParts.delete(part);
         }
-        this._onDidChangePartVisibility.fire();
+        this._onDidChangePartVisibility.fire({ partId: part, visible: !hidden });
         const location = {
             [Parts.SIDEBAR_PART]: ViewContainerLocation.Sidebar,
             [Parts.AUXILIARYBAR_PART]: ViewContainerLocation.AuxiliaryBar,
@@ -397,7 +399,8 @@ onRenderWorkbench((accessor) => {
 });
 function getServiceOverride(container) {
     return {
-        [ILayoutService.toString()]: new SyncDescriptor(LayoutService, [container], true)
+        [ILayoutService.toString()]: new SyncDescriptor(LayoutService, [container], true),
+        [IWorkbenchModeService.toString()]: new SyncDescriptor(WorkbenchModeService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-layout-service-override",
-  "version": "25.1.1",
+  "version": "26.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - layout service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.1"
+    "@codingame/monaco-vscode-api": "26.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/layout/browser/workbenchModeService.d.ts

@@ -0,0 +1,38 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
+import { IWorkbenchModeConfiguration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/common/workbenchModeService";
+import { IWorkbenchModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/common/workbenchModeService.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+export declare class WorkbenchModeService extends Disposable implements IWorkbenchModeService {
+    private readonly workspaceContextService;
+    private readonly fileService;
+    private readonly environmentService;
+    private readonly uriIdentityService;
+    private readonly logService;
+    private readonly storageService;
+    readonly _serviceBrand: undefined;
+    private static readonly WORKBENCH_MODE_STORAGE_KEY;
+    private _workbenchMode;
+    get workbenchMode(): string | undefined;
+    private readonly _onDidChangeWorkbenchMode;
+    readonly onDidChangeWorkbenchMode: Event<string | undefined>;
+    private readonly workbenchModeFileWatcherDiposables;
+    private readonly configurationRegistry;
+    private configurationDefaults;
+    constructor(workspaceContextService: IWorkspaceContextService, fileService: IFileService, environmentService: IEnvironmentService, uriIdentityService: IUriIdentityService, logService: ILogService, storageService: IStorageService);
+    initialize(): Promise<void>;
+    private updateWorkbenchModeConfiguration;
+    private updateConfigurationDefaults;
+    private watchCurrentModeFile;
+    private getWorkbenchModeFileUri;
+    getWorkbenchModeConfiguration(id: string): Promise<IWorkbenchModeConfiguration | undefined>;
+    getWorkbenchModeConfigurations(): Promise<IWorkbenchModeConfiguration[]>;
+    private resolveWorkbenchModeConfiguration;
+    setWorkbenchMode(modeId: string | undefined): Promise<void>;
+    private updateWorkbenchMode;
+}

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

@@ -0,0 +1,165 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+
+var WorkbenchModeService_1;
+let WorkbenchModeService = class WorkbenchModeService extends Disposable {
+    static {
+        WorkbenchModeService_1 = this;
+    }
+    static {
+        this.WORKBENCH_MODE_STORAGE_KEY = "workbench.mode";
+    }
+    get workbenchMode() {
+        return this._workbenchMode;
+    }
+    constructor(
+        workspaceContextService,
+        fileService,
+        environmentService,
+        uriIdentityService,
+        logService,
+        storageService
+    ) {
+        super();
+        this.workspaceContextService = workspaceContextService;
+        this.fileService = fileService;
+        this.environmentService = environmentService;
+        this.uriIdentityService = uriIdentityService;
+        this.logService = logService;
+        this.storageService = storageService;
+        this._onDidChangeWorkbenchMode = this._register(( new Emitter()));
+        this.onDidChangeWorkbenchMode = this._onDidChangeWorkbenchMode.event;
+        this.workbenchModeFileWatcherDiposables = this._register(( new DisposableStore()));
+        this.configurationRegistry = ( Registry.as(Extensions.Configuration));
+        this._workbenchMode = this.workspaceContextService.getWorkspace().isAgentSessionsWorkspace ? "agent-sessions" : this.storageService.get(WorkbenchModeService_1.WORKBENCH_MODE_STORAGE_KEY, StorageScope.WORKSPACE);
+        this.watchCurrentModeFile();
+    }
+    async initialize() {
+        return this.updateWorkbenchModeConfiguration();
+    }
+    async updateWorkbenchModeConfiguration() {
+        const workbenchModeConfiguration = this._workbenchMode ? await this.getWorkbenchModeConfiguration(this._workbenchMode) : undefined;
+        this.updateConfigurationDefaults(workbenchModeConfiguration?.settings);
+    }
+    updateConfigurationDefaults(configurationDefaults) {
+        if (this.configurationDefaults) {
+            this.configurationRegistry.deregisterDefaultConfigurations([this.configurationDefaults]);
+        }
+        if (configurationDefaults) {
+            this.configurationDefaults = {
+                overrides: configurationDefaults,
+                donotCache: true
+            };
+            this.configurationRegistry.registerDefaultConfigurations([this.configurationDefaults]);
+        } else {
+            this.configurationDefaults = undefined;
+        }
+    }
+    watchCurrentModeFile() {
+        if (!this._workbenchMode) {
+            this.workbenchModeFileWatcherDiposables.clear();
+            return;
+        }
+        const workbenchModeFileUri = this.getWorkbenchModeFileUri(this._workbenchMode);
+        if (!workbenchModeFileUri) {
+            this.workbenchModeFileWatcherDiposables.clear();
+            return;
+        }
+        this.workbenchModeFileWatcherDiposables.add(this.fileService.watch(workbenchModeFileUri));
+        this.workbenchModeFileWatcherDiposables.add(this.fileService.onDidFilesChange(e => {
+            if (e.affects(workbenchModeFileUri)) {
+                this.updateWorkbenchModeConfiguration();
+                this._onDidChangeWorkbenchMode.fire(this._workbenchMode);
+            }
+        }));
+    }
+    getWorkbenchModeFileUri(layoutId) {
+        return this.uriIdentityService.extUri.joinPath(
+            this.environmentService.builtinWorkbenchModesHome,
+            `${layoutId}.code-workbench-mode`
+        );
+    }
+    async getWorkbenchModeConfiguration(id) {
+        const resource = this.getWorkbenchModeFileUri(id);
+        return this.resolveWorkbenchModeConfiguration(resource);
+    }
+    async getWorkbenchModeConfigurations() {
+        const result = [];
+        const workbenchModesFolder = this.environmentService.builtinWorkbenchModesHome;
+        try {
+            const stat = await this.fileService.resolve(workbenchModesFolder);
+            if (!stat.children?.length) {
+                return result;
+            }
+            for (const child of stat.children) {
+                if (child.isDirectory) {
+                    continue;
+                }
+                const workbenchModeConfiguration = await this.resolveWorkbenchModeConfiguration(child.resource);
+                if (workbenchModeConfiguration) {
+                    result.push(workbenchModeConfiguration);
+                }
+            }
+        } catch (error) {
+            this.logService.error(`Error while reading workbench mode files from ${( workbenchModesFolder.toString())}`, error);
+        }
+        return result;
+    }
+    async resolveWorkbenchModeConfiguration(workbenchConfigurationModeFile) {
+        if (this.uriIdentityService.extUri.extname(workbenchConfigurationModeFile) !== ".code-workbench-mode") {
+            return undefined;
+        }
+        try {
+            const content = ( (await this.fileService.readFile(workbenchConfigurationModeFile)).value.toString());
+            const name = this.uriIdentityService.extUri.basename(workbenchConfigurationModeFile);
+            const workbenchModeConfiguration = {
+                id: name.substring(0, name.length - ".code-workbench-mode".length),
+                ...parse(content)
+            };
+            return workbenchModeConfiguration;
+        } catch (error) {
+            this.logService.error(`Error while reading workbench mode file from ${( workbenchConfigurationModeFile.toString())}`, error);
+            return undefined;
+        }
+    }
+    async setWorkbenchMode(modeId) {
+        if (this.workspaceContextService.getWorkspace().isAgentSessionsWorkspace) {
+            throw ( new Error("Cannot set workbench mode in an agent sessions workspace"));
+        }
+        if (this._workbenchMode === modeId) {
+            return;
+        }
+        this.updateWorkbenchMode(modeId);
+        await this.updateWorkbenchModeConfiguration();
+        this.watchCurrentModeFile();
+        this._onDidChangeWorkbenchMode.fire(modeId);
+    }
+    updateWorkbenchMode(modeId) {
+        this._workbenchMode = modeId;
+        if (modeId === undefined) {
+            this.storageService.remove(WorkbenchModeService_1.WORKBENCH_MODE_STORAGE_KEY, StorageScope.WORKSPACE);
+        } else {
+            this.storageService.store(
+                WorkbenchModeService_1.WORKBENCH_MODE_STORAGE_KEY,
+                modeId,
+                StorageScope.WORKSPACE,
+                StorageTarget.MACHINE
+            );
+        }
+    }
+};
+WorkbenchModeService = WorkbenchModeService_1 = ( __decorate([( __param(0, IWorkspaceContextService)), ( __param(1, IFileService)), ( __param(2, IEnvironmentService)), ( __param(3, IUriIdentityService)), ( __param(4, ILogService)), ( __param(5, IStorageService))], WorkbenchModeService));
+
+export { WorkbenchModeService };