[plugin] fix #6160: decorate vscode-ws-jsonrpc to be es5 compatible

otherwise es5 plugin reader and writers cannot extend them Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Sep 12, 2019 · dff8292 · dff8292
1 parent 98f12a9
commit dff8292
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.theia/settings.json b/.theia/settings.json
@@ -12,4 +12,4 @@
   },
   "typescript.tsdk": "node_modules/typescript/lib",
   "clang-format.language.typescript.enable": false    
-}
+}
diff --git a/packages/plugin-ext/src/common/plugin-message-reader.ts b/packages/plugin-ext/src/common/plugin-message-reader.ts
@@ -14,12 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { es5ClassCompat } from './types';
 import { AbstractMessageReader, DataCallback } from 'vscode-jsonrpc/lib/messageReader';
 
 /**
  * Support for reading string message through RPC protocol.
  */
-export class PluginMessageReader extends AbstractMessageReader {
+export class PluginMessageReader extends es5ClassCompat(AbstractMessageReader) {
     protected state: 'initial' | 'listening' | 'closed' = 'initial';
     protected callback: DataCallback | undefined;
     // tslint:disable-next-line:no-any

diff --git a/packages/plugin-ext/src/common/plugin-message-writer.ts b/packages/plugin-ext/src/common/plugin-message-writer.ts
@@ -14,14 +14,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { es5ClassCompat } from './types';
 import { AbstractMessageWriter, MessageWriter } from 'vscode-jsonrpc/lib/messageWriter';
 import { ConnectionMain, ConnectionExt } from './plugin-api-rpc';
 import { Message } from 'vscode-jsonrpc';
 
 /**
  * Support for writing string message through RPC protocol.
  */
-export class PluginMessageWriter extends AbstractMessageWriter implements MessageWriter {
+export class PluginMessageWriter extends es5ClassCompat(AbstractMessageWriter) implements MessageWriter {
     constructor(
         protected readonly id: string,
         protected readonly proxy: ConnectionMain | ConnectionExt) {

diff --git a/packages/plugin-ext/src/common/types.ts b/packages/plugin-ext/src/common/types.ts
@@ -63,3 +63,15 @@ export interface LogPart {
 // tslint:disable-next-line:no-any
 export interface KeysToAnyValues { [key: string]: any }
 export interface KeysToKeysToAnyValue { [key: string]: KeysToAnyValues }
+
+// tslint:disable:no-any
+/** copied from https://github.com/TypeFox/vscode/blob/70b8db24a37fafc77247de7f7cb5bb0195120ed0/src/vs/workbench/api/common/extHostTypes.ts#L18-L27 */
+export function es5ClassCompat<T extends Function>(target: T): T {
+    /// @ts-ignore
+    function _(): any { return Reflect.construct(target, arguments, this.constructor); }
+    Object.defineProperty(_, 'name', Object.getOwnPropertyDescriptor(target, 'name')!);
+    Object.setPrototypeOf(_, target);
+    Object.setPrototypeOf(_.prototype, target.prototype);
+    return _ as unknown as T;
+}
+// tslint:enable:no-any
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ @@
       },
       "typescript.tsdk": "node_modules/typescript/lib",
       "clang-format.language.typescript.enable": false
-    }
+    }