@codingame/monaco-vscode-configuration-service-override 2.2.2 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "2.2.2",
+  "version": "3.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,14 +18,14 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-files-service-override": "2.2.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.2",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.2",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.2",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.2",
-    "@codingame/monaco-vscode-host-service-override": "2.2.2",
-    "@codingame/monaco-vscode-base-service-override": "2.2.2"
+    "@codingame/monaco-vscode-files-service-override": "3.1.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "3.1.0",
+    "@codingame/monaco-vscode-extensions-service-override": "3.1.0",
+    "@codingame/monaco-vscode-environment-service-override": "3.1.0",
+    "@codingame/monaco-vscode-layout-service-override": "3.1.0",
+    "@codingame/monaco-vscode-host-service-override": "3.1.0",
+    "@codingame/monaco-vscode-base-service-override": "3.1.0"
   }
 }

package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js

@@ -2,11 +2,15 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { Extensions as Extensions$1, configurationDefaultsSchemaId, OVERRIDE_PROPERTY_REGEX, validateProperty } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1, configurationDefaultsSchemaId, OVERRIDE_PROPERTY_REGEX, validateProperty, getDefaultValue } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
-import { isObject } from 'vscode/vscode/vs/base/common/types';
+import { isObject, isUndefined } from 'vscode/vscode/vs/base/common/types';
 import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 
 const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
 const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
@@ -204,12 +208,12 @@ const configurationEntrySchema = {
     }
 };
 let _configDelta;
-const defaultConfigurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const defaultConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'configurationDefaults',
     jsonSchema: {
         $ref: configurationDefaultsSchemaId,
     }
-}));
+});
 defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
     if (_configDelta) {
         configurationRegistry.deltaConfiguration(_configDelta);
@@ -251,7 +255,7 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
         _configDelta.addedDefaults = addedDefaultConfigurations;
     }
 });
-const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'configuration',
     deps: [defaultConfigurationExtPoint],
     jsonSchema: {
@@ -268,7 +272,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
             }
         ]
     }
-}));
+});
 const extensionConfigurations = ( new ExtensionIdentifierMap());
 configurationExtPoint.setHandler((extensions, { added, removed }) => {
     _configDelta ??= {};
@@ -527,3 +531,65 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
         "Unknown workspace configuration property"
     ))
 });
+class SettingsTableRenderer extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.type = 'table';
+    }
+    shouldRender(manifest) {
+        return !!manifest.contributes?.configuration;
+    }
+    render(manifest) {
+        const configuration = manifest.contributes?.configuration;
+        let properties = {};
+        if (Array.isArray(configuration)) {
+            configuration.forEach(config => {
+                properties = { ...properties, ...config.properties };
+            });
+        }
+        else if (configuration) {
+            properties = configuration.properties;
+        }
+        const contrib = properties ? ( Object.keys(properties)) : [];
+        const headers = [( localizeWithPath(
+            'vs/workbench/api/common/configurationExtensionPoint',
+            'setting name',
+            "ID"
+        )), ( localizeWithPath(
+            'vs/workbench/api/common/configurationExtensionPoint',
+            'description',
+            "Description"
+        )), ( localizeWithPath(
+            'vs/workbench/api/common/configurationExtensionPoint',
+            'default',
+            "Default"
+        ))];
+        const rows = ( contrib.sort((a, b) => a.localeCompare(b))
+            .map(key => {
+            return [
+                ( new MarkdownString()).appendMarkdown(`\`${key}\``),
+                properties[key].markdownDescription ? ( new MarkdownString(properties[key].markdownDescription, false)) : properties[key].description ?? '',
+                ( new MarkdownString()).appendCodeblock('json', JSON.stringify(isUndefined(properties[key].default) ? getDefaultValue(properties[key].type) : properties[key].default, null, 2)),
+            ];
+        }));
+        return {
+            data: {
+                headers,
+                rows
+            },
+            dispose: () => { }
+        };
+    }
+}
+( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
+    id: 'configuration',
+    label: ( localizeWithPath(
+        'vs/workbench/api/common/configurationExtensionPoint',
+        'settings',
+        "Settings"
+    )),
+    access: {
+        canToggle: false
+    },
+    renderer: ( new SyncDescriptor(SettingsTableRenderer)),
+});

package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { WORKSPACE_SUFFIX, IWorkspaceContextService, hasWorkspaceFileExtension } from 'vscode/vscode/vs/platform/workspace/common/workspace';
@@ -100,11 +100,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.openWorkspaceFromEditor',
-            title: { original: 'Open Workspace', value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/workspaces/browser/workspaces.contribution',
                 'openWorkspace',
                 "Open Workspace"
-            )) },
+            )),
             f1: false,
             menu: {
                 id: MenuId.EditorContent,

package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js

@@ -8,18 +8,18 @@ import { Delayer, Barrier, Queue, Promises } from 'vscode/vscode/vs/base/common/
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IWorkspaceContextService, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceFolder, toWorkspaceFolder, Workspace as Workspace$1 } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { ConfigurationModel, mergeChanges, ConfigurationChangeEvent } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
-import { isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService, isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { NullPolicyConfiguration, PolicyConfiguration } from 'vscode/vscode/vs/platform/configuration/common/configurations';
 import { Configuration } from '../common/configurationModels.js';
 import { APPLY_ALL_PROFILES_SETTING, defaultSettingsSchemaId, userSettingsSchemaId, profileSettingsSchemaId, machineSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, FOLDER_CONFIG_FOLDER_NAME, LOCAL_MACHINE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, PROFILE_SCOPES } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions as Extensions$1, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId, keyFromOverrideIdentifiers } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId, keyFromOverrideIdentifiers } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
 import { ConfigurationEditing } from '../common/configurationEditing.js';
 import { DefaultConfiguration, UserConfiguration, RemoteUserConfiguration, WorkspaceConfiguration, ApplicationConfiguration, FolderConfiguration } from './configuration.js';
 import { mark } from 'vscode/vscode/vs/base/common/performance';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
