@theia/plugin-ext 1.42.0 → 1.43.0

package/src/plugin/type-converters.ts

@@ -27,13 +27,15 @@ import { MarkdownString as PluginMarkdownStringImpl } from './markdown-string';
 import * as types from './types-impl';
 import { UriComponents } from '../common/uri-components';
 import { isReadonlyArray } from '../common/arrays';
-import { MarkdownString as MarkdownStringDTO } from '@theia/core/lib/common/markdown-rendering';
-import { DisposableCollection, isEmptyObject, isObject } from '@theia/core/lib/common';
+import { DisposableCollection, Mutable, isEmptyObject, isObject } from '@theia/core/lib/common';
 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 { MarkdownString as MarkdownStringDTO } from '@theia/core/lib/common/markdown-rendering';
+
+import { TestItemDTO, TestMessageDTO } from '../common/test-types';
 
 const SIDE_GROUP = -2;
 const ACTIVE_GROUP = -1;
@@ -459,7 +461,13 @@ export function toInlineValueContext(inlineValueContext: model.InlineValueContex
     };
 }
 
-export function fromLocation(location: theia.Location): model.Location {
+// eslint-disable-next-line @typescript-eslint/no-shadow
+export function fromLocation(location: theia.Location): model.Location;
+export function fromLocation(location: theia.Location | undefined): model.Location | undefined;
+export function fromLocation(location: theia.Location | undefined): model.Location | undefined {
+    if (!location) {
+        return undefined;
+    }
     return <model.Location>{
         uri: location.uri,
         range: fromRange(location.range)
@@ -1722,6 +1730,7 @@ export namespace NotebookDto {
             return {
                 editType: data.editType,
                 append: data.append,
+                outputId: data.outputId,
                 items: data.items.map(fromNotebookOutputItemDto)
             };
         } else {
@@ -1746,3 +1755,78 @@ export namespace NotebookDto {
     //     }
     // }
 }
+
+export namespace TestMessage {
+    export function from(message: theia.TestMessage | readonly theia.TestMessage[]): TestMessageDTO[] {
+        if (isReadonlyArray(message)) {
+            return message.map(msg => TestMessage.from(msg)[0]);
+        }
+        return [{
+            location: fromLocation(message.location),
+            message: fromMarkdown(message.message)!,
+            expected: message.expectedOutput,
+            actual: message.actualOutput
+        }];
+    }
+}
+
+export namespace TestItem {
+    export function from(test: theia.TestItem): TestItemDTO {
+        return <TestItemDTO>TestItem.fromPartial(test);
+    }
+
+    export function fromPartial(test: Partial<theia.TestItem>): Partial<TestItemDTO> {
+        const result: Partial<Mutable<TestItemDTO>> = {};
+
+        if ('id' in test) {
+            result.id = test.id;
+        }
+
+        if ('uri' in test) {
+            result.uri = test.uri;
+        }
+
+        if ('label' in test) {
+            result.label = test.label;
+        }
+
+        if ('range' in test) {
+            result.range = fromRange(test.range);
+        }
+
+        if ('sortKey' in test) {
+            result.sortKey = test.sortText;
+        }
+
+        if ('tags' in test) {
+            result.tags = test.tags ? test.tags.map(tag => tag.id) : [];
+        }
+        if ('busy' in test) {
+            result.busy = test.busy!;
+        }
+        if ('sortKey' in test) {
+            result.sortKey = test.sortText;
+        }
+        if ('canResolveChildren' in test) {
+            result.canResolveChildren = test.canResolveChildren!;
+        }
+        if ('description' in test) {
+            result.description = test.description;
+        }
+
+        if ('description' in test) {
+            result.error = test.error;
+        }
+
+        if (test.children) {
+            const children: TestItemDTO[] = [];
+            test.children.forEach(item => {
+                children.push(TestItem.from(item));
+            });
+            result.children = children;
+        }
+
+        return result;
+
+    }
+}

package/src/plugin/types-impl.ts

@@ -2183,11 +2183,6 @@ export enum TerminalExitReason {
     Extension = 4,
 }
 
-export enum TerminalQuickFixType {
-    command = 'command',
-    opener = 'opener'
-}
-
 @es5ClassCompat
 export class FileDecoration {
 
@@ -3227,6 +3222,16 @@ export class LinkedEditingRanges {
     }
 }
 
+// Copied from https://github.com/microsoft/vscode/blob/1.72.2/src/vs/workbench/api/common/extHostTypes.ts
+export enum TestResultState {
+    Queued = 1,
+    Running = 2,
+    Passed = 3,
+    Failed = 4,
+    Skipped = 5,
+    Errored = 6
+}
+
 export enum TestRunProfileKind {
     Run = 1,
     Debug = 2,
@@ -3238,8 +3243,11 @@ export class TestTag implements theia.TestTag {
     constructor(public readonly id: string) { }
 }
 
+let nextTestRunId = 0;
 @es5ClassCompat
 export class TestRunRequest implements theia.TestRunRequest {
+    testRunId: number = nextTestRunId++;
+
     constructor(
         public readonly include: theia.TestItem[] | undefined = undefined,
         public readonly exclude: theia.TestItem[] | undefined = undefined,
@@ -3630,3 +3638,26 @@ export enum EditSessionIdentityMatch {
     None = 0
 }
 // #endregion
+
+// #region terminalQuickFixProvider
+export class TerminalQuickFixExecuteTerminalCommand {
+    /**
+     * The terminal command to run
+     */
+    terminalCommand: string;
+    /**
+     * @stubbed
+     */
+    constructor(terminalCommand: string) { }
+}
+export class TerminalQuickFixOpener {
+    /**
+     * The uri to open
+     */
+    uri: theia.Uri;
+    /**
+     * @stubbed
+     */
+    constructor(uri: theia.Uri) { }
+}
+

package/lib/plugin/stubs/tests-api.d.ts

@@ -1,25 +0,0 @@
-import { CancellationToken } from '@theia/core/lib/common/cancellation';
-import type * as theia from '@theia/plugin';
-export declare const createRunProfile: (label: string, kind: theia.TestRunProfileKind, runHandler: (request: theia.TestRunRequest, token: CancellationToken) => Thenable<void> | void, isDefault?: boolean | undefined, tag?: theia.TestTag | undefined, supportsContinuousRun?: boolean | undefined) => {
-    label: string;
-    kind: theia.TestRunProfileKind;
-    isDefault: boolean;
-    tag: theia.TestTag | undefined;
-    supportsContinuousRun: boolean;
-    runHandler: (request: theia.TestRunRequest, token: CancellationToken) => Thenable<void> | void;
-    configureHandler: undefined;
-    dispose: () => undefined;
-};
-export declare const createTestRun: (request: theia.TestRunRequest, name?: string | undefined, persist?: boolean | undefined) => theia.TestRun;
-export declare const testItemCollection: {
-    add: () => void;
-    delete: () => void;
-    forEach: () => void;
-    [Symbol.iterator](): Generator<never, void, unknown>;
-    get: () => undefined;
-    replace: () => void;
-    size: number;
-};
-export declare const createTestItem: (id: string, label: string, uri?: theia.Uri | undefined) => theia.TestItem;
-export declare const invalidateTestResults: (items?: theia.TestItem | readonly theia.TestItem[] | undefined) => void;
-//# sourceMappingURL=tests-api.d.ts.map

package/lib/plugin/stubs/tests-api.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tests-api.d.ts","sourceRoot":"","sources":["../../../src/plugin/stubs/tests-api.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,KAAK,KAAK,MAAM,eAAe,CAAC;AAE5C,eAAO,MAAM,gBAAgB,UAClB,MAAM,QACP,MAAM,kBAAkB,wBAEjB,MAAM,cAAc,SACtB,iBAAiB,KACvB,SAAS,IAAI,CAAC,GAAG,IAAI;;;;;;0BAFb,MAAM,cAAc,SACtB,iBAAiB,KACvB,SAAS,IAAI,CAAC,GAAG,IAAI;;;CAa5B,CAAC;AAEH,eAAO,MAAM,aAAa,YACb,MAAM,cAAc,+DAG9B,MAAM,OAwBP,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;CAQ9B,CAAC;AAEF,eAAO,MAAM,cAAc,OACnB,MAAM,SACH,MAAM,kCAEd,MAAM,QAWP,CAAC;AAEH,eAAO,MAAM,qBAAqB,sEAE/B,IAAiB,CAAC"}

package/lib/plugin/stubs/tests-api.js

@@ -1,70 +0,0 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.invalidateTestResults = exports.createTestItem = exports.testItemCollection = exports.createTestRun = exports.createRunProfile = void 0;
-/* tslint:disable:typedef */
-const cancellation_1 = require("@theia/core/lib/common/cancellation");
-const createRunProfile = (label, kind, runHandler, isDefault, tag, supportsContinuousRun) => ({
-    label,
-    kind,
-    isDefault: isDefault !== null && isDefault !== void 0 ? isDefault : false,
-    tag,
-    supportsContinuousRun: supportsContinuousRun !== null && supportsContinuousRun !== void 0 ? supportsContinuousRun : false,
-    runHandler,
-    configureHandler: undefined,
-    dispose: () => undefined,
-});
-exports.createRunProfile = createRunProfile;
-const createTestRun = (request, name, persist) => ({
-    name,
-    token: cancellation_1.CancellationToken.None,
-    isPersisted: false,
-    enqueued: (test) => undefined,
-    started: (test) => undefined,
-    skipped: (test) => undefined,
-    failed: (test, message, duration) => undefined,
-    errored: (test, message, duration) => undefined,
-    passed: (test, duration) => undefined,
-    appendOutput: (output, location, test) => undefined,
-    end: () => undefined,
-});
-exports.createTestRun = createTestRun;
-exports.testItemCollection = {
-    add: () => { },
-    delete: () => { },
-    forEach: () => { },
-    *[Symbol.iterator]() { },
-    get: () => undefined,
-    replace: () => { },
-    size: 0,
-};
-const createTestItem = (id, label, uri) => ({
-    id,
-    label,
-    uri,
-    children: exports.testItemCollection,
-    parent: undefined,
-    tags: [],
-    canResolveChildren: false,
-    busy: false,
-    range: undefined,
-    error: undefined,
-});
-exports.createTestItem = createTestItem;
-const invalidateTestResults = (items) => undefined;
-exports.invalidateTestResults = invalidateTestResults;
-//# sourceMappingURL=tests-api.js.map

package/lib/plugin/stubs/tests-api.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tests-api.js","sourceRoot":"","sources":["../../../src/plugin/stubs/tests-api.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,4BAA4B;AAE5B,sEAAwE;AAGjE,MAAM,gBAAgB,GAAG,CAC5B,KAAa,EACb,IAA8B,EAC9B,UAG0B,EAC1B,SAAmB,EACnB,GAAmB,EACnB,qBAA+B,EACjC,EAAE,CAAC,CAAC;IACF,KAAK;IACL,IAAI;IACJ,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,KAAK;IAC7B,GAAG;IACH,qBAAqB,EAAE,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,KAAK;IACrD,UAAU;IACV,gBAAgB,EAAE,SAAS;IAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;CAC3B,CAAC,CAAC;AAnBU,QAAA,gBAAgB,oBAmB1B;AAEI,MAAM,aAAa,GAAG,CACzB,OAA6B,EAC7B,IAAa,EACb,OAAiB,EACJ,EAAE,CAAC,CAAC;IACjB,IAAI;IACJ,KAAK,EAAE,gCAAiB,CAAC,IAAI;IAC7B,WAAW,EAAE,KAAK;IAClB,QAAQ,EAAE,CAAC,IAAoB,EAAE,EAAE,CAAC,SAAS;IAC7C,OAAO,EAAE,CAAC,IAAoB,EAAE,EAAE,CAAC,SAAS;IAC5C,OAAO,EAAE,CAAC,IAAoB,EAAE,EAAE,CAAC,SAAS;IAC5C,MAAM,EAAE,CACJ,IAAoB,EACpB,OAAyD,EACzD,QAAiB,EACnB,EAAE,CAAC,SAAS;IACd,OAAO,EAAE,CACL,IAAoB,EACpB,OAAyD,EACzD,QAAiB,EACnB,EAAE,CAAC,SAAS;IACd,MAAM,EAAE,CAAC,IAAoB,EAAE,QAAiB,EAAE,EAAE,CAAC,SAAS;IAC9D,YAAY,EAAE,CACV,MAAc,EACd,QAAyB,EACzB,IAAqB,EACvB,EAAE,CAAC,SAAS;IACd,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;CACvB,CAAC,CAAC;AA5BU,QAAA,aAAa,iBA4BvB;AAEU,QAAA,kBAAkB,GAAG;IAC9B,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC;IAClB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxB,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;IACpB,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC;IAClB,IAAI,EAAE,CAAC;CACV,CAAC;AAEK,MAAM,cAAc,GAAG,CAC1B,EAAU,EACV,KAAa,EACb,GAAe,EACD,EAAE,CAAC,CAAC;IAClB,EAAE;IACF,KAAK;IACL,GAAG;IACH,QAAQ,EAAE,0BAAkB;IAC5B,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,EAAE;IACR,kBAAkB,EAAE,KAAK;IACzB,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;CACnB,CAAC,CAAC;AAfU,QAAA,cAAc,kBAexB;AAEI,MAAM,qBAAqB,GAAG,CACjC,KAAkD,EAC9C,EAAE,CAAC,SAAS,CAAC;AAFR,QAAA,qBAAqB,yBAEb"}

package/src/plugin/stubs/tests-api.ts

@@ -1,102 +0,0 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/* tslint:disable:typedef */
-
-import { CancellationToken } from '@theia/core/lib/common/cancellation';
-import type * as theia from '@theia/plugin';
-
-export const createRunProfile = (
-    label: string,
-    kind: theia.TestRunProfileKind,
-    runHandler: (
-        request: theia.TestRunRequest,
-        token: CancellationToken
-    ) => Thenable<void> | void,
-    isDefault?: boolean,
-    tag?: theia.TestTag,
-    supportsContinuousRun?: boolean
-) => ({
-    label,
-    kind,
-    isDefault: isDefault ?? false,
-    tag,
-    supportsContinuousRun: supportsContinuousRun ?? false,
-    runHandler,
-    configureHandler: undefined,
-    dispose: () => undefined,
-});
-
-export const createTestRun = (
-    request: theia.TestRunRequest,
-    name?: string,
-    persist?: boolean
-): theia.TestRun => ({
-    name,
-    token: CancellationToken.None,
-    isPersisted: false,
-    enqueued: (test: theia.TestItem) => undefined,
-    started: (test: theia.TestItem) => undefined,
-    skipped: (test: theia.TestItem) => undefined,
-    failed: (
-        test: theia.TestItem,
-        message: theia.TestMessage | readonly theia.TestMessage[],
-        duration?: number
-    ) => undefined,
-    errored: (
-        test: theia.TestItem,
-        message: theia.TestMessage | readonly theia.TestMessage[],
-        duration?: number
-    ) => undefined,
-    passed: (test: theia.TestItem, duration?: number) => undefined,
-    appendOutput: (
-        output: string,
-        location?: theia.Location,
-        test?: theia.TestItem
-    ) => undefined,
-    end: () => undefined,
-});
-
-export const testItemCollection = {
-    add: () => { },
-    delete: () => { },
-    forEach: () => { },
-    *[Symbol.iterator]() { },
-    get: () => undefined,
-    replace: () => { },
-    size: 0,
-};
-
-export const createTestItem = (
-    id: string,
-    label: string,
-    uri?: theia.Uri
-): theia.TestItem => ({
-    id,
-    label,
-    uri,
-    children: testItemCollection,
-    parent: undefined,
-    tags: [],
-    canResolveChildren: false,
-    busy: false,
-    range: undefined,
-    error: undefined,
-});
-
-export const invalidateTestResults = (
-    items?: theia.TestItem | readonly theia.TestItem[]
-): void => undefined;