@codingame/monaco-vscode-configuration-service-override 4.1.0 → 4.1.1

package/configuration.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
-import { WorkspaceService } from 'vscode/vscode/vs/workbench/services/configuration/browser/configurationService';
+import { WorkspaceService } from './vscode/src/vs/workbench/services/configuration/browser/configurationService.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
-import { TextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfigurationService';
+import { TextResourceConfigurationService } from './vscode/src/vs/editor/common/services/textResourceConfigurationService.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 export { ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -20,22 +20,22 @@ import { ConfigurationCache } from './vscode/src/vs/workbench/services/configura
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { LabelService } from 'vscode/vscode/vs/workbench/services/label/common/labelService';
+import { LabelService } from './vscode/src/vs/workbench/services/label/common/labelService.js';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
-import { BrowserWorkspacesService } from 'vscode/vscode/vs/workbench/services/workspaces/browser/workspacesService';
+import { BrowserWorkspacesService } from './vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js';
 import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing';
-import { AbstractWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService';
+import { AbstractWorkspaceEditingService } from './vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import 'vscode/vscode/vs/workbench/api/common/configurationExtensionPoint';
-import { TextResourcePropertiesService } from 'vscode/vscode/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService';
+import './vscode/src/vs/workbench/api/common/configurationExtensionPoint.js';
+import { TextResourcePropertiesService } from './vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js';
 import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
 import { memoizedConstructor, unsupported } from './tools.js';
 import { registerServiceInitializePreParticipant } from 'vscode/lifecycle';
 import { getService, withReadyServices } from 'vscode/services';
 import { getWorkspaceIdentifier } from 'vscode/workbench';
-import 'vscode/vscode/vs/workbench/contrib/workspaces/browser/workspaces.contribution';
+import './vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js';
 
 const defaultUserConfigurationFile = ( URI.from({ scheme: Schemas.vscodeUserData, path: '/User/settings.json' }));
 async function initUserConfiguration(configurationJson, options, file = defaultUserConfigurationFile) {

package/override/vs/platform/dialogs/common/dialogs.js

@@ -0,0 +1,10 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
+var ConfirmResult;
+( (function(ConfirmResult) {
+    ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";
+    ConfirmResult[ConfirmResult["DONT_SAVE"] = 1] = "DONT_SAVE";
+    ConfirmResult[ConfirmResult["CANCEL"] = 2] = "CANCEL";
+})(ConfirmResult || (ConfirmResult = {})));
+
+export { ConfirmResult };

package/package.json

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

package/vscode/src/vs/editor/common/services/textResourceConfigurationService.js

@@ -0,0 +1,118 @@
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Position } from 'vscode/vscode/vs/editor/common/core/position';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+
+let TextResourceConfigurationService = class TextResourceConfigurationService extends Disposable {
+    constructor(configurationService, modelService, languageService) {
+        super();
+        this.configurationService = configurationService;
+        this.modelService = modelService;
+        this.languageService = languageService;
+        this._onDidChangeConfiguration = this._register(( new Emitter()));
+        this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
+        this._register(this.configurationService.onDidChangeConfiguration(e => this._onDidChangeConfiguration.fire(this.toResourceConfigurationChangeEvent(e))));
+    }
+    getValue(resource, arg2, arg3) {
+        if (typeof arg3 === 'string') {
+            return this._getValue(resource, Position.isIPosition(arg2) ? arg2 : null, arg3);
+        }
+        return this._getValue(resource, null, typeof arg2 === 'string' ? arg2 : undefined);
+    }
+    updateValue(resource, key, value, configurationTarget) {
+        const language = this.getLanguage(resource, null);
+        const configurationValue = this.configurationService.inspect(key, { resource, overrideIdentifier: language });
+        if (configurationTarget === undefined) {
+            configurationTarget = this.deriveConfigurationTarget(configurationValue, language);
+        }
+        switch (configurationTarget) {
+            case 8 :
+                return this._updateValue(key, value, configurationTarget, configurationValue.memory?.override, resource, language);
+            case 6 :
+                return this._updateValue(key, value, configurationTarget, configurationValue.workspaceFolder?.override, resource, language);
+            case 5 :
+                return this._updateValue(key, value, configurationTarget, configurationValue.workspace?.override, resource, language);
+            case 4 :
+                return this._updateValue(key, value, configurationTarget, configurationValue.userRemote?.override, resource, language);
+            default:
+                return this._updateValue(key, value, configurationTarget, configurationValue.userLocal?.override, resource, language);
+        }
+    }
+    _updateValue(key, value, configurationTarget, overriddenValue, resource, language) {
+        if (language && overriddenValue !== undefined) {
+            return this.configurationService.updateValue(key, value, { resource, overrideIdentifier: language }, configurationTarget);
+        }
+        else {
+            return this.configurationService.updateValue(key, value, { resource }, configurationTarget);
+        }
+    }
+    deriveConfigurationTarget(configurationValue, language) {
+        if (language) {
+            if (configurationValue.memory?.override !== undefined) {
+                return 8 ;
+            }
+            if (configurationValue.workspaceFolder?.override !== undefined) {
+                return 6 ;
+            }
+            if (configurationValue.workspace?.override !== undefined) {
+                return 5 ;
+            }
+            if (configurationValue.userRemote?.override !== undefined) {
+                return 4 ;
+            }
+            if (configurationValue.userLocal?.override !== undefined) {
+                return 3 ;
+            }
+        }
+        if (configurationValue.memory?.value !== undefined) {
+            return 8 ;
+        }
+        if (configurationValue.workspaceFolder?.value !== undefined) {
+            return 6 ;
+        }
+        if (configurationValue.workspace?.value !== undefined) {
+            return 5 ;
+        }
+        if (configurationValue.userRemote?.value !== undefined) {
+            return 4 ;
+        }
+        return 3 ;
+    }
+    _getValue(resource, position, section) {
+        const language = resource ? this.getLanguage(resource, position) : undefined;
+        if (typeof section === 'undefined') {
+            return this.configurationService.getValue({ resource, overrideIdentifier: language });
+        }
+        return this.configurationService.getValue(section, { resource, overrideIdentifier: language });
+    }
+    inspect(resource, position, section) {
+        const language = resource ? this.getLanguage(resource, position) : undefined;
+        return this.configurationService.inspect(section, { resource, overrideIdentifier: language });
+    }
+    getLanguage(resource, position) {
+        const model = this.modelService.getModel(resource);
+        if (model) {
+            return position ? model.getLanguageIdAtPosition(position.lineNumber, position.column) : model.getLanguageId();
+        }
+        return this.languageService.guessLanguageIdByFilepathOrFirstLine(resource);
+    }
+    toResourceConfigurationChangeEvent(configurationChangeEvent) {
+        return {
+            affectedKeys: configurationChangeEvent.affectedKeys,
+            affectsConfiguration: (resource, configuration) => {
+                const overrideIdentifier = resource ? this.getLanguage(resource, null) : undefined;
+                return configurationChangeEvent.affectsConfiguration(configuration, { resource, overrideIdentifier });
+            }
+        };
+    }
+};
+TextResourceConfigurationService = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, IModelService)),
+    ( __param(2, ILanguageService))
+], TextResourceConfigurationService));
+
+export { TextResourceConfigurationService };