@theia/plugin-ext 1.44.0 → 1.45.0

package/src/plugin/type-converters.ts

@@ -31,8 +31,7 @@ import { DisposableCollection, Mutable, isEmptyObject, isObject } from '@theia/c
 import * as notebooks from '@theia/notebook/lib/common';
 import { CommandsConverter } from './command-registry';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
-import { CellData, CellExecutionUpdateType, CellOutput, CellOutputItem, CellRange, isTextStreamMime } from '@theia/notebook/lib/common';
-import { CellExecuteUpdate, CellExecutionComplete } from '@theia/notebook/lib/browser';
+import { CellRange, isTextStreamMime } from '@theia/notebook/lib/common';
 import { MarkdownString as MarkdownStringDTO } from '@theia/core/lib/common/markdown-rendering';
 
 import { TestItemDTO, TestMessageDTO } from '../common/test-types';
@@ -1636,126 +1635,6 @@ export namespace NotebookKernelSourceAction {
     }
 }
 
-export namespace NotebookDto {
-
-    export function toNotebookOutputItemDto(item: CellOutputItem): rpc.NotebookOutputItemDto {
-        return {
-            mime: item.mime,
-            valueBytes: item.data
-        };
-    }
-
-    export function toNotebookOutputDto(output: CellOutput): rpc.NotebookOutputDto {
-        return {
-            outputId: output.outputId,
-            metadata: output.metadata,
-            items: output.outputs.map(toNotebookOutputItemDto)
-        };
-    }
-
-    export function toNotebookCellDataDto(cell: CellData): rpc.NotebookCellDataDto {
-        return {
-            cellKind: cell.cellKind,
-            language: cell.language,
-            source: cell.source,
-            internalMetadata: cell.internalMetadata,
-            metadata: cell.metadata,
-            outputs: cell.outputs.map(toNotebookOutputDto)
-        };
-    }
-
-    // export function toNotebookDataDto(data: NotebookData): rpc.NotebookDataDto {
-    //     return {
-    //         metadata: data.metadata,
-    //         cells: data.cells.map(toNotebookCellDataDto)
-    //     };
-    // }
-
-    export function fromNotebookOutputItemDto(item: rpc.NotebookOutputItemDto): CellOutputItem {
-        return {
-            mime: item.mime,
-            data: item.valueBytes
-        };
-    }
-
-    export function fromNotebookOutputDto(output: rpc.NotebookOutputDto): CellOutput {
-        return {
-            outputId: output.outputId,
-            metadata: output.metadata,
-            outputs: output.items.map(fromNotebookOutputItemDto)
-        };
-    }
-
-    export function fromNotebookCellDataDto(cell: rpc.NotebookCellDataDto): CellData {
-        return {
-            cellKind: cell.cellKind,
-            language: cell.language,
-            source: cell.source,
-            outputs: cell.outputs.map(fromNotebookOutputDto),
-            metadata: cell.metadata,
-            internalMetadata: cell.internalMetadata
-        };
-    }
-
-    // export function fromNotebookDataDto(data: rpc.NotebookDataDto): NotebookData {
-    //     return {
-    //         metadata: data.metadata,
-    //         cells: data.cells.map(fromNotebookCellDataDto)
-    //     };
-    // }
-
-    // export function toNotebookCellDto(cell: Cell): rpc.NotebookCellDto {
-    //     return {
-    //         handle: cell.handle,
-    //         uri: cell.uri,
-    //         source: cell.textBuffer.getLinesContent(),
-    //         eol: cell.textBuffer.getEOL(),
-    //         language: cell.language,
-    //         cellKind: cell.cellKind,
-    //         outputs: cell.outputs.map(toNotebookOutputDto),
-    //         metadata: cell.metadata,
-    //         internalMetadata: cell.internalMetadata,
-    //     };
-    // }
-
-    export function fromCellExecuteUpdateDto(data: rpc.CellExecuteUpdateDto): CellExecuteUpdate {
-        if (data.editType === CellExecutionUpdateType.Output) {
-            return {
-                editType: data.editType,
-                cellHandle: data.cellHandle,
-                append: data.append,
-                outputs: data.outputs.map(fromNotebookOutputDto)
-            };
-        } else if (data.editType === CellExecutionUpdateType.OutputItems) {
-            return {
-                editType: data.editType,
-                append: data.append,
-                outputId: data.outputId,
-                items: data.items.map(fromNotebookOutputItemDto)
-            };
-        } else {
-            return data;
-        }
-    }
-
-    export function fromCellExecuteCompleteDto(data: rpc.CellExecutionCompleteDto): CellExecutionComplete {
-        return data;
-    }
-
-    // export function fromCellEditOperationDto(edit: rpc.CellEditOperationDto): CellEditOperation {
-    //     if (edit.editType === CellEditType.Replace) {
-    //         return {
-    //             editType: edit.editType,
-    //             index: edit.index,
-    //             count: edit.count,
-    //             cells: edit.cells.map(fromNotebookCellDataDto)
-    //         };
-    //     } else {
-    //         return edit;
-    //     }
-    // }
-}
-
 export namespace TestMessage {
     export function from(message: theia.TestMessage | readonly theia.TestMessage[]): TestMessageDTO[] {
         if (isReadonlyArray(message)) {
@@ -1765,7 +1644,8 @@ export namespace TestMessage {
             location: fromLocation(message.location),
             message: fromMarkdown(message.message)!,
             expected: message.expectedOutput,
-            actual: message.actualOutput
+            actual: message.actualOutput,
+            contextValue: message.contextValue
         }];
     }
 }

package/src/plugin/types-impl.ts

@@ -3293,6 +3293,7 @@ export class TestMessage implements theia.TestMessage {
     public expectedOutput?: string;
     public actualOutput?: string;
     public location?: theia.Location;
+    public contextValue?: string;
 
     public static diff(message: string | theia.MarkdownString, expected: string, actual: string): theia.TestMessage {
         const msg = new TestMessage(message);

package/src/plugin/window-state.ts

@@ -19,7 +19,6 @@ import { WindowState } from '@theia/plugin';
 import { WindowStateExt, WindowMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { Schemes } from '../common/uri-components';
 
 export class WindowStateExtImpl implements WindowStateExt {
 
@@ -50,6 +49,10 @@ export class WindowStateExtImpl implements WindowStateExt {
     }
 
     openUri(uri: URI): Promise<boolean> {
+        if (!uri.scheme.trim().length) {
+            throw new Error('Invalid scheme - cannot be empty');
+        }
+
         return this.proxy.$openUri(uri);
     }
 
@@ -57,9 +60,6 @@ export class WindowStateExtImpl implements WindowStateExt {
         if (!target.scheme.trim().length) {
             throw new Error('Invalid scheme - cannot be empty');
         }
-        if (Schemes.http !== target.scheme && Schemes.https !== target.scheme) {
-            throw new Error(`Invalid scheme '${target.scheme}'`);
-        }
 
         const uri = await this.proxy.$asExternalUri(target);
         return URI.revive(uri);