Merge pull request #69 from CodinGame/fix-extension-loading

[FIX] Fix extension loading

Author: samuel-olivier

src/extensionConfiguration.ts

@@ -1,17 +1,16 @@
 import { loadConfigurationForExtension } from '@codingame/monaco-editor-wrapper/features/extensionConfigurations'
-import { getLanguageClientOptions, LanguageClientId } from './languageClientOptions'
+import { LanguageClientOptions } from './languageClientOptions'
 
 /**
  * Load the configuration schemas from vscode extensions
  * @param forLanguageClientIds Load the extensions related to these language client ids
  * @param useMutualizedProxy The language server proxy is used, so we only need to load configurations for language servers which are not mutualized
  */
-export async function loadExtensionConfigurations (forLanguageClientIds: LanguageClientId[], useMutualizedProxy: boolean): Promise<void> {
+export async function loadExtensionConfigurations (clientOptions: LanguageClientOptions[], useMutualizedProxy: boolean): Promise<void> {
   const extensionConfigurationToLoad = new Set<string>()
-  for (const languageClientId of forLanguageClientIds) {
-    const config = getLanguageClientOptions(languageClientId)
-    if (!config.mutualizable || !useMutualizedProxy) {
-      config.vscodeExtensionIds?.forEach(extensionId => {
+  for (const clientOption of clientOptions) {
+    if (!clientOption.mutualizable || !useMutualizedProxy) {
+      clientOption.vscodeExtensionIds?.forEach(extensionId => {
         extensionConfigurationToLoad.add(extensionId)
       })
     }

src/languageClient.ts

@@ -171,7 +171,7 @@ export class LanguageClientManager implements LanguageClient {
 
   private prepare = once(async () => {
     try {
-      await loadExtensionConfigurations([this.id], this.useMutualizedProxy)
+      await loadExtensionConfigurations([this.clientOptions], this.useMutualizedProxy)
     } catch (error) {
       errorHandler.onUnexpectedError(new Error('[LSP] Unable to load extension configuration', {
         cause: error as Error