@@ -72,7 +72,7 @@ class WorkspaceService extends Disposable {
         this._restrictedSettings = { default: [] };
         this._onDidChangeRestrictedSettings = this._register(( new Emitter()));
         this.onDidChangeRestrictedSettings = this._onDidChangeRestrictedSettings.event;
-        this.configurationRegistry = ( Registry.as(Extensions$1.Configuration));
+        this.configurationRegistry = ( Registry.as(Extensions.Configuration));
         this.initRemoteUserConfigurationBarrier = ( new Barrier());
         this.completeWorkspaceBarrier = ( new Barrier());
         this.defaultConfiguration = this._register(( new DefaultConfiguration(configurationCache, environmentService)));
@@ -1000,7 +1000,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
         this.workspaceTrustManagementService = workspaceTrustManagementService;
         extensionService.whenInstalledExtensionsRegistered().then(() => {
             this.registerConfigurationSchemas();
-            const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
+            const configurationRegistry = ( Registry.as(Extensions.Configuration));
             const delayer = this._register(( new Delayer(50)));
             this._register(Event.any(configurationRegistry.onDidUpdateConfiguration, configurationRegistry.onDidSchemaChange, workspaceTrustManagementService.onDidChangeTrust)(() => delayer.trigger(() => this.registerConfigurationSchemas(), lifecycleService.phase === 4  ? undefined : 2500 )));
         });
@@ -1121,12 +1121,25 @@ RegisterConfigurationSchemasContribution = ( __decorate([
     ( __param(3, IExtensionService)),
     ( __param(4, ILifecycleService))
 ], RegisterConfigurationSchemasContribution));
+let ResetConfigurationDefaultsOverridesCache = class ResetConfigurationDefaultsOverridesCache extends Disposable {
+    constructor(configurationService, extensionService) {
+        super();
+        if (configurationService.hasCachedConfigurationDefaultsOverrides()) {
+            extensionService.whenInstalledExtensionsRegistered().then(() => configurationService.reloadConfiguration(7 ));
+        }
+    }
+};
+ResetConfigurationDefaultsOverridesCache = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, IExtensionService))
+], ResetConfigurationDefaultsOverridesCache));
 let UpdateExperimentalSettingsDefaults = class UpdateExperimentalSettingsDefaults extends Disposable {
+    static { this.ID = 'workbench.contrib.updateExperimentalSettingsDefaults'; }
     constructor(workbenchAssignmentService) {
         super();
         this.workbenchAssignmentService = workbenchAssignmentService;
         this.processedExperimentalSettings = ( new Set());
-        this.configurationRegistry = ( Registry.as(Extensions$1.Configuration));
+        this.configurationRegistry = ( Registry.as(Extensions.Configuration));
         this.processExperimentalSettings(( Object.keys(this.configurationRegistry.getConfigurationProperties())));
         this._register(this.configurationRegistry.onDidUpdateConfiguration(({ properties }) => this.processExperimentalSettings(properties)));
     }
@@ -1162,10 +1175,11 @@ let UpdateExperimentalSettingsDefaults = class UpdateExperimentalSettingsDefault
 UpdateExperimentalSettingsDefaults = ( __decorate([
     ( __param(0, IWorkbenchAssignmentService))
 ], UpdateExperimentalSettingsDefaults));
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
+const workbenchContributionsRegistry = ( Registry.as(Extensions$1.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, 3 );
-workbenchContributionsRegistry.registerWorkbenchContribution(UpdateExperimentalSettingsDefaults, 2 );
-const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
+workbenchContributionsRegistry.registerWorkbenchContribution(ResetConfigurationDefaultsOverridesCache, 4 );
+registerWorkbenchContribution2(UpdateExperimentalSettingsDefaults.ID, UpdateExperimentalSettingsDefaults, 2 );
+const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {

package/vscode/src/vs/workbench/services/label/common/labelService.js

@@ -23,7 +23,7 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
 
-const resourceLabelFormattersExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
         description: ( localizeWithPath(
@@ -105,7 +105,7 @@ const resourceLabelFormattersExtPoint = ( ExtensionsRegistry.registerExtensionPo
             }
         }
     }
-}));
+});
 const sepRegexp = /\//g;
 const labelMatchingRegexp = /\$\{(scheme|authoritySuffix|authority|path|(query)\.(.+?))\}/g;
 function hasDriveLetterIgnorePlatform(path) {