From e1f09c87468a7cdfc536ae02c952b7c43ce2a9a1 Mon Sep 17 00:00:00 2001 From: Nina Doschek Date: Wed, 3 Apr 2024 15:14:16 +0200 Subject: [PATCH] GLSP-1302 Fix ServiceConnectionProvider inject in GLSPClientContribution (#203) Resolve this binding issue by using the RemoteConnectionProvider Symbol to inject, as it is bound to the ServiceConnectionProvider, to ensure it working for both use cases (browser and electron). Resolves https://github.com/eclipse-glsp/glsp/issues/1302 --- .../theia-integration/src/browser/glsp-client-contribution.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/theia-integration/src/browser/glsp-client-contribution.ts b/packages/theia-integration/src/browser/glsp-client-contribution.ts index a42033b..a123649 100644 --- a/packages/theia-integration/src/browser/glsp-client-contribution.ts +++ b/packages/theia-integration/src/browser/glsp-client-contribution.ts @@ -25,7 +25,7 @@ import { } from '@eclipse-glsp/client'; import { Disposable, DisposableCollection, MessageService } from '@theia/core'; import { FrontendApplication } from '@theia/core/lib/browser'; -import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider'; +import { RemoteConnectionProvider, ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider'; import { Deferred } from '@theia/core/lib/common/promise-util'; import { inject, injectable } from '@theia/core/shared/inversify'; import { MessageConnection } from 'vscode-jsonrpc'; @@ -111,7 +111,7 @@ export abstract class BaseGLSPClientContribution implements GLSPClientContributi } @inject(MessageService) protected readonly messageService: MessageService; - @inject(ServiceConnectionProvider) + @inject(RemoteConnectionProvider) protected readonly connectionProvider: ServiceConnectionProvider; get glspClient(): Promise {