Merge pull request #780 from TypeFox/lc-config

Remove languageId configuration ambiguity
TypeFox · Nov 8, 2024 · d4eb93a · d4eb93a
2 parents 3b48e50 + 1f54a53
commit d4eb93a
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 28 deletions.
diff --git a/packages/examples/src/clangd/client/config.ts b/packages/examples/src/clangd/client/config.ts
@@ -27,12 +27,10 @@ export const createWrapperConfig = async (config: {
     clangdWorkerHandler: ClangdWorkerHandler,
     lsMessageLocalPort: MessagePort
 }): Promise<WrapperConfig> => {
-    const languageId = 'cpp';
     return {
         logLevel: LogLevel.Debug,
         languageClientConfigs: {
             LANGUAGE_ID: {
-                languageId: languageId,
                 name: 'Clangd WASM Language Server',
                 connection: {
                     options: {
@@ -47,7 +45,7 @@ export const createWrapperConfig = async (config: {
                     keepWorker: true
                 },
                 clientOptions: {
-                    documentSelector: [languageId],
+                    documentSelector: ['cpp'],
                     workspaceFolder: {
                         index: 0,
                         name: 'workspace',

diff --git a/packages/examples/src/eclipse.jdt.ls/client/main.ts b/packages/examples/src/eclipse.jdt.ls/client/main.ts
@@ -49,7 +49,6 @@ export const runEclipseJdtLsClient = () => {
         },
         languageClientConfigs: {
             java: {
-                languageId: 'java',
                 connection: {
                     options: {
                         $type: 'WebSocketUrl',

diff --git a/packages/examples/src/groovy/client/main.ts b/packages/examples/src/groovy/client/main.ts
@@ -45,7 +45,9 @@ const userConfig: WrapperConfig = {
     },
     languageClientConfigs: {
         groovy: {
-            languageId: 'groovy',
+            clientOptions: {
+                documentSelector: ['groovy']
+            },
             connection: {
                 options: {
                     $type: 'WebSocketUrl',

diff --git a/packages/examples/src/json/client/wrapperWs.ts b/packages/examples/src/json/client/wrapperWs.ts
@@ -48,7 +48,9 @@ export const buildJsonClientUserConfig = (params: {
         },
         languageClientConfigs: {
             json: {
-                languageId: 'json',
+                clientOptions: {
+                    documentSelector: ['json']
+                },
                 connection: {
                     options: {
                         $type: 'WebSocketUrl',

diff --git a/packages/examples/src/langium/langium-dsl/config/classicConfig.ts b/packages/examples/src/langium/langium-dsl/config/classicConfig.ts
@@ -51,7 +51,9 @@ export const setupLangiumClientClassic = async (): Promise<WrapperConfig> => {
         },
         languageClientConfigs: {
             langium: {
-                languageId: 'langium',
+                clientOptions: {
+                    documentSelector: ['langium']
+                },
                 connection: {
                     options: {
                         $type: 'WorkerDirect',

diff --git a/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts b/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts
@@ -79,7 +79,9 @@ export const setupLangiumClientExtended = async (): Promise<WrapperConfig> => {
         },
         languageClientConfigs: {
             langium: {
-                languageId: 'langium',
+                clientOptions: {
+                    documentSelector: ['langium']
+                },
                 connection: {
                     options: {
                         $type: 'WorkerDirect',

diff --git a/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts b/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts
@@ -38,7 +38,9 @@ export const createLangiumGlobalConfig = async (params: {
 
     const languageClientConfigs: Record<string, LanguageClientConfig> | undefined = params.useLanguageClient && params.worker ? {
         statemachine: {
-            languageId: 'statemachine',
+            clientOptions: {
+                documentSelector: ['statemachine']
+            },
             connection: {
                 options: {
                     $type: 'WorkerDirect',

diff --git a/packages/examples/src/multi/twoLanguageClients.ts b/packages/examples/src/multi/twoLanguageClients.ts
@@ -59,7 +59,9 @@ print("Hello Moon!")
         },
         languageClientConfigs: {
             json: {
-                languageId: 'json',
+                clientOptions: {
+                    documentSelector: ['json']
+                },
                 name: 'JSON Client',
                 connection: {
                     options: {
@@ -72,7 +74,6 @@ print("Hello Moon!")
                 }
             },
             python: {
-                languageId: 'python',
                 name: 'Python Client',
                 connection: {
                     options: {

diff --git a/packages/examples/src/python/client/config.ts b/packages/examples/src/python/client/config.ts
@@ -31,7 +31,6 @@ export const createUserConfig = (workspaceRoot: string, code: string, codeUri: s
     return {
         languageClientConfigs: {
             python: {
-                languageId: 'python',
                 name: 'Python Language Server Example',
                 connection: {
                     options: {

diff --git a/packages/wrapper/src/languageClientWrapper.ts b/packages/wrapper/src/languageClientWrapper.ts
@@ -16,9 +16,8 @@ export interface ConnectionConfig {
 
 export interface LanguageClientConfig {
     name?: string;
-    languageId: string;
     connection: ConnectionConfig;
-    clientOptions?: LanguageClientOptions;
+    clientOptions: LanguageClientOptions;
     restartOptions?: LanguageClientRestartOptions;
 }
 
@@ -37,7 +36,6 @@ export class LanguageClientWrapper {
 
     private languageClient?: MonacoLanguageClient;
     private languageClientConfig: LanguageClientConfig;
-    private languageId: string;
     private worker?: Worker;
     private port?: MessagePort;
     private name?: string;
@@ -50,7 +48,6 @@ export class LanguageClientWrapper {
         this.languageClientConfig = config.languageClientConfig;
         this.name = this.languageClientConfig.name ?? 'unnamed';
         this.logger = config.logger;
-        this.languageId = this.languageClientConfig.languageId;
     }
 
     haveLanguageClient(): boolean {
@@ -175,21 +172,20 @@ export class LanguageClientWrapper {
             this.logger?.info('performLanguageClientStart: monaco-languageclient already running!');
             resolve();
         }
+
         const mlcConfig = {
             name: this.languageClientConfig.name ?? 'Monaco Wrapper Language Client',
-
-            // allow to fully override the clientOptions
-            clientOptions: this.languageClientConfig.clientOptions ?? {
-                documentSelector: [this.languageId],
-                // disable the default error handler
+            clientOptions: {
+                // disable the default error handler...
                 errorHandler: {
                     error: () => ({ action: ErrorAction.Continue }),
                     closed: () => ({ action: CloseAction.DoNotRestart })
-                }
+                },
+                // ...but allowm to override all options
+                ...this.languageClientConfig.clientOptions,
             },
             messageTransports
         };
-
         this.languageClient = new MonacoLanguageClient(mlcConfig);
 
         const conOptions = this.languageClientConfig.connection.options;

diff --git a/packages/wrapper/test/languageClientWrapper.test.ts b/packages/wrapper/test/languageClientWrapper.test.ts
@@ -24,7 +24,9 @@ describe('Test LanguageClientWrapper', () => {
             name: 'Langium LS',
         });
         const languageClientConfig: LanguageClientConfig = {
-            languageId: 'javascript',
+            clientOptions: {
+                documentSelector: ['javascript']
+            },
             connection: {
                 options: {
                     $type: 'WorkerDirect',
@@ -51,7 +53,9 @@ describe('Test LanguageClientWrapper', () => {
         const config = createWrapperConfigExtendedApp();
         config.languageClientConfigs = {
             javascript: {
-                languageId: 'javascript',
+                clientOptions: {
+                    documentSelector: ['javascript']
+                },
                 connection: {
                     options: {
                         $type: 'WorkerDirect',
@@ -84,7 +88,9 @@ describe('Test LanguageClientWrapper', () => {
         const config = createWrapperConfigExtendedApp();
         config.languageClientConfigs = {
             javascript: {
-                languageId: 'javascript',
+                clientOptions: {
+                    documentSelector: ['javascript']
+                },
                 connection: {
                     options: {
                         $type: 'WebSocketUrl',
@@ -104,7 +110,9 @@ describe('Test LanguageClientWrapper', () => {
         const config = createWrapperConfigExtendedApp();
         config.languageClientConfigs = {
             javascript: {
-                languageId: 'javascript',
+                clientOptions: {
+                    documentSelector: ['javascript']
+                },
                 name: 'test-unreachable',
                 connection: {
                     options: {
@@ -141,7 +149,9 @@ describe('Test LanguageClientWrapper', () => {
         const config = createWrapperConfigExtendedApp();
         config.languageClientConfigs = {
             javascript: {
-                languageId: 'javascript',
+                clientOptions: {
+                    documentSelector: ['javascript']
+                },
                 connection: {
                     options: {
                         $type: 'WorkerConfig',