@codingame/monaco-vscode-keybindings-service-override 1.83.11 → 1.83.13

package/keybindings.js

@@ -24,7 +24,6 @@ import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
-import './monaco.js';
 import { onRenderWorkbench } from 'vscode/lifecycle';
 import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
 import './vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js';

package/package.json

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

package/monaco.js

@@ -1,231 +0,0 @@
-import { __decorate, __param } from './external/tslib/tslib.es6.js';
-import { StandaloneKeybindingService } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
-import { ITextResourceConfigurationService } from 'monaco-editor/esm/vs/editor/common/services/textResourceConfiguration.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { StandaloneEditor, StandaloneDiffEditor2 } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeEditor.js';
-import { isObject } from 'monaco-editor/esm/vs/base/common/types.js';
-import { distinct, deepClone } from 'monaco-editor/esm/vs/base/common/objects.js';
-export { errorHandler } from 'monaco-editor/esm/vs/base/common/errors.js';
-export { FoldingModel, setCollapseStateForMatchingLines } from 'monaco-editor/esm/vs/editor/contrib/folding/browser/foldingModel.js';
-export { FoldingController } from 'monaco-editor/esm/vs/editor/contrib/folding/browser/folding.js';
-export { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-export { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { Extensions as Extensions$1 } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jsonContributionRegistry.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-export { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-export { MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-export { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
-import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { EditorOptionsUtil } from 'vscode/vscode/vs/editor/browser/config/editorConfiguration';
-export { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import 'monaco-editor/esm/vs/platform/files/common/files.js';
-import 'monaco-editor/esm/vs/base/common/buffer.js';
-import { JSONValidationExtensionPoint } from 'vscode/vscode/vs/workbench/api/common/jsonValidationExtensionPoint';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { ColorExtensionPoint } from 'vscode/vscode/vs/workbench/services/themes/common/colorExtensionPoint';
-import 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
-import 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import 'monaco-editor/esm/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js';
-import 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-export { ContextKeyExpr, RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { Emitter } from 'monaco-editor';
-import { createInjectedClass } from './tools/injection.js';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/diffEditorHelper';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/saveParticipants';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleMinimap';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu';
-import 'vscode/vscode/vs/workbench/contrib/folding/browser/folding.contribution';
-import 'vscode/vscode/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty';
-import 'vscode/vscode/vs/workbench/contrib/codeActions/browser/codeActions.contribution';
-import 'vscode/vscode/vs/workbench/contrib/list/browser/list.contribution';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/editorFeatures';
-
-let ExtensionPoints = class ExtensionPoints {
-    constructor(instantiationService) {
-        this.instantiationService = instantiationService;
-        this.instantiationService.createInstance(JSONValidationExtensionPoint);
-        this.instantiationService.createInstance(ColorExtensionPoint);
-    }
-};
-ExtensionPoints = __decorate([
-    ( __param(0, IInstantiationService))
-], ExtensionPoints);
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ExtensionPoints, 1 );
-function computeConfiguration(configuration, overrides) {
-    const editorConfiguration = isObject(configuration.editor) ? deepClone(configuration.editor) : Object.create(null);
-    Object.assign(editorConfiguration, deepClone(overrides));
-    return editorConfiguration;
-}
-function computeDiffConfiguration(configuration, overrides) {
-    const editorConfiguration = computeConfiguration(configuration);
-    if (isObject(configuration.diffEditor)) {
-        const diffEditorConfiguration = deepClone(configuration.diffEditor);
-        diffEditorConfiguration.diffCodeLens = diffEditorConfiguration.codeLens;
-        delete diffEditorConfiguration.codeLens;
-        diffEditorConfiguration.diffWordWrap = diffEditorConfiguration.wordWrap;
-        delete diffEditorConfiguration.wordWrap;
-        Object.assign(editorConfiguration, diffEditorConfiguration);
-    }
-    editorConfiguration.accessibilityVerbose = configuration.accessibility?.verbosity?.diffEditor ?? false;
-    Object.assign(editorConfiguration, deepClone(overrides));
-    return editorConfiguration;
-}
-let ConfiguredStandaloneEditor = class ConfiguredStandaloneEditor extends createInjectedClass(StandaloneEditor) {
-    constructor(domElement, _options = {}, instantiationService, textResourceConfigurationService) {
-        const { theme, autoDetectHighContrast, model, value, language, accessibilityHelpUrl, ariaContainerElement, overflowWidgetsDomNode, dimension, ...options } = _options;
-        const computedOptions = computeConfiguration(textResourceConfigurationService.getValue(_options.model?.uri), options);
-        super(instantiationService, domElement, { ...computedOptions, overflowWidgetsDomNode, dimension, theme, autoDetectHighContrast, model, value, language, accessibilityHelpUrl, ariaContainerElement });
-        this.textResourceConfigurationService = textResourceConfigurationService;
-        this.optionsOverrides = {};
-        this.lastAppliedEditorOptions = computedOptions;
-        this.optionsOverrides = options;
-        this._register(textResourceConfigurationService.onDidChangeConfiguration((e) => {
-            const resource = this.getModel()?.uri;
-            if (resource != null && e.affectsConfiguration(resource, 'editor')) {
-                this.updateEditorConfiguration();
-            }
-        }));
-        this._register(this.onDidChangeModelLanguage(() => this.updateEditorConfiguration()));
-        this._register(this.onDidChangeModel(() => this.updateEditorConfiguration()));
-        this.updateEditorConfiguration();
-    }
-    updateEditorConfiguration() {
-        if (!this.hasModel() || this.textResourceConfigurationService == null) {
-            return;
-        }
-        const resource = this.getModel().uri;
-        const configuration = this.textResourceConfigurationService.getValue(resource);
-        if (configuration == null) {
-            return;
-        }
-        const editorConfiguration = computeConfiguration(configuration, this.optionsOverrides);
-        let editorSettingsToApply = editorConfiguration;
-        if (this.lastAppliedEditorOptions != null) {
-            editorSettingsToApply = distinct(this.lastAppliedEditorOptions, editorSettingsToApply);
-        }
-        if (( Object.keys(editorSettingsToApply)).length > 0) {
-            this.lastAppliedEditorOptions = editorConfiguration;
-            super.updateOptions(editorSettingsToApply);
-        }
-    }
-    updateOptions(newOptions) {
-        this.optionsOverrides ?? (this.optionsOverrides = {});
-        const didChange = EditorOptionsUtil.applyUpdate(this.optionsOverrides, newOptions);
-        if (!didChange) {
-            return;
-        }
-        this.updateEditorConfiguration();
-    }
-};
-ConfiguredStandaloneEditor = __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, ITextResourceConfigurationService))
-], ConfiguredStandaloneEditor);
-let ConfiguredStandaloneDiffEditor = class ConfiguredStandaloneDiffEditor extends createInjectedClass(StandaloneDiffEditor2) {
-    constructor(domElement, _options = {}, instantiationService, textResourceConfigurationService) {
-        const { theme, autoDetectHighContrast, modifiedAriaLabel, originalAriaLabel, overflowWidgetsDomNode, dimension, ...options } = _options;
-        const computedOptions = computeDiffConfiguration(textResourceConfigurationService.getValue(undefined), options);
-        super(instantiationService, domElement, { ...computedOptions, overflowWidgetsDomNode, dimension, theme, autoDetectHighContrast, modifiedAriaLabel, originalAriaLabel });
-        this.textResourceConfigurationService = textResourceConfigurationService;
-        this.optionsOverrides = {};
-        this.lastAppliedEditorOptions = computedOptions;
-        this.optionsOverrides = options;
-        this._register(textResourceConfigurationService.onDidChangeConfiguration((e) => {
-            const resource = this._targetEditor.getModel()?.uri;
-            if (resource != null && (e.affectsConfiguration(resource, 'editor') || e.affectsConfiguration(resource, 'diffEditor') || e.affectsConfiguration(resource, 'accessibility.verbosity.diffEditor'))) {
-                this.updateEditorConfiguration();
-            }
-        }));
-        this._register(this._targetEditor.onDidChangeModelLanguage(() => this.updateEditorConfiguration()));
-        this._register(this.onDidChangeModel(() => this.updateEditorConfiguration()));
-        this.updateEditorConfiguration();
-    }
-    updateEditorConfiguration() {
-        if (this.getModel() == null || this.textResourceConfigurationService == null) {
-            return;
-        }
-        const resource = this._targetEditor.getModel()?.uri;
-        const configuration = this.textResourceConfigurationService.getValue(resource);
-        if (configuration == null) {
-            return;
-        }
-        const editorConfiguration = computeDiffConfiguration(configuration, this.optionsOverrides);
-        let editorSettingsToApply = editorConfiguration;
-        if (this.lastAppliedEditorOptions != null) {
-            editorSettingsToApply = distinct(this.lastAppliedEditorOptions, editorSettingsToApply);
-        }
-        if (( Object.keys(editorSettingsToApply)).length > 0) {
-            this.lastAppliedEditorOptions = editorConfiguration;
-            super.updateOptions(editorSettingsToApply);
-        }
-    }
-    updateOptions(newOptions) {
-        this.optionsOverrides ?? (this.optionsOverrides = {});
-        this.optionsOverrides = {
-            ...this.optionsOverrides,
-            ...newOptions
-        };
-        this.updateEditorConfiguration();
-    }
-    _createInnerEditor(instantiationService, container, options) {
-        return instantiationService.createInstance(ConfiguredStandaloneEditor, container, options);
-    }
-};
-ConfiguredStandaloneDiffEditor = __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, ITextResourceConfigurationService))
-], ConfiguredStandaloneDiffEditor);
-let DelegateStandaloneKeybindingService = class DelegateStandaloneKeybindingService extends StandaloneKeybindingService {
-    constructor(delegate, contextKeyService, commandService, telemetryService, notificationService, logService, codeEditorService) {
-        super(contextKeyService, commandService, telemetryService, notificationService, logService, codeEditorService);
-        this.delegate = delegate;
-        this._onDidChangeKeybindings = new Emitter();
-        this._register(delegate.registerKeybindingProvider({
-            provideKeybindings: () => {
-                return this.getUserKeybindingItems();
-            },
-            onDidChangeKeybindings: this._onDidChangeKeybindings.event
-        }));
-    }
-    _getResolver() {
-        return this.delegate._getResolver();
-    }
-    updateResolver() {
-        super.updateResolver();
-        this._onDidChangeKeybindings.fire();
-    }
-    resolveKeyboardEvent(keyboardEvent) {
-        return this.delegate.resolveKeyboardEvent(keyboardEvent);
-    }
-    resolveKeybinding(keybinding) {
-        return this.delegate.resolveKeybinding(keybinding);
-    }
-};
-DelegateStandaloneKeybindingService = __decorate([
-    ( __param(1, IContextKeyService)),
-    ( __param(2, ICommandService)),
-    ( __param(3, ITelemetryService)),
-    ( __param(4, INotificationService)),
-    ( __param(5, ILogService)),
-    ( __param(6, ICodeEditorService))
-], DelegateStandaloneKeybindingService);
-({
-    ...Extensions$1,
-    ...Extensions$2
-});

package/tools/injection.js

@@ -1,17 +0,0 @@
-import { _util } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-
-function getInjectedParameters(instantiationService, ctor) {
-    return instantiationService.invokeFunction((accessor) => {
-        return ( _util.getServiceDependencies(ctor).sort((a, b) => a.index - b.index).map(d => accessor.get(d.id)));
-    });
-}
-function createInjectedClass(ctor) {
-    const _ctor = ctor;
-    return class extends _ctor {
-        constructor(...args) {
-            super(...args.slice(1), ...getInjectedParameters(args[0], ctor));
-        }
-    };
-}
-
-export { createInjectedClass };