@codingame/monaco-vscode-configuration-service-override 1.83.6 → 1.83.8

package/configuration.d.ts

@@ -19,6 +19,11 @@ declare function updateUserConfiguration(configurationJson: string): Promise<voi
 declare function getUserConfiguration(): Promise<string>;
 declare function onUserConfigurationChange(callback: () => void): Disposable;
 declare const configurationRegistry: IConfigurationRegistry;
-declare function getServiceOverride(defaultWorkspace: URI | IAnyWorkspaceIdentifier): IEditorOverrideServices;
+declare function reinitializeWorkspace(workspace: IAnyWorkspaceIdentifier): Promise<void>;
+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, updateUserConfiguration };
+export { configurationRegistry, getServiceOverride as default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration };

package/configuration.js

@@ -34,6 +34,7 @@ import getServiceOverride$3, { initFile } from 'vscode/service-override/files';
 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) {
@@ -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,10 +105,14 @@ registerServiceInitializePreParticipant(async (accessor) => {
         });
     }
     else {
-        await workspaceService.initialize(_defaultWorkspace);
+        await workspaceService.initialize(workspace);
     }
 });
 const MemoizedInjectedConfigurationService = memoizedConstructor(InjectedConfigurationService);
+async function reinitializeWorkspace(workspace) {
+    const workspaceService = StandaloneServices.get(IWorkspaceContextService);
+    await workspaceService.initialize(workspace);
+}
 function getServiceOverride(defaultWorkspace) {
     _defaultWorkspace = defaultWorkspace;
     return {
@@ -120,4 +126,4 @@ function getServiceOverride(defaultWorkspace) {
     };
 }
 
-export { configurationRegistry, getServiceOverride as default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, updateUserConfiguration };
+export { configurationRegistry, getServiceOverride as default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration };

package/index.d.ts

@@ -1,4 +1,4 @@
-export { configurationRegistry, default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, updateUserConfiguration } from './configuration.js';
+export { configurationRegistry, default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration } from './configuration.js';
 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';

package/index.js

@@ -1,2 +1,2 @@
-export { configurationRegistry, default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, updateUserConfiguration } from './configuration.js';
+export { configurationRegistry, default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration } from './configuration.js';
 export { ConfigurationScope } from './vscode/src/vs/platform/configuration/common/configurationRegistry.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "1.83.6",
+  "version": "1.83.8",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.6",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.8",
     "monaco-editor": "0.44.0"
   }
 }

package/services.js

@@ -11,6 +11,7 @@ import 'vscode/service-override/extensions';
 import 'vscode/service-override/files';
 import 'vscode/service-override/quickaccess';
 import { serviceInitializedBarrier } 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';