Merge pull request #61 from CodinGame/fix-keybindings-keyboard-layout

Use vscode keyboard layout service

Author: CGNonofr

package-lock.json

@@ -149,6 +149,7 @@
     "@codingame/eslint-config": "^1.1.6",
     "@codingame/tsconfig": "^1.1.1",
     "@octokit/rest": "^19.0.5",
+    "@rollup/plugin-dynamic-import-vars": "^2.0.3",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-typescript": "^11.0.0",
@@ -177,8 +178,8 @@
   },
   "peerDependencies": {
     "monaco-editor": "~0.34.0",
-    "vscode-textmate": "^7.0.1",
-    "vscode-oniguruma": "^1.6.2"
+    "vscode-oniguruma": "^1.6.2",
+    "vscode-textmate": "^7.0.1"
   },
   "overrides": {
     "rollup-plugin-styles": {

package.json

@@ -10,6 +10,7 @@ import replace from '@rollup/plugin-replace'
 import styles from 'rollup-plugin-styles'
 import * as tslib from 'tslib'
 import * as babylonParser from 'recast/parsers/babylon.js'
+import dynamicImportVars from '@rollup/plugin-dynamic-import-vars'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as vm from 'vm'
@@ -50,6 +51,7 @@ const VSCODE_DIR = path.resolve(__dirname, '../vscode')
 const NODE_MODULES_DIR = path.resolve(__dirname, '../node_modules')
 const MONACO_EDITOR_DIR = path.resolve(NODE_MODULES_DIR, './monaco-editor')
 const OVERRIDE_PATH = path.resolve(__dirname, '../src/override')
+const KEYBOARD_LAYOUT_DIR = path.resolve(VSCODE_DIR, 'vs/workbench/services/keybinding/browser/keyboardLayouts')
 
 function getMemberExpressionPath (node: recast.types.namedTypes.MemberExpression | recast.types.namedTypes.Identifier): string | null {
   if (node.type === 'MemberExpression') {
@@ -106,7 +108,7 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
       annotations: true,
       preset: 'smallest',
       moduleSideEffects (id) {
-        return id.startsWith(SRC_DIR) || id.endsWith('.css')
+        return id.startsWith(SRC_DIR) || id.endsWith('.css') || id.startsWith(KEYBOARD_LAYOUT_DIR)
       }
     },
     external,
@@ -148,7 +150,7 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
           return undefined
         },
         transform (code) {
-          return toggleEsmComments(code).replaceAll("'vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.' + platform", "'./keyboardLayouts/_.contribution'")
+          return toggleEsmComments(code).replaceAll("'vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.' + platform", "'./keyboardLayouts/layout.contribution.' + platform + '.js'")
         },
         load (id) {
           if (id.startsWith(VSCODE_DIR) && id.endsWith('.css')) {
@@ -276,8 +278,8 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
                   }
                 } else if (node.callee.type === 'Identifier' && PURE_FUNCTIONS.has(node.callee.name)) {
                   path.replace(addComment(node))
-                } else if (node.callee.type === 'FunctionExpression') {
-                  // Mark IIFE as pure, because typescript compile enums as IIFE
+                } else if (node.callee.type === 'FunctionExpression' && node.arguments.length === 1) {
+                  // Mark IIFE with single parameter as pure, because typescript compile enums as IIFE
                   path.replace(addComment(node))
                 }
                 this.traverse(path)
@@ -309,7 +311,8 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
             right: ').then(module => module.default ?? module)'
           }
         }
-      }
+      },
+      dynamicImportVars()
     ]
   }, {
     // 2nd pass to improve treeshaking
@@ -358,8 +361,8 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
               }
             } else if (node.callee.type === 'Identifier' && PURE_FUNCTIONS.has(node.callee.name)) {
               path.replace(addComment(node))
-            } else if (node.callee.type === 'FunctionExpression') {
-              // Mark IIFE as pure, because typescript compile enums as IIFE
+            } else if (node.callee.type === 'FunctionExpression' && node.arguments.length === 1) {
+              // Mark IIFE with single parameter as pure, because typescript compile enums as IIFE
               path.replace(addComment(node))
             }
             this.traverse(path)

rollup/rollup.config.ts

@@ -19,6 +19,8 @@ import { CommandsQuickAccessProvider } from 'vs/workbench/contrib/quickaccess/br
 import { DisposableStore } from 'vs/base/common/lifecycle'
 import { CancellationToken } from 'vs/base/common/cancellation'
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile'
+import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout'
+import { BrowserKeyboardLayoutService } from 'vs/workbench/services/keybinding/browser/keyboardLayoutService'
 import getFileServiceOverride from './files'
 import { consoleExtensionMessageHandler, getExtensionPoint } from './tools'
 import { DEFAULT_EXTENSION } from '../vscode-services/extHost'
@@ -125,7 +127,8 @@ function updateUserKeybindings (keybindingsJson: string): void {
 export default function getServiceOverride (): IEditorOverrideServices {
   return {
     ...getFileServiceOverride(),
-    [IKeybindingService.toString()]: new SyncDescriptor(DelegateStandaloneKeybindingService)
+    [IKeybindingService.toString()]: new SyncDescriptor(DelegateStandaloneKeybindingService),
+    [IKeyboardLayoutService.toString()]: new SyncDescriptor(BrowserKeyboardLayoutService)
   }
 }
 

src/service-override/keybindings.ts

@@ -291,9 +291,9 @@ class WorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService
   get webviewExternalEndpoint () { return unsupported() }
   debugRenderer = false
   get userRoamingDataHome () { return unsupported() }
-  get keyboardLayoutResource () { return unsupported() }
+  keyboardLayoutResource = URI.from({ scheme: 'user', path: '/keyboardLayout.json' })
   get argvResource () { return unsupported() }
-  get snippetsHome () { return URI.from({ scheme: 'user', path: '/snippets' }) }
+  snippetsHome = URI.from({ scheme: 'user', path: '/snippets' })
   get untitledWorkspacesHome () { return unsupported() }
   get globalStorageHome () { return unsupported() }
   get workspaceStorageHome () { return unsupported() }