@codingame/monaco-vscode-keybindings-service-override 1.85.0 → 1.85.2

package/keybindings.js

@@ -27,6 +27,7 @@ import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-s
 import { onRenderWorkbench } from 'vscode/lifecycle';
 import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
 import './vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js';
+import './vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js';
 
 const defaultUserKeybindindsFile = ( URI.from({ scheme: Schemas.vscodeUserData, path: '/User/keybindings.json' }));
 async function initUserKeybindings(configurationJson, options, file = defaultUserKeybindindsFile) {

package/package.json

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

package/vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js

@@ -0,0 +1,146 @@
+import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+
+class RunCommands extends Action2 {
+    constructor() {
+        super({
+            id: 'runCommands',
+            title: { value: ( nls.localizeWithPath(
+                'vs/workbench/contrib/commands/common/commands.contribution',
+                'runCommands',
+                "Run Commands"
+            )), original: 'Run Commands' },
+            f1: false,
+            metadata: {
+                description: ( nls.localizeWithPath(
+                    'vs/workbench/contrib/commands/common/commands.contribution',
+                    'runCommands.description',
+                    "Run several commands"
+                )),
+                args: [
+                    {
+                        name: 'args',
+                        schema: {
+                            type: 'object',
+                            required: ['commands'],
+                            properties: {
+                                commands: {
+                                    type: 'array',
+                                    description: ( nls.localizeWithPath(
+                                        'vs/workbench/contrib/commands/common/commands.contribution',
+                                        'runCommands.commands',
+                                        "Commands to run"
+                                    )),
+                                    items: {
+                                        anyOf: [
+                                            {
+                                                $ref: 'vscode://schemas/keybindings#/definitions/commandNames'
+                                            },
+                                            {
+                                                type: 'string',
+                                            },
+                                            {
+                                                type: 'object',
+                                                required: ['command'],
+                                                properties: {
+                                                    command: {
+                                                        'anyOf': [
+                                                            {
+                                                                $ref: 'vscode://schemas/keybindings#/definitions/commandNames'
+                                                            },
+                                                            {
+                                                                type: 'string'
+                                                            },
+                                                        ]
+                                                    }
+                                                },
+                                                $ref: 'vscode://schemas/keybindings#/definitions/commandsSchemas'
+                                            }
+                                        ]
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        });
+    }
+    async run(accessor, args) {
+        const notificationService = accessor.get(INotificationService);
+        if (!this._isCommandArgs(args)) {
+            notificationService.error(( nls.localizeWithPath(
+                'vs/workbench/contrib/commands/common/commands.contribution',
+                'runCommands.invalidArgs',
+                "'runCommands' has received an argument with incorrect type. Please, review the argument passed to the command."
+            )));
+            return;
+        }
+        if (args.commands.length === 0) {
+            notificationService.warn(( nls.localizeWithPath(
+                'vs/workbench/contrib/commands/common/commands.contribution',
+                'runCommands.noCommandsToRun',
+                "'runCommands' has not received commands to run. Did you forget to pass commands in the 'runCommands' argument?"
+            )));
+            return;
+        }
+        const commandService = accessor.get(ICommandService);
+        const logService = accessor.get(ILogService);
+        let i = 0;
+        try {
+            for (; i < args.commands.length; ++i) {
+                const cmd = args.commands[i];
+                logService.debug(`runCommands: executing ${i}-th command: ${JSON.stringify(cmd)}`);
+                const r = await this._runCommand(commandService, cmd);
+                logService.debug(`runCommands: executed ${i}-th command with return value: ${JSON.stringify(r)}`);
+            }
+        }
+        catch (err) {
+            logService.debug(`runCommands: executing ${i}-th command resulted in an error: ${err instanceof Error ? err.message : JSON.stringify(err)}`);
+            notificationService.error(err);
+        }
+    }
+    _isCommandArgs(args) {
+        if (!args || typeof args !== 'object') {
+            return false;
+        }
+        if (!('commands' in args) || !Array.isArray(args.commands)) {
+            return false;
+        }
+        for (const cmd of args.commands) {
+            if (typeof cmd === 'string') {
+                continue;
+            }
+            if (typeof cmd === 'object' && typeof cmd.command === 'string') {
+                continue;
+            }
+            return false;
+        }
+        return true;
+    }
+    _runCommand(commandService, cmd) {
+        let commandID, commandArgs;
+        if (typeof cmd === 'string') {
+            commandID = cmd;
+        }
+        else {
+            commandID = cmd.command;
+            commandArgs = cmd.args;
+        }
+        if (commandArgs === undefined) {
+            return commandService.executeCommand(commandID);
+        }
+        else {
+            if (Array.isArray(commandArgs)) {
+                return commandService.executeCommand(commandID, ...commandArgs);
+            }
+            else {
+                return commandService.executeCommand(commandID, commandArgs);
+            }
+        }
+    }
+}
+registerAction2(RunCommands);

package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js

@@ -12,7 +12,7 @@ import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
 import { KeyCodeChord, ScanCodeChord } from 'monaco-editor/esm/vs/base/common/keybindings.js';
 import { KeyCodeUtils, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
 import { DisposableStore, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
+import * as Objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import { OS, isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
@@ -714,7 +714,7 @@ class UserKeybindings extends Disposable {
     }
     async reload() {
         const newKeybindings = await this.readUserKeybindings();
-        if (objects.equals(this._rawKeybindings, newKeybindings)) {
+        if (Objects.equals(this._rawKeybindings, newKeybindings)) {
             return false;
         }
         this._rawKeybindings = newKeybindings;

package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js

@@ -12,7 +12,7 @@ import { MacLinuxKeyboardMapper } from '../common/macLinuxKeyboardMapper.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
 import { parse, getNodeType } from 'monaco-editor/esm/vs/base/common/json.js';
-import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
+import * as Objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
@@ -378,7 +378,7 @@ class UserKeyboardLayout extends Disposable {
         catch (e) {
             this._keyboardLayout = null;
         }
-        return existing ? !objects.equals(existing, this._keyboardLayout) : true;
+        return existing ? !Objects.equals(existing, this._keyboardLayout) : true;
     }
 }
 let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Disposable {