@theia/core 1.29.0-next.6 → 1.29.0

package/src/common/command.ts

@@ -49,9 +49,8 @@ export interface Command {
 
 export namespace Command {
     /* Determine whether object is a Command */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    export function is(arg: Command | any): arg is Command {
-        return !!arg && arg === Object(arg) && 'id' in arg;
+    export function is(arg: unknown): arg is Command {
+        return !!arg && typeof arg === 'object' && 'id' in arg;
     }
 
     /** Utility function to easily translate commands */

package/src/common/disposable.spec.ts

@@ -18,7 +18,6 @@ import { expect } from 'chai';
 import { DisposableCollection, Disposable } from './disposable';
 
 describe('Disposables', () => {
-    /* eslint-disable no-unused-expressions */
     it('Is safe to use Disposable.NULL', () => {
         const collectionA = new DisposableCollection(Disposable.NULL);
         const collectionB = new DisposableCollection(Disposable.NULL);

package/src/common/disposable.ts

@@ -23,9 +23,8 @@ export interface Disposable {
 }
 
 export namespace Disposable {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    export function is(arg: any): arg is Disposable {
-        return !!arg && typeof arg === 'object' && 'dispose' in arg && typeof arg['dispose'] === 'function';
+    export function is(arg: unknown): arg is Disposable {
+        return !!arg && typeof arg === 'object' && typeof (arg as Disposable).dispose === 'function';
     }
     export function create(func: () => void): Disposable {
         return { dispose: func };

package/src/common/glob.ts

@@ -549,11 +549,10 @@ function listToMap(list: string[]): Record<string, true> {
     return map;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isRelativePattern(obj: any): obj is IRelativePattern {
+export function isRelativePattern(obj: unknown): obj is IRelativePattern {
     const rp = obj as IRelativePattern;
 
-    return rp && typeof rp.base === 'string' && typeof rp.pattern === 'string' && typeof rp.pathToRelative === 'function';
+    return !!rp && typeof rp === 'object' && typeof rp.base === 'string' && typeof rp.pattern === 'string' && typeof rp.pathToRelative === 'function';
 }
 
 /**

package/src/common/keybinding.ts

@@ -101,9 +101,8 @@ export namespace Keybinding {
     }
 
     /* Determine whether object is a KeyBinding */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    export function is(arg: Keybinding | any): arg is Keybinding {
-        return !!arg && arg === Object(arg) && 'command' in arg && 'keybinding' in arg;
+    export function is(arg: unknown): arg is Keybinding {
+        return !!arg && typeof arg === 'object' && 'command' in arg && 'keybinding' in arg;
     }
 }
 

package/src/common/keys.ts

@@ -488,9 +488,8 @@ export namespace SpecialCases {
 
 export namespace Key {
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    export function isKey(arg: any): arg is Key {
-        return typeof arg === 'object' && ('code' in arg) && ('keyCode' in arg);
+    export function isKey(arg: unknown): arg is Key {
+        return !!arg && typeof arg === 'object' && 'code' in arg && 'keyCode' in arg;
     }
 
     export function getKey(arg: string | number): Key | undefined {

package/src/common/logger.spec.ts

@@ -18,8 +18,6 @@ import { expect } from 'chai';
 import { MockLogger } from './test/mock-logger';
 import { setRootLogger, unsetRootLogger } from './logger';
 
-/* eslint-disable no-unused-expressions */
-
 describe('logger', () => {
 
     it('window is not defined', () => {

package/src/common/lsp-types.ts

@@ -23,9 +23,13 @@ export interface TextDocumentContentChangeDelta {
 }
 export namespace TextDocumentContentChangeDelta {
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    export function is(arg: any): arg is TextDocumentContentChangeDelta {
-        return !!arg && typeof arg['text'] === 'string' && (typeof arg['rangeLength'] === 'number' || typeof arg['rangeLength'] === 'undefined') && Range.is(arg['range']);
+    export function is(arg: unknown): arg is TextDocumentContentChangeDelta {
+        const changeDelta = arg as TextDocumentContentChangeDelta;
+        return !!changeDelta
+            && typeof changeDelta === 'object'
+            && typeof changeDelta.text === 'string'
+            && (typeof changeDelta.rangeLength === 'number' || typeof changeDelta.rangeLength === 'undefined')
+            && Range.is(changeDelta.range);
     }
 
 }

package/src/common/menu/menu-types.ts

@@ -36,9 +36,8 @@ export interface MenuAction extends MenuNodeRenderingData, Pick<MenuNodeMetadata
 
 export namespace MenuAction {
     /* Determine whether object is a MenuAction */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    export function is(arg: MenuAction | any): arg is MenuAction {
-        return !!arg && arg === Object(arg) && 'commandId' in arg;
+    export function is(arg: unknown): arg is MenuAction {
+        return !!arg && typeof arg === 'object' && 'commandId' in arg;
     }
 }
 

package/src/common/menu/menu.spec.ts

@@ -59,7 +59,6 @@ describe('menu-model-registry', () => {
             expect(file.label, 'File');
             const openGroup = file.children[0] as CompositeMenuNode;
             expect(openGroup.children.length).equals(2);
-            // eslint-disable-next-line no-unused-expressions
             expect(openGroup.label).undefined;
         });
     });

package/src/common/message-rpc/channel.ts

@@ -14,6 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import { injectable } from '../../../shared/inversify';
 import { Disposable, DisposableCollection } from '../disposable';
 import { Emitter, Event } from '../event';
 import { ReadBuffer, WriteBuffer } from './message-buffer';
@@ -68,15 +69,11 @@ export interface ChannelCloseEvent {
 export type MessageProvider = () => ReadBuffer;
 
 /**
- * Helper class to implement the single channels on a {@link ChannelMultiplexer}. Simply forwards write requests to
- * the given write buffer source i.e. the main channel of the {@link ChannelMultiplexer}.
+ *  Reusable abstract {@link Channel} implementation that sets up
+ *  the basic channel event listeners and offers a generic close method.
  */
-export class ForwardingChannel implements Channel {
-
-    protected toDispose = new DisposableCollection();
-    constructor(readonly id: string, protected readonly closeHandler: () => void, protected readonly writeBufferSource: () => WriteBuffer) {
-        this.toDispose.pushAll([this.onCloseEmitter, this.onErrorEmitter, this.onMessageEmitter]);
-    }
+@injectable()
+export abstract class AbstractChannel implements Channel {
 
     onCloseEmitter: Emitter<ChannelCloseEvent> = new Emitter();
     get onClose(): Event<ChannelCloseEvent> {
@@ -93,13 +90,37 @@ export class ForwardingChannel implements Channel {
         return this.onMessageEmitter.event;
     };
 
+    protected toDispose: DisposableCollection = new DisposableCollection();
+
+    constructor() {
+        this.toDispose.pushAll([this.onCloseEmitter, this.onErrorEmitter, this.onMessageEmitter]);
+    }
+
+    close(): void {
+        this.toDispose.dispose();
+    }
+
+    abstract getWriteBuffer(): WriteBuffer;
+
+}
+
+/**
+ * Helper class to implement the single channels on a {@link ChannelMultiplexer}. Simply forwards write requests to
+ * the given write buffer source i.e. the main channel of the {@link ChannelMultiplexer}.
+ */
+export class ForwardingChannel extends AbstractChannel {
+
+    constructor(readonly id: string, protected readonly closeHandler: () => void, protected readonly writeBufferSource: () => WriteBuffer) {
+        super();
+    }
+
     getWriteBuffer(): WriteBuffer {
         return this.writeBufferSource();
     }
 
-    close(): void {
+    override close(): void {
+        super.close();
         this.closeHandler();
-        this.toDispose.dispose();
     }
 }
 

package/src/common/message-rpc/index.ts

@@ -14,5 +14,5 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 export { RequestHandler, RpcProtocol, RpcProtocolOptions } from './rpc-protocol';
-export { Channel, ChannelCloseEvent, MessageProvider } from './channel';
+export { Channel, AbstractChannel, ChannelCloseEvent, MessageProvider } from './channel';
 export { ReadBuffer, WriteBuffer } from './message-buffer';

package/src/common/message-rpc/rpc-message-encoder.spec.ts

@@ -15,41 +15,51 @@
 // *****************************************************************************
 
 import { expect } from 'chai';
+import {
+    EncodingError, MsgPackMessageDecoder, MsgPackMessageEncoder
+} from './rpc-message-encoder';
 import { Uint8ArrayReadBuffer, Uint8ArrayWriteBuffer } from './uint8-array-message-buffer';
-import { EncodingError, RpcMessageDecoder, RpcMessageEncoder } from './rpc-message-encoder';
 
-describe('PPC Message Codex', () => {
-    describe('RPC Message Encoder & Decoder', () => {
+describe('PPC Message Encoder & Decoder', () => {
+    describe('Msgpack  Encoder & Decoder', () => {
         it('should encode object into binary message and decode the message back into the original object', () => {
             const buffer = new Uint8Array(1024);
             const writer = new Uint8ArrayWriteBuffer(buffer);
+            const testObject = {
+                string: 'string',
+                boolean: true,
+                integer: 5,
+                float: 14.5,
+                array: ['1', 2, { three: 'three' }],
+                set: new Set([1, 2, 3]),
+                map: new Map([[1, 1], [2, 2], [3, 3]]),
+                buffer: new TextEncoder().encode('ThisIsAUint8Array'),
+                object: { foo: 'bar', baz: true },
+                undefined: undefined,
+                // eslint-disable-next-line no-null/no-null
+                null: null
+            };
 
-            const encoder = new RpcMessageEncoder();
-            const jsonMangled = JSON.parse(JSON.stringify(encoder));
-            // The RpcMessageEncoder can decode/encode collections, whereas JSON.parse can't. => We have to manually restore the set
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            jsonMangled.registeredTags = (encoder as any).registeredTags;
-
-            encoder.writeTypedValue(writer, encoder, new WeakSet());
-
+            const encoder = new MsgPackMessageEncoder();
+            encoder.encode(writer, testObject);
             const written = writer.getCurrentContents();
 
             const reader = new Uint8ArrayReadBuffer(written);
 
-            const decoder = new RpcMessageDecoder();
-            const decoded = decoder.readTypedValue(reader);
+            const decoder = new MsgPackMessageDecoder();
+            const decoded = decoder.decode(reader);
 
-            expect(decoded).deep.equal(jsonMangled);
+            expect(decoded).deep.equal(testObject);
         });
         it('should fail with an EncodingError when trying to encode the object ', () => {
             const x = new Set();
             const y = new Set();
             x.add(y);
             y.add(x);
-            const encoder = new RpcMessageEncoder();
 
             const writer = new Uint8ArrayWriteBuffer();
-            expect(() => encoder.writeTypedValue(writer, x, new WeakSet())).to.throw(EncodingError);
+            const encoder = new MsgPackMessageEncoder();
+            expect(() => encoder.encode(writer, x)).to.throw(EncodingError);
         });
     });
 });