npm - @codingame/monaco-vscode-keybindings-service-override - Versions diffs - 1.85.5 → 2.0.0-rework-ci.1 - Mend

@codingame/monaco-vscode-keybindings-service-override 1.85.5 → 2.0.0-rework-ci.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/keybindings.js CHANGED Viewed

@@ -1,28 +1,28 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
-import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { WorkbenchKeybindingService } from './vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { IKeyboardLayoutService } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 import { BrowserKeyboardLayoutService } from './vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { CommandService } from './vscode/src/vs/workbench/services/commands/common/commandService.js';
-import { DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.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 { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { WorkbenchContextKeysHandler } from './vscode/src/vs/workbench/browser/contextkeys.js';
-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 { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
 import { onRenderWorkbench } from 'vscode/lifecycle';
 import 'vscode/vscode/vs/workbench/browser/workbench.contribution';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "1.85.5",
+  "version": "2.0.0-rework-ci.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.5",
-    "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-files-service-override": "1.85.5"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-rework-ci.1",
+    "vscode-marked": "npm:marked@=3.0.2",
+    "@codingame/monaco-vscode-files-service-override": "2.0.0-rework-ci.1"
   }
 }

package/vscode/src/vs/base/common/keybindingParser.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { ScanCodeUtils, KeyCodeUtils } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
-import { ScanCodeChord, KeyCodeChord, Keybinding } from 'monaco-editor/esm/vs/base/common/keybindings.js';
+import { ScanCodeUtils, KeyCodeUtils } from 'vscode/vscode/vs/base/common/keyCodes';
+import { ScanCodeChord, KeyCodeChord, Keybinding } from 'vscode/vscode/vs/base/common/keybindings';
 class KeybindingParser {
     static _readModifiers(input) {

package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js CHANGED Viewed

@@ -1,7 +1,7 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { OS } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { OS } from 'vscode/vscode/vs/base/common/platform';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 function readKeyboardConfig(configurationService) {
     const keyboard = configurationService.getValue('keyboard');
@@ -14,7 +14,7 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( nls.localizeWithPath(
+    'title': ( localizeWithPath(
         'vs/platform/keyboardLayout/common/keyboardConfig',
         'keyboardConfigurationTitle',
         "Keyboard"
@@ -25,7 +25,7 @@ const keyboardConfiguration = {
             type: 'string',
             enum: ['code', 'keyCode'],
             default: 'code',
-            markdownDescription: ( nls.localizeWithPath(
+            markdownDescription: ( localizeWithPath(
                 'vs/platform/keyboardLayout/common/keyboardConfig',
                 'dispatch',
                 "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."
@@ -36,7 +36,7 @@ const keyboardConfiguration = {
             scope: 1 ,
             type: 'boolean',
             default: false,
-            markdownDescription: ( nls.localizeWithPath(
+            markdownDescription: ( localizeWithPath(
                 'vs/platform/keyboardLayout/common/keyboardConfig',
                 'mapAltGrToCtrlAlt',
                 "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+."

package/vscode/src/vs/workbench/browser/contextkeys.js CHANGED Viewed

@@ -1,28 +1,28 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { setConstant, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsIOSContext, IsMobileContext, IsDevelopmentContext, ProductQualityContext, InputFocusedContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { setConstant, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsIOSContext, IsMobileContext, IsDevelopmentContext, ProductQualityContext, InputFocusedContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { RemoteNameContext, VirtualWorkspaceContext, TemporaryWorkspaceContext, HasWebFileSystemAccess, EmbedderIdentifierContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorAvailableEditorIdsContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, SideBySideEditorActiveContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, DirtyWorkingCopiesContext, WorkbenchStateContext, WorkspaceFolderCountContext, OpenFolderWorkspaceSupportContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, SplitEditorsVertically, IsFullscreenContext, IsAuxiliaryWindowFocusedContext, InEditorZenModeContext, IsCenteredLayoutContext, MainEditorAreaVisibleContext, EditorTabsVisibleContext, SideBarVisibleContext, TitleBarVisibleContext, TitleBarStyleContext, PanelPositionContext, PanelVisibleContext, PanelMaximizedContext, PanelAlignmentContext, AuxiliaryBarVisibleContext, applyAvailableEditorIds } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { TEXT_DIFF_EDITOR_ID, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
-import { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getActiveWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { preferredSideBySideGroupDirection, IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { isTemporaryWorkspace, IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { isTemporaryWorkspace, IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { positionToString, IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-import { getRemoteName } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
+import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 import { getVirtualWorkspaceScheme } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { isNative } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { isNative } from 'vscode/vscode/vs/base/common/platform';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { WebFileSystemAccess } from 'monaco-editor/esm/vs/platform/files/browser/webFileSystemAccess.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { WebFileSystemAccess } from 'vscode/vscode/vs/platform/files/browser/webFileSystemAccess';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { getTitleBarStyle } from 'vscode/vscode/vs/platform/window/common/window';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disposable {
     constructor(contextKeyService, contextService, configurationService, environmentService, productService, editorService, editorResolverService, editorGroupService, layoutService, paneCompositeService, workingCopyService, fileService) {

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

@@ -1,21 +1,21 @@
-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';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 class RunCommands extends Action2 {
     constructor() {
         super({
             id: 'runCommands',
-            title: { value: ( nls.localizeWithPath(
+            title: { value: ( localizeWithPath(
                 'vs/workbench/contrib/commands/common/commands.contribution',
                 'runCommands',
                 "Run Commands"
             )), original: 'Run Commands' },
             f1: false,
             metadata: {
-                description: ( nls.localizeWithPath(
+                description: ( localizeWithPath(
                     'vs/workbench/contrib/commands/common/commands.contribution',
                     'runCommands.description',
                     "Run several commands"
@@ -29,7 +29,7 @@ class RunCommands extends Action2 {
                             properties: {
                                 commands: {
                                     type: 'array',
-                                    description: ( nls.localizeWithPath(
+                                    description: ( localizeWithPath(
                                         'vs/workbench/contrib/commands/common/commands.contribution',
                                         'runCommands.commands',
                                         "Commands to run"
@@ -72,7 +72,7 @@ class RunCommands extends Action2 {
     async run(accessor, args) {
         const notificationService = accessor.get(INotificationService);
         if (!this._isCommandArgs(args)) {
-            notificationService.error(( nls.localizeWithPath(
+            notificationService.error(( 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."
@@ -80,7 +80,7 @@ class RunCommands extends Action2 {
             return;
         }
         if (args.commands.length === 0) {
-            notificationService.warn(( nls.localizeWithPath(
+            notificationService.warn(( 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?"

package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js CHANGED Viewed

@@ -1,15 +1,15 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { showWindowLogActionId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
 class ToggleKeybindingsLogAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleKeybindingsLog',
-            title: { value: ( nls.localizeWithPath(
+            title: { value: ( localizeWithPath(
                 'vs/workbench/contrib/keybindings/browser/keybindings.contribution',
                 'toggleKeybindingsLog',
                 "Toggle Keyboard Shortcuts Troubleshooting"

package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js CHANGED Viewed

@@ -1,12 +1,12 @@
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { isFalsyOrWhitespace } from 'monaco-editor/esm/vs/base/common/strings.js';
-import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
+import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { index } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { index } from 'vscode/vscode/vs/base/common/arrays';
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 const apiMenus = [
@@ -1053,12 +1053,12 @@ commandsExtensionPoint.setHandler(extensions => {
         let absoluteIcon;
         if (icon) {
             if (typeof icon === 'string') {
-                absoluteIcon = ThemeIcon.fromString(icon) ?? { dark: resources.joinPath(extension.description.extensionLocation, icon), light: resources.joinPath(extension.description.extensionLocation, icon) };
+                absoluteIcon = ThemeIcon.fromString(icon) ?? { dark: joinPath(extension.description.extensionLocation, icon), light: joinPath(extension.description.extensionLocation, icon) };
             }
             else {
                 absoluteIcon = {
-                    dark: resources.joinPath(extension.description.extensionLocation, icon.dark),
-                    light: resources.joinPath(extension.description.extensionLocation, icon.light)
+                    dark: joinPath(extension.description.extensionLocation, icon.dark),
+                    light: joinPath(extension.description.extensionLocation, icon.light)
                 };
             }
         }
@@ -1150,12 +1150,12 @@ submenusExtensionPoint.setHandler(extensions => {
             let absoluteIcon;
             if (submenuInfo.icon) {
                 if (typeof submenuInfo.icon === 'string') {
-                    absoluteIcon = ThemeIcon.fromString(submenuInfo.icon) || { dark: resources.joinPath(extension.description.extensionLocation, submenuInfo.icon) };
+                    absoluteIcon = ThemeIcon.fromString(submenuInfo.icon) || { dark: joinPath(extension.description.extensionLocation, submenuInfo.icon) };
                 }
                 else {
                     absoluteIcon = {
-                        dark: resources.joinPath(extension.description.extensionLocation, submenuInfo.icon.dark),
-                        light: resources.joinPath(extension.description.extensionLocation, submenuInfo.icon.light)
+                        dark: joinPath(extension.description.extensionLocation, submenuInfo.icon.dark),
+                        light: joinPath(extension.description.extensionLocation, submenuInfo.icon.light)
                     };
                 }
             }

package/vscode/src/vs/workbench/services/commands/common/commandService.js CHANGED Viewed

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { timeout } from 'vscode/vscode/vs/base/common/async';
 let CommandService = class CommandService extends Disposable {
     constructor(_instantiationService, _extensionService, _logService) {

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

@@ -1,37 +1,37 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as browser from 'monaco-editor/esm/vs/base/browser/browser.js';
-import { BrowserFeatures } from 'monaco-editor/esm/vs/base/browser/canIUse.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { StandardKeyboardEvent, printKeyboardEvent, printStandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { parse } from 'monaco-editor/esm/vs/base/common/json.js';
-import { UserSettingsLabelProvider } from 'monaco-editor/esm/vs/base/common/keybindingLabels.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { onDidChangeFullscreen, isFullscreen } from 'vscode/vscode/vs/base/browser/browser';
+import { BrowserFeatures } from 'vscode/vscode/vs/base/browser/canIUse';
+import { onDidRegisterWindow, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
+import { StandardKeyboardEvent, printKeyboardEvent, printStandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
+import { parse } from 'vscode/vscode/vs/base/common/json';
+import { UserSettingsLabelProvider } from 'vscode/vscode/vs/base/common/keybindingLabels';
 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 { 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';
-import { MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { CommandsRegistry, ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { Extensions } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jsonContributionRegistry.js';
-import { AbstractKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/abstractKeybindingService.js';
-import { KeybindingResolver } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingResolver.js';
-import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
-import { ResolvedKeybindingItem } from 'monaco-editor/esm/vs/platform/keybinding/common/resolvedKeybindingItem.js';
+import { KeyCodeChord, ScanCodeChord } from 'vscode/vscode/vs/base/common/keybindings';
+import { KeyCodeUtils, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE } from 'vscode/vscode/vs/base/common/keyCodes';
+import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { equals } from 'vscode/vscode/vs/base/common/objects';
+import { OS, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { dirname } from 'vscode/vscode/vs/base/common/resources';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
+import { AbstractKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/abstractKeybindingService';
+import { KeybindingResolver } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
+import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ResolvedKeybindingItem } from 'vscode/vscode/vs/platform/keybinding/common/resolvedKeybindingItem';
 import { IKeyboardLayoutService } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { isLocalizedString } from 'monaco-editor/esm/vs/platform/action/common/action.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { isLocalizedString } from 'vscode/vscode/vs/platform/action/common/action';
 import { commandsExtensionPoint } from '../../actions/common/menusExtensionPoint.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
@@ -43,7 +43,7 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
     if (!keyBinding) {
-        rejects.push(( nls.localizeWithPath(
+        rejects.push(( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'nonempty',
             "expected non-empty value."
@@ -51,7 +51,7 @@ function isValidContributedKeyBinding(keyBinding, rejects) {
         return false;
     }
     if (typeof keyBinding.command !== 'string') {
-        rejects.push(( nls.localizeWithPath(
+        rejects.push(( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'requirestring',
             "property `{0}` is mandatory and must be of type `string`",
@@ -60,7 +60,7 @@ function isValidContributedKeyBinding(keyBinding, rejects) {
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== 'string') {
-        rejects.push(( nls.localizeWithPath(
+        rejects.push(( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'optstring',
             "property `{0}` can be omitted or must be of type `string`",
@@ -69,7 +69,7 @@ function isValidContributedKeyBinding(keyBinding, rejects) {
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== 'string') {
-        rejects.push(( nls.localizeWithPath(
+        rejects.push(( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'optstring',
             "property `{0}` can be omitted or must be of type `string`",
@@ -78,7 +78,7 @@ function isValidContributedKeyBinding(keyBinding, rejects) {
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== 'string') {
-        rejects.push(( nls.localizeWithPath(
+        rejects.push(( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'optstring',
             "property `{0}` can be omitted or must be of type `string`",
@@ -87,7 +87,7 @@ function isValidContributedKeyBinding(keyBinding, rejects) {
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== 'string') {
-        rejects.push(( nls.localizeWithPath(
+        rejects.push(( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'optstring',
             "property `{0}` can be omitted or must be of type `string`",
@@ -96,7 +96,7 @@ function isValidContributedKeyBinding(keyBinding, rejects) {
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== 'string') {
-        rejects.push(( nls.localizeWithPath(
+        rejects.push(( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'optstring',
             "property `{0}` can be omitted or must be of type `string`",
@@ -111,7 +111,7 @@ const keybindingType = {
     default: { command: '', key: '' },
     properties: {
         command: {
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'vscode.extension.contributes.keybindings.command',
                 'Identifier of the command to run when keybinding is triggered.'
@@ -119,14 +119,14 @@ const keybindingType = {
             type: 'string'
         },
         args: {
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'vscode.extension.contributes.keybindings.args',
                 "Arguments to pass to the command to execute."
             ))
         },
         key: {
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'vscode.extension.contributes.keybindings.key',
                 'Key or key sequence (separate keys with plus-sign and sequences with space, e.g. Ctrl+O and Ctrl+L L for a chord).'
@@ -134,7 +134,7 @@ const keybindingType = {
             type: 'string'
         },
         mac: {
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'vscode.extension.contributes.keybindings.mac',
                 'Mac specific key or key sequence.'
@@ -142,7 +142,7 @@ const keybindingType = {
             type: 'string'
         },
         linux: {
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'vscode.extension.contributes.keybindings.linux',
                 'Linux specific key or key sequence.'
@@ -150,7 +150,7 @@ const keybindingType = {
             type: 'string'
         },
         win: {
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'vscode.extension.contributes.keybindings.win',
                 'Windows specific key or key sequence.'
@@ -158,7 +158,7 @@ const keybindingType = {
             type: 'string'
         },
         when: {
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'vscode.extension.contributes.keybindings.when',
                 'Condition when the key is active.'
@@ -171,7 +171,7 @@ const keybindingsExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'keybindings',
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( nls.localizeWithPath(
+        description: ( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'vscode.extension.contributes.keybindings',
             "Contributes keybindings."
@@ -248,13 +248,13 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         });
         this.updateKeybindingsJsonSchema();
         this._register(extensionService.onDidRegisterExtensions(() => this.updateKeybindingsJsonSchema()));
-        this._register(Event.runAndSubscribe(dom.onDidRegisterWindow, ({ window, disposables }) => disposables.add(this._registerKeyListeners(window)), { window: mainWindow, disposables: this._store }));
-        this._register(browser.onDidChangeFullscreen(() => {
+        this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => disposables.add(this._registerKeyListeners(window)), { window: mainWindow, disposables: this._store }));
+        this._register(onDidChangeFullscreen(() => {
             const keyboard = navigator.keyboard;
             if (BrowserFeatures.keyboard === 2 ) {
                 return;
             }
-            if (browser.isFullscreen()) {
+            if (isFullscreen()) {
                 keyboard?.lock(['Escape']);
             }
             else {
@@ -266,7 +266,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     }
     _registerKeyListeners(window) {
         const disposables = ( new DisposableStore());
-        disposables.add(dom.addDisposableListener(window, dom.EventType.KEY_DOWN, (e) => {
+        disposables.add(addDisposableListener(window, EventType.KEY_DOWN, (e) => {
             this.isComposingGlobalContextKey.set(e.isComposing);
             const keyEvent = ( new StandardKeyboardEvent(e));
             this._log(`/ Received  keydown event - ${printKeyboardEvent(e)}`);
@@ -277,7 +277,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             }
             this.isComposingGlobalContextKey.set(false);
         }));
-        disposables.add(dom.addDisposableListener(window, dom.EventType.KEY_UP, (e) => {
+        disposables.add(addDisposableListener(window, EventType.KEY_UP, (e) => {
             this.isComposingGlobalContextKey.set(e.isComposing);
             const keyEvent = ( new StandardKeyboardEvent(e));
             const shouldPreventDefault = this._singleModifierDispatch(keyEvent, keyEvent.target);
@@ -455,7 +455,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         if (BrowserFeatures.keyboard === 0 ) {
             return false;
         }
-        if (BrowserFeatures.keyboard === 1  && browser.isFullscreen()) {
+        if (BrowserFeatures.keyboard === 1  && isFullscreen()) {
             return false;
         }
         for (const chord of keybinding.chords) {
@@ -525,7 +525,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             }
         }
         if (rejects.length > 0) {
-            collector.error(( nls.localizeWithPath(
+            collector.error(( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'invalid.keybindings',
                 "Invalid `contributes.{0}`: {1}",
@@ -615,7 +615,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join('\n// - ');
-        return '// ' + ( nls.localizeWithPath(
+        return '// ' + ( localizeWithPath(
             'vs/workbench/services/keybinding/browser/keybindingService',
             'unboundCommands',
             "Here are other available commands: "
@@ -714,7 +714,7 @@ class UserKeybindings extends Disposable {
     }
     async reload() {
         const newKeybindings = await this.readUserKeybindings();
-        if (Objects.equals(this._rawKeybindings, newKeybindings)) {
+        if (equals(this._rawKeybindings, newKeybindings)) {
             return false;
         }
         this._rawKeybindings = newKeybindings;
@@ -744,7 +744,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: 'array',
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keybindingService',
                 'keybindings.json.title',
                 "Keybindings configuration"
@@ -772,7 +772,7 @@ class KeybindingsJsonSchema {
                     'type': 'string',
                     'enum': this.commandsEnum,
                     'enumDescriptions': this.commandsEnumDescriptions,
-                    'description': ( nls.localizeWithPath(
+                    'description': ( localizeWithPath(
                         'vs/workbench/services/keybinding/browser/keybindingService',
                         'keybindings.json.command',
                         "Name of the command to execute"
@@ -787,7 +787,7 @@ class KeybindingsJsonSchema {
                             'type': 'string',
                             'enum': this.removalCommandsEnum,
                             'enumDescriptions': this.commandsEnumDescriptions,
-                            'description': ( nls.localizeWithPath(
+                            'description': ( localizeWithPath(
                                 'vs/workbench/services/keybinding/browser/keybindingService',
                                 'keybindings.json.removalCommand',
                                 "Name of the command to remove keyboard shortcut for"
@@ -809,7 +809,7 @@ class KeybindingsJsonSchema {
                 'properties': {
                     'key': {
                         'type': 'string',
-                        'description': ( nls.localizeWithPath(
+                        'description': ( localizeWithPath(
                             'vs/workbench/services/keybinding/browser/keybindingService',
                             'keybindings.json.key',
                             "Key or key sequence (separated by space)"
@@ -825,7 +825,7 @@ class KeybindingsJsonSchema {
                                     'not': {
                                         'type': 'array'
                                     },
-                                    'errorMessage': ( nls.localizeWithPath(
+                                    'errorMessage': ( localizeWithPath(
                                         'vs/workbench/services/keybinding/browser/keybindingService',
                                         'keybindings.commandsIsArray',
                                         "Incorrect type. Expected \"{0}\". The field 'command' does not support running multiple commands. Use command 'runCommands' to pass it multiple commands to run.",
@@ -843,14 +843,14 @@ class KeybindingsJsonSchema {
                     },
                     'when': {
                         'type': 'string',
-                        'description': ( nls.localizeWithPath(
+                        'description': ( localizeWithPath(
                             'vs/workbench/services/keybinding/browser/keybindingService',
                             'keybindings.json.when',
                             "Condition when the key is active."
                         ))
                     },
                     'args': {
-                        'description': ( nls.localizeWithPath(
+                        'description': ( localizeWithPath(
                             'vs/workbench/services/keybinding/browser/keybindingService',
                             'keybindings.json.args',
                             "Arguments to pass to the command to execute."

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

@@ -1,25 +1,25 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { KeymapInfo } from '../common/keymapInfo.js';
 import { readKeyboardConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
 import { CachedKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
-import { OS, isWindows, isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { OS, isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { WindowsKeyboardMapper } from '../common/windowsKeyboardMapper.js';
 import { FallbackKeyboardMapper } from 'vscode/vscode/vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
 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 { 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';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { parse, getNodeType } from 'vscode/vscode/vs/base/common/json';
+import { equals } from 'vscode/vscode/vs/base/common/objects';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { getKeyboardLayoutId } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 function __variableDynamicImportRuntime0__(path) {
@@ -378,7 +378,7 @@ class UserKeyboardLayout extends Disposable {
         catch (e) {
             this._keyboardLayout = null;
         }
-        return existing ? !Objects.equals(existing, this._keyboardLayout) : true;
+        return existing ? !equals(existing, this._keyboardLayout) : true;
     }
 }
 let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Disposable {
@@ -478,7 +478,7 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( nls.localizeWithPath(
+    'title': ( localizeWithPath(
         'vs/workbench/services/keybinding/browser/keyboardLayoutService',
         'keyboardConfigurationTitle',
         "Keyboard"
@@ -487,7 +487,7 @@ const keyboardConfiguration = {
         'keyboard.layout': {
             'type': 'string',
             'default': 'autodetect',
-            'description': ( nls.localizeWithPath(
+            'description': ( localizeWithPath(
                 'vs/workbench/services/keybinding/browser/keyboardLayoutService',
                 'keyboard.layout.config',
                 "Control the keyboard layout used in web."

package/vscode/src/vs/workbench/services/keybinding/common/keybindingIO.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 class KeybindingIO {
     static writeKeybindingItem(out, item) {

package/vscode/src/vs/workbench/services/keybinding/common/keymapInfo.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { isWindows, isLinux } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { isWindows, isLinux } from 'vscode/vscode/vs/base/common/platform';
 import { getKeyboardLayoutId } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 function deserializeMapping(serializedMapping) {

package/vscode/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { IMMUTABLE_CODE_TO_KEY_CODE, KeyCodeUtils, ScanCodeUtils, IMMUTABLE_KEY_CODE_TO_CODE } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
-import { ScanCodeChord, KeyCodeChord } from 'monaco-editor/esm/vs/base/common/keybindings.js';
-import { BaseResolvedKeybinding } from 'monaco-editor/esm/vs/platform/keybinding/common/baseResolvedKeybinding.js';
+import { IMMUTABLE_CODE_TO_KEY_CODE, KeyCodeUtils, ScanCodeUtils, IMMUTABLE_KEY_CODE_TO_CODE } from 'vscode/vscode/vs/base/common/keyCodes';
+import { ScanCodeChord, KeyCodeChord } from 'vscode/vscode/vs/base/common/keybindings';
+import { BaseResolvedKeybinding } from 'vscode/vscode/vs/platform/keybinding/common/baseResolvedKeybinding';
 const CHAR_CODE_TO_KEY_CODE = [];
 class NativeResolvedKeybinding extends BaseResolvedKeybinding {

package/vscode/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.js CHANGED Viewed

@@ -1,8 +1,8 @@
-import { KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCodeUtils, NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
-import { ScanCodeChord, KeyCodeChord } from 'monaco-editor/esm/vs/base/common/keybindings.js';
-import { UILabelProvider } from 'monaco-editor/esm/vs/base/common/keybindingLabels.js';
-import { BaseResolvedKeybinding } from 'monaco-editor/esm/vs/platform/keybinding/common/baseResolvedKeybinding.js';
-import { toEmptyArrayIfContainsNull } from 'monaco-editor/esm/vs/platform/keybinding/common/resolvedKeybindingItem.js';
+import { KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCodeUtils, NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE } from 'vscode/vscode/vs/base/common/keyCodes';
+import { ScanCodeChord, KeyCodeChord } from 'vscode/vscode/vs/base/common/keybindings';
+import { UILabelProvider } from 'vscode/vscode/vs/base/common/keybindingLabels';
+import { BaseResolvedKeybinding } from 'vscode/vscode/vs/platform/keybinding/common/baseResolvedKeybinding';
+import { toEmptyArrayIfContainsNull } from 'vscode/vscode/vs/platform/keybinding/common/resolvedKeybindingItem';
 class WindowsNativeResolvedKeybinding extends BaseResolvedKeybinding {
     constructor(mapper, chords) {