-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Update Theia dependencies to 1.27.0 - Adapt code base to API breaks of 1.27.0 - Implement a temporary workaround for tunneling json-rpc connection until eclipse-theia/theia#11405 is resolved - Update readmes Fixes eclipse-glsp/glsp#703 Contributed on behalf of STMicroelectronics
- Loading branch information
Showing
16 changed files
with
694 additions
and
394 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "version": "1.0.0", | ||
| "version": "1.0.0-theia1.27.0", | ||
| "useWorkspaces": true, | ||
| "npmClient": "yarn", | ||
| "command": { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
packages/theia-integration/src/browser/channel-connection.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2022 STMicroelectronics and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
| import { Channel, Disposable, DisposableCollection, Emitter, MessageProvider } from '@theia/core'; | ||
| import { createMessageConnection, Logger, Message, MessageConnection } from 'vscode-jsonrpc'; | ||
| import { AbstractMessageReader, DataCallback, MessageReader } from 'vscode-jsonrpc/lib/messageReader'; | ||
|
|
||
| import { AbstractMessageWriter, MessageWriter } from 'vscode-jsonrpc/lib/messageWriter'; | ||
|
|
||
| // Temporary fix/workaround to enable comparability with Theia >=1.27 until https://github.com/eclipse-theia/theia/issues/11405 is resolved | ||
|
|
||
| /** | ||
| * A `vscode-jsonrpc` {@link MessageReader} that reads messages from an underlying {@link Channel}. | ||
| */ | ||
| export class ChannelMessageReader extends AbstractMessageReader implements MessageReader { | ||
| protected onMessageEmitter = new Emitter<Message>(); | ||
| protected toDispose = new DisposableCollection(); | ||
|
|
||
| constructor(protected readonly channel: Channel) { | ||
| super(); | ||
| this.toDispose.push(this.onMessageEmitter); | ||
| this.toDispose.push(channel.onMessage(data => this.handleMessage(data))); | ||
| this.toDispose.push(channel.onClose(() => this.fireClose())); | ||
| } | ||
|
|
||
| protected handleMessage(msgProvider: MessageProvider): void { | ||
| const buffer = msgProvider().readBytes(); | ||
| const message = JSON.parse(new TextDecoder().decode(buffer)); | ||
| this.onMessageEmitter.fire(message); | ||
| } | ||
|
|
||
| override dispose(): void { | ||
| super.dispose(); | ||
| this.toDispose.dispose(); | ||
| } | ||
|
|
||
| listen(callback: DataCallback): void { | ||
| this.onMessageEmitter.event(callback); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * A `vscode-jsonrpc` {@link MessageWriter} that writes messages to an underlying {@link Channel}. | ||
| */ | ||
| export class ChannelMessageWriter extends AbstractMessageWriter implements MessageWriter { | ||
| protected toDispose: Disposable; | ||
|
|
||
| constructor(protected readonly channel: Channel) { | ||
| super(); | ||
| this.toDispose = channel.onClose(() => this.fireClose()); | ||
| } | ||
|
|
||
| write(msg: Message): void { | ||
| const writeBuffer = this.channel.getWriteBuffer(); | ||
| writeBuffer.writeBytes(Buffer.from(JSON.stringify(msg, undefined, 0))); | ||
| writeBuffer.commit(); | ||
| } | ||
|
|
||
| override dispose(): void { | ||
| super.dispose(); | ||
| this.toDispose.dispose(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Create a `vscode-jsonrpc` {@link MessageConnection} on top of a given {@link Channel}. | ||
| */ | ||
| export function createChannelConnection(channel: Channel, logger?: Logger): MessageConnection { | ||
| const reader = new ChannelMessageReader(channel); | ||
| const writer = new ChannelMessageWriter(channel); | ||
| return createMessageConnection(reader, writer, logger); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.