@codingame/monaco-vscode-configuration-service-override 1.83.7 → 1.83.9

package/configuration.d.ts

@@ -2,7 +2,7 @@ import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/brow
 import { IConfigurationRegistry } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 export { ConfigurationScope, IConfigurationDefaults, IConfigurationNode } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { IFileWriteOptions } from 'vscode/vscode/vs/platform/files/common/files';
-import { Disposable } from 'vscode';
+import * as vscode from 'vscode';
 import { IAnyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 export { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -17,9 +17,13 @@ declare function initUserConfiguration(configurationJson: string, options?: Part
  */
 declare function updateUserConfiguration(configurationJson: string): Promise<void>;
 declare function getUserConfiguration(): Promise<string>;
-declare function onUserConfigurationChange(callback: () => void): Disposable;
+declare function onUserConfigurationChange(callback: () => void): vscode.Disposable;
 declare const configurationRegistry: IConfigurationRegistry;
 declare function reinitializeWorkspace(workspace: IAnyWorkspaceIdentifier): Promise<void>;
-declare function getServiceOverride(defaultWorkspace: URI | IAnyWorkspaceIdentifier): IEditorOverrideServices;
+declare function getServiceOverride(): IEditorOverrideServices;
+/**
+ * @deprecated Provide workspace via the services `initialize` function `configuration.workspaceProvider` parameter
+ */
+declare function getServiceOverride(defaultWorkspace?: URI | IAnyWorkspaceIdentifier): IEditorOverrideServices;
 
 export { configurationRegistry, getServiceOverride as default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration };

package/configuration.js

@@ -30,14 +30,15 @@ import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/wo
 import { AbstractWorkspaceEditingService } from './vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import './vscode/src/vs/workbench/api/common/configurationExtensionPoint.js';
-import getServiceOverride$3, { initFile } from 'vscode/service-override/files';
+import getServiceOverride$1$2, { initFile } from '@codingame/monaco-vscode-files-service-override';
 import { memoizedConstructor, unsupported } from './tools.js';
 import { registerServiceInitializePreParticipant } from 'vscode/lifecycle';
 import { getService } from './services.js';
+import { getWorkspaceIdentifier } from 'vscode/workbench';
 
 const defaultUserConfigurationFile = ( URI.from({ scheme: Schemas.vscodeUserData, path: '/User/settings.json' }));
 async function initUserConfiguration(configurationJson, options, file = defaultUserConfigurationFile) {
-    await initFile(defaultUserConfigurationFile.scheme, file, configurationJson, options);
+    await initFile(file, configurationJson, options);
 }
 async function updateUserConfiguration(configurationJson) {
     const userDataProfilesService = await getService(IUserDataProfilesService);
@@ -78,19 +79,20 @@ class MonacoWorkspaceEditingService extends AbstractWorkspaceEditingService {
         this.enterWorkspace = unsupported;
     }
 }
-let _defaultWorkspace = URI.file('/workspace');
+let _defaultWorkspace;
 registerServiceInitializePreParticipant(async (accessor) => {
     const workspaceService = accessor.get(IWorkspaceContextService);
     workspaceService.acquireInstantiationService(accessor.get(IInstantiationService));
-    if (URI.isUri(_defaultWorkspace)) {
-        const configPath = _defaultWorkspace.with({ path: '/workspace.code-workspace' });
+    const workspace = _defaultWorkspace ?? getWorkspaceIdentifier();
+    if (URI.isUri(workspace)) {
+        const configPath = workspace.with({ path: '/workspace.code-workspace' });
         try {
             const fileService = accessor.get(IFileService);
-            await fileService.createFolder(_defaultWorkspace);
+            await fileService.createFolder(workspace);
             await fileService.writeFile(configPath, VSBuffer.fromString(JSON.stringify({
                 folders: [
                     {
-                        path: _defaultWorkspace.path
+                        path: workspace.path
                     }
                 ]
             })));
@@ -103,7 +105,7 @@ registerServiceInitializePreParticipant(async (accessor) => {
         });
     }
     else {
-        await workspaceService.initialize(_defaultWorkspace);
+        await workspaceService.initialize(workspace);
     }
 });
 const MemoizedInjectedConfigurationService = memoizedConstructor(InjectedConfigurationService);
@@ -114,7 +116,7 @@ async function reinitializeWorkspace(workspace) {
 function getServiceOverride(defaultWorkspace) {
     _defaultWorkspace = defaultWorkspace;
     return {
-        ...getServiceOverride$3(),
+        ...getServiceOverride$1$2(),
         [( ILabelService.toString())]: new SyncDescriptor(LabelService, undefined, true),
         [( IConfigurationService.toString())]: new SyncDescriptor(MemoizedInjectedConfigurationService, [], true),
         [( IWorkspaceContextService.toString())]: new SyncDescriptor(MemoizedInjectedConfigurationService, [], true),

package/index.d.ts

@@ -2,4 +2,4 @@ export { configurationRegistry, default, defaultUserConfigurationFile, getUserCo
 export { ConfigurationScope, IConfigurationDefaults, IConfigurationNode } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 export { IColorCustomizations, IThemeScopedColorCustomizations } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 export { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-export { IWorkspaceFolderCreationData } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
+export { IStoredWorkspace, IWorkspaceFolderCreationData } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "1.83.7",
+  "version": "1.83.9",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,12 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.7",
-    "monaco-editor": "0.44.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.9",
+    "monaco-editor": "0.44.0",
+    "@codingame/monaco-vscode-files-service-override": "1.83.9",
+    "@codingame/monaco-vscode-layout-service-override": "1.83.9",
+    "@codingame/monaco-vscode-environment-service-override": "1.83.9",
+    "@codingame/monaco-vscode-extensions-service-override": "1.83.9",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.83.9"
   }
 }

package/services.js

@@ -1,16 +1,19 @@
-import './missing-services.js';
+import 'vscode/missing-services';
 export { default as Severity } from 'monaco-editor/esm/vs/base/common/severity.js';
 export { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
 export { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
+import 'monaco-editor/esm/vs/base/common/objects.js';
 export { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import 'vscode/service-override/layout';
-import 'vscode/service-override/environment';
-import 'vscode/service-override/extensions';
-import 'vscode/service-override/files';
-import 'vscode/service-override/quickaccess';
-import { serviceInitializedBarrier } from 'vscode/lifecycle';
+export { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import '@codingame/monaco-vscode-layout-service-override';
+import '@codingame/monaco-vscode-environment-service-override';
+import '@codingame/monaco-vscode-extensions-service-override';
+import '@codingame/monaco-vscode-files-service-override';
+import '@codingame/monaco-vscode-quickaccess-service-override';
+import { waitServicesReady } from 'vscode/lifecycle';
+import 'vscode/workbench';
 export { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 export { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 export { INotificationService, NeverShowAgainScope, NoOpNotification, NoOpProgress, NotificationPriority, NotificationsFilter } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
@@ -27,7 +30,6 @@ import './override/vs/platform/dialogs/common/dialogs.js';
 export { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 export { IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
 export { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-export { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
 export { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 export { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 export { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
@@ -76,15 +78,9 @@ export { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/brows
 export { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
 export { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
-StandaloneServices.withServices(() => {
-    return Disposable.None;
-});
-async function waitServicesReady() {
-    await serviceInitializedBarrier.wait();
-}
 async function getService(identifier) {
     await waitServicesReady();
     return StandaloneServices.get(identifier);
 }
 
-export { getService, waitServicesReady };
+export { getService };

package/l10n.js

@@ -1,8 +0,0 @@
-import 'monaco-editor/esm/vs/nls.js';
-
-const extensionTranslationsUri = {};
-function getBuiltInExtensionTranslationsUris(language) {
-    return extensionTranslationsUri[language];
-}
-
-export { getBuiltInExtensionTranslationsUris };