fix: Make Infrastructure useMutualizedProxy more configurable

Author: CGNonofr

src/infrastructure.ts

@@ -5,7 +5,7 @@ import * as monaco from 'monaco-editor'
 import type * as vscode from 'vscode'
 import { getFile, updateFile } from './customRequests'
 import { LanguageClientManager } from './languageClient'
-import { LanguageClientId } from './languageClientOptions'
+import { LanguageClientId, LanguageClientOptions } from './languageClientOptions'
 
 export interface Infrastructure {
   /**
@@ -22,10 +22,11 @@ export interface Infrastructure {
    * Workspace folders
    */
   workspaceFolders?: typeof vscode.workspace.workspaceFolders
+
   /**
-   * The language server proxy is used, so we only need to load configurations for language servers which are not mutualized
+   * Does a mutualization proxy will be used, it means we don't need to load configurations for this server
    */
-  useMutualizedProxy: boolean
+  useMutualizedProxy (languageClientId: LanguageClientId, options: LanguageClientOptions): boolean
 
   /**
    * Save a file on the filesystem
@@ -74,7 +75,7 @@ export abstract class CodinGameInfrastructure implements Infrastructure {
      * The domain of the server
      */
     public serverAddress: string,
-    public useMutualizedProxy: boolean,
+    private _useMutualizedProxy: boolean,
     /**
      * An optional sessionId when connecting to the session-mutualized server
      */
@@ -86,6 +87,10 @@ export abstract class CodinGameInfrastructure implements Infrastructure {
   ) {
   }
 
+  useMutualizedProxy (languageClientId: LanguageClientId, options: LanguageClientOptions): boolean {
+    return this._useMutualizedProxy && options.mutualizable
+  }
+
   public readonly automaticTextDocumentUpdate = false
   public readonly rootUri = 'file:///tmp/project'
   public readonly workspaceFolders: typeof vscode.workspace.workspaceFolders = [{

src/languageClient.ts

@@ -109,7 +109,7 @@ export class LanguageClientManager implements LanguageClient {
 
   public async start (): Promise<void> {
     try {
-      await loadExtensionConfigurations([this.id], this.infrastructure.useMutualizedProxy)
+      await loadExtensionConfigurations([this.id], this.infrastructure.useMutualizedProxy(this.id, this.languageServerOptions))
     } catch (error) {
       console.error('Unable to load extension configuration', error)
     }
@@ -268,7 +268,7 @@ function createLanguageClientManager (
     throw new Error(`Unknown ${id} language server`)
   }
 
-  if (infrastructure.useMutualizedProxy && languageServerOptions.mutualizable) {
+  if (infrastructure.useMutualizedProxy(id, languageServerOptions) && languageServerOptions.mutualizable) {
     // When using the mutualized proxy, we don't need to synchronize the configuration nor send the initialization options
     languageServerOptions = {
       ...languageServerOptions,

src/tests/tools.ts

@@ -8,7 +8,7 @@ import {
 } from 'vscode-languageserver/lib/common/api'
 import { monaco } from '@codingame/monaco-editor-wrapper'
 import { getFile, updateFile } from '../customRequests'
-import { Infrastructure, LanguageClientManager, TextDocument, TextDocumentSaveReason } from '../'
+import { Infrastructure, LanguageClientId, LanguageClientManager, LanguageClientOptions, TextDocument, TextDocumentSaveReason } from '../'
 
 class PipedMessageReader extends AbstractMessageReader {
   private callback: DataCallback | undefined
@@ -121,9 +121,13 @@ export class TestInfrastructure implements Infrastructure {
 
   constructor (
     public automaticTextDocumentUpdate: boolean,
-    public useMutualizedProxy: boolean
+    public _useMutualizedProxy: boolean
   ) {}
 
+  useMutualizedProxy (languageClientId: LanguageClientId, options: LanguageClientOptions): boolean {
+    return this._useMutualizedProxy && options.mutualizable
+  }
+
   rootUri = 'file:///tmp/project'
   workspaceFolders = []