Merge pull request #753 from CodinGame/lmn/vscode-1.107

VSCode 1.107

Author: CGNonofr

.ncurc.json

@@ -24,20 +24,20 @@
     "@xterm/xterm",
     "cookie",
     "jschardet",
+    "jsonc-parser",
     "katex",
     "kerberos",
     "marked",
     "node-pty",
-    "tas-client-umd",
+    "tas-client",
     "vscode-css-languageservice",
     "vscode-html-languageservice",
     "vscode-json-languageservice",
-    "vscode-uri",
-    "jsonc-parser",
     "vscode-oniguruma",
     "vscode-regexpp",
     "vscode-semver",
     "vscode-textmate",
+    "vscode-uri",
     "yauzl",
     "yazl"
   ]

demo/package-lock.json

@@ -10,10 +10,6 @@ export class TerminalBackend extends SimpleTerminalBackend {
   override getDefaultSystemShell = async (): Promise<string> => 'fake'
   override createProcess = async (): Promise<ITerminalChildProcess> => {
     const dataEmitter = new vscode.EventEmitter<string>()
-    const propertyEmitter = new vscode.EventEmitter<{
-      type: string
-      value: string
-    }>()
     class FakeTerminalProcess extends SimpleTerminalProcess {
       private column = 0
       async start(): Promise<undefined> {
@@ -27,8 +23,6 @@ export class TerminalBackend extends SimpleTerminalBackend {
         return undefined
       }
 
-      override onDidChangeProperty = propertyEmitter.event
-
       override shutdown(immediate: boolean): void {
         console.log('shutdown', immediate)
       }

demo/package.json

@@ -83,11 +83,10 @@ import getProcessControllerServiceOverride from '@codingame/monaco-vscode-proces
 import getImageResizeServiceOverride from '@codingame/monaco-vscode-image-resize-service-override'
 import getAssignmentServiceOverride from '@codingame/monaco-vscode-assignment-service-override'
 import { EnvironmentOverride } from '@codingame/monaco-vscode-api/workbench'
-import { Worker } from './tools/crossOriginWorker'
+import { Worker } from './tools/fakeWorker.js'
 import defaultKeybindings from './user/keybindings.json?raw'
 import defaultConfiguration from './user/configuration.json?raw'
-import { TerminalBackend } from './features/terminal'
-import { workerConfig } from './tools/extHostWorker'
+import { TerminalBackend } from './features/terminal.js'
 import 'vscode/localExtensionHost'
 
 const url = new URL(document.location.href)
@@ -269,48 +268,46 @@ h1 {
 }
 
 // Workers
-export type WorkerLoader = () => Worker
-const workerLoaders: Partial<Record<string, WorkerLoader>> = {
-  TextEditorWorker: () =>
-    new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker.js', import.meta.url), {
-      type: 'module'
-    }),
-  TextMateWorker: () =>
-    new Worker(
-      new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url),
-      { type: 'module' }
+const workers: Partial<Record<string, Worker>> = {
+  editorWorkerService: new Worker(
+    new URL('monaco-editor/esm/vs/editor/editor.worker.js', import.meta.url),
+    { type: 'module' }
+  ),
+  extensionHostWorkerMain: new Worker(
+    new URL('@codingame/monaco-vscode-api/workers/extensionHost.worker', import.meta.url),
+    { type: 'module' }
+  ),
+  TextMateWorker: new Worker(
+    new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url),
+    { type: 'module' }
+  ),
+  OutputLinkDetectionWorker: new Worker(
+    new URL('@codingame/monaco-vscode-output-service-override/worker', import.meta.url),
+    { type: 'module' }
+  ),
+  LanguageDetectionWorker: new Worker(
+    new URL(
+      '@codingame/monaco-vscode-language-detection-worker-service-override/worker',
+      import.meta.url
     ),
-  OutputLinkDetectionWorker: () =>
-    new Worker(
-      new URL('@codingame/monaco-vscode-output-service-override/worker', import.meta.url),
-      { type: 'module' }
-    ),
-  LanguageDetectionWorker: () =>
-    new Worker(
-      new URL(
-        '@codingame/monaco-vscode-language-detection-worker-service-override/worker',
-        import.meta.url
-      ),
-      { type: 'module' }
-    ),
-  NotebookEditorWorker: () =>
-    new Worker(
-      new URL('@codingame/monaco-vscode-notebook-service-override/worker', import.meta.url),
-      { type: 'module' }
-    ),
-  LocalFileSearchWorker: () =>
-    new Worker(
-      new URL('@codingame/monaco-vscode-search-service-override/worker', import.meta.url),
-      { type: 'module' }
-    )
+    { type: 'module' }
+  ),
+  NotebookEditorWorker: new Worker(
+    new URL('@codingame/monaco-vscode-notebook-service-override/worker', import.meta.url),
+    { type: 'module' }
+  ),
+  LocalFileSearchWorker: new Worker(
+    new URL('@codingame/monaco-vscode-search-service-override/worker', import.meta.url),
+    { type: 'module' }
+  )
 }
+
 window.MonacoEnvironment = {
-  getWorker: function (moduleId, label) {
-    const workerFactory = workerLoaders[label]
-    if (workerFactory != null) {
-      return workerFactory()
-    }
-    throw new Error(`Unimplemented worker ${label} (${moduleId})`)
+  getWorkerUrl(_, label) {
+    return workers[label]?.url.toString()
+  },
+  getWorkerOptions(_, label) {
+    return workers[label]?.options
   }
 }
 
@@ -407,7 +404,9 @@ export const envOptions: EnvironmentOverride = {
 export const commonServices: IEditorOverrideServices = {
   ...getAuthenticationServiceOverride(),
   ...getLogServiceOverride(),
-  ...getExtensionServiceOverride(workerConfig),
+  ...getExtensionServiceOverride({
+    enableWorkerExtensionHost: true
+  }),
   ...getExtensionGalleryServiceOverride({ webOnly: false }),
   ...getModelServiceOverride(),
   ...getNotificationServiceOverride(),