From 868cdd280a1d27d4d5bde8ce9a90387426c25046 Mon Sep 17 00:00:00 2001 From: jacques RUDLOFF Date: Wed, 22 Oct 2025 17:36:19 +0200 Subject: [PATCH 1/2] fix(work): fix import of cobol extension --- src/additionalExtensions.ts | 1 + src/services.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/additionalExtensions.ts b/src/additionalExtensions.ts index b5cd527..1173512 100644 --- a/src/additionalExtensions.ts +++ b/src/additionalExtensions.ts @@ -1 +1,2 @@ +import './customExtensions' export { whenReady } from '../extensions/*.vsix' diff --git a/src/services.ts b/src/services.ts index 7624f96..effe31f 100644 --- a/src/services.ts +++ b/src/services.ts @@ -33,7 +33,6 @@ import { IWorkbenchConstructionOptions, IWorkspaceProvider } from '@codingame/mo import EditorOpenHandlerRegistry from './tools/EditorOpenHandlerRegistry' import { whenReady as whenExtensionsReady } from './extensions' import 'vscode/localExtensionHost' -import './customExtensions' import './languages' import './worker' From 546c46f7bd014a879dc8e42f7ee2cf9dcfe8c20b Mon Sep 17 00:00:00 2001 From: jacques RUDLOFF Date: Thu, 18 Dec 2025 17:52:47 +0100 Subject: [PATCH 2/2] fix(work): await whenready of cobol extension --- src/additionalExtensions.ts | 10 ++++++++-- src/customExtensions/cobol.ts | 4 +++- src/customExtensions/index.ts | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/additionalExtensions.ts b/src/additionalExtensions.ts index 1173512..990ab8c 100644 --- a/src/additionalExtensions.ts +++ b/src/additionalExtensions.ts @@ -1,2 +1,8 @@ -import './customExtensions' -export { whenReady } from '../extensions/*.vsix' +import { whenReady as whenReadyCustomExtension } from './customExtensions' +import { whenReady as whenReadyExtension } from '../extensions/*.vsix' + +const whenReady = async () => { + await Promise.all([whenReadyCustomExtension(), whenReadyExtension()]) +} + +export { whenReady } diff --git a/src/customExtensions/cobol.ts b/src/customExtensions/cobol.ts index 957ca0b..62a61c4 100644 --- a/src/customExtensions/cobol.ts +++ b/src/customExtensions/cobol.ts @@ -1,6 +1,6 @@ import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions' -const { registerFileUrl } = registerExtension( +const { registerFileUrl, whenReady } = registerExtension( { name: 'cobol-indent', publisher: 'codingame', @@ -41,3 +41,5 @@ const { registerFileUrl } = registerExtension( ) registerFileUrl('./extension.js', new URL('./cobol-extension.js', import.meta.url).href) + +export { whenReady } diff --git a/src/customExtensions/index.ts b/src/customExtensions/index.ts index 99281a2..2caadbc 100644 --- a/src/customExtensions/index.ts +++ b/src/customExtensions/index.ts @@ -1 +1 @@ -import './cobol' +export { whenReady } from './cobol'