@codingame/monaco-vscode-testing-service-override 3.2.3 → 4.1.0

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/index.js

@@ -1,83 +0,0 @@
-import { ObjectTreeElementCollapseState } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
-import { isCollapsedInSerializedTestTree } from './testingViewState.js';
-import { InternalTestItem } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
-
-let idCounter = 0;
-const getId = () => String(idCounter++);
-class TestItemTreeElement {
-    constructor(test,
-    parent = null) {
-        this.test = test;
-        this.parent = parent;
-        this.changeEmitter = ( new Emitter());
-        this.onChange = this.changeEmitter.event;
-        this.children = ( new Set());
-        this.treeId = getId();
-        this.depth = this.parent ? this.parent.depth + 1 : 0;
-        this.retired = false;
-        this.state = 0 ;
-    }
-    toJSON() {
-        if (this.depth === 0) {
-            return { controllerId: this.test.controllerId };
-        }
-        const context = {
-            $mid: 16 ,
-            tests: [InternalTestItem.serialize(this.test)],
-        };
-        for (let p = this.parent; p && p.depth > 0; p = p.parent) {
-            context.tests.unshift(InternalTestItem.serialize(p.test));
-        }
-        return context;
-    }
-}
-class TestTreeErrorMessage {
-    get description() {
-        return typeof this.message === 'string' ? this.message : this.message.value;
-    }
-    constructor(message, parent) {
-        this.message = message;
-        this.parent = parent;
-        this.treeId = getId();
-        this.children = ( new Set());
-    }
-}
-const testIdentityProvider = {
-    getId(element) {
-        const expandComponent = element instanceof TestTreeErrorMessage
-            ? 'error'
-            : element.test.expand === 0
-                ? !!element.children.size
-                : element.test.expand;
-        return element.treeId + '\0' + expandComponent;
-    }
-};
-const getChildrenForParent = (serialized, rootsWithChildren, node) => {
-    let it;
-    if (node === null) {
-        const rootsWithChildrenArr = [...rootsWithChildren];
-        if (rootsWithChildrenArr.length === 1) {
-            return getChildrenForParent(serialized, rootsWithChildrenArr, rootsWithChildrenArr[0]);
-        }
-        it = rootsWithChildrenArr;
-    }
-    else {
-        it = node.children;
-    }
-    return ( Iterable.map(it, element => (element instanceof TestTreeErrorMessage
-        ? { element }
-        : {
-            element,
-            collapsible: element.test.expand !== 0 ,
-            collapsed: element.test.item.error
-                ? ObjectTreeElementCollapseState.PreserveOrExpanded
-                : (isCollapsedInSerializedTestTree(serialized, element.test.item.extId) ?? element.depth > 0
-                    ? ObjectTreeElementCollapseState.PreserveOrCollapsed
-                    : ObjectTreeElementCollapseState.PreserveOrExpanded),
-            children: getChildrenForParent(serialized, rootsWithChildren, element),
-        })));
-};
-
-export { TestItemTreeElement, TestTreeErrorMessage, getChildrenForParent, testIdentityProvider };

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.js

@@ -1,186 +0,0 @@
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { flatTestItemDelimiter } from './display.js';
-import { getChildrenForParent, testIdentityProvider, TestItemTreeElement, TestTreeErrorMessage } from './index.js';
-import { isCollapsedInSerializedTestTree } from './testingViewState.js';
-import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
-import { applyTestItemUpdate } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
-
-class ListTestItemElement extends TestItemTreeElement {
-    get description() {
-        return ( this.chain.map(c => c.item.label)).join(flatTestItemDelimiter);
-    }
-    constructor(test, parent, chain) {
-        super({ ...test, item: { ...test.item } }, parent);
-        this.chain = chain;
-        this.descriptionParts = [];
-        this.updateErrorVisibility();
-    }
-    update(patch) {
-        applyTestItemUpdate(this.test, patch);
-        this.updateErrorVisibility(patch);
-        this.fireChange();
-    }
-    fireChange() {
-        this.changeEmitter.fire();
-    }
-    updateErrorVisibility(patch) {
-        if (this.errorChild && (!this.test.item.error || patch?.item?.error)) {
-            this.children.delete(this.errorChild);
-            this.errorChild = undefined;
-        }
-        if (this.test.item.error && !this.errorChild) {
-            this.errorChild = ( new TestTreeErrorMessage(this.test.item.error, this));
-            this.children.add(this.errorChild);
-        }
-    }
-}
-let ListProjection = class ListProjection extends Disposable {
-    get rootsWithChildren() {
-        const rootsIt = ( Iterable.map(this.testService.collection.rootItems, r => this.items.get(r.item.extId)));
-        return Iterable.filter(rootsIt, (r) => !!r?.children.size);
-    }
-    constructor(lastState, testService, results) {
-        super();
-        this.lastState = lastState;
-        this.testService = testService;
-        this.results = results;
-        this.updateEmitter = ( new Emitter());
-        this.items = ( new Map());
-        this.onUpdate = this.updateEmitter.event;
-        this._register(testService.onDidProcessDiff((diff) => this.applyDiff(diff)));
-        this._register(results.onResultsChanged((evt) => {
-            if (!('removed' in evt)) {
-                return;
-            }
-            for (const inTree of ( this.items.values())) {
-                const lookup = this.results.getStateById(inTree.test.item.extId)?.[1];
-                inTree.duration = lookup?.ownDuration;
-                inTree.state = lookup?.ownComputedState || 0 ;
-                inTree.fireChange();
-            }
-        }));
-        this._register(results.onTestChanged(ev => {
-            if (ev.reason === 2 ) {
-                return;
-            }
-            let result = ev.item;
-            if (result.ownComputedState === 0  || ev.result !== results.results[0]) {
-                const fallback = results.getStateById(result.item.extId);
-                if (fallback) {
-                    result = fallback[1];
-                }
-            }
-            const item = this.items.get(result.item.extId);
-            if (!item) {
-                return;
-            }
-            item.retired = !!result.retired;
-            item.state = result.computedState;
-            item.duration = result.ownDuration;
-            item.fireChange();
-        }));
-        for (const test of testService.collection.all) {
-            this.storeItem(test);
-        }
-    }
-    getElementByTestId(testId) {
-        return this.items.get(testId);
-    }
-    applyDiff(diff) {
-        for (const op of diff) {
-            switch (op.op) {
-                case 0 : {
-                    this.storeItem(op.item);
-                    break;
-                }
-                case 1 : {
-                    this.items.get(op.item.extId)?.update(op.item);
-                    break;
-                }
-                case 3 : {
-                    for (const [id, item] of this.items) {
-                        if (id === op.itemId || TestId.isChild(op.itemId, id)) {
-                            this.unstoreItem(item);
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-        if (diff.length !== 0) {
-            this.updateEmitter.fire();
-        }
-    }
-    applyTo(tree) {
-        tree.setChildren(null, getChildrenForParent(this.lastState, this.rootsWithChildren, null), {
-            diffIdentityProvider: testIdentityProvider,
-            diffDepth: Infinity
-        });
-    }
-    expandElement(element, depth) {
-        if (!(element instanceof ListTestItemElement)) {
-            return;
-        }
-        if (element.test.expand === 0 ) {
-            return;
-        }
-        this.testService.collection.expand(element.test.item.extId, depth);
-    }
-    unstoreItem(treeElement) {
-        this.items.delete(treeElement.test.item.extId);
-        treeElement.parent?.children.delete(treeElement);
-        const parentId = TestId.fromString(treeElement.test.item.extId).parentId;
-        if (!parentId) {
-            return;
-        }
-        for (const id of parentId.idsToRoot()) {
-            const parentTest = this.testService.collection.getNodeById(( id.toString()));
-            if (parentTest) {
-                if (parentTest.children.size === 0 && !( this.items.has(( id.toString())))) {
-                    this._storeItem(parentId, parentTest);
-                }
-                break;
-            }
-        }
-    }
-    _storeItem(testId, item) {
-        const displayedParent = testId.isRoot ? null : this.items.get(item.controllerId);
-        const chain = ( [...testId.idsFromRoot()].slice(1, -1).map(id => this.testService.collection.getNodeById(( id.toString()))));
-        const treeElement = ( new ListTestItemElement(item, displayedParent, chain));
-        displayedParent?.children.add(treeElement);
-        this.items.set(treeElement.test.item.extId, treeElement);
-        if (treeElement.depth === 0 || isCollapsedInSerializedTestTree(this.lastState, treeElement.test.item.extId) === false) {
-            this.expandElement(treeElement, Infinity);
-        }
-        const prevState = this.results.getStateById(treeElement.test.item.extId)?.[1];
-        if (prevState) {
-            treeElement.retired = !!prevState.retired;
-            treeElement.state = prevState.computedState;
-            treeElement.duration = prevState.ownDuration;
-        }
-    }
-    storeItem(item) {
-        const testId = TestId.fromString(item.item.extId);
-        for (const parentId of testId.idsToRoot()) {
-            if (!parentId.isRoot) {
-                const prevParent = this.items.get(( parentId.toString()));
-                if (prevParent) {
-                    this.unstoreItem(prevParent);
-                    break;
-                }
-            }
-        }
-        this._storeItem(testId, item);
-    }
-};
-ListProjection = ( __decorate([
-    ( __param(1, ITestService)),
-    ( __param(2, ITestResultService))
-], ListProjection));
-
-export { ListProjection };

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay.js

@@ -1,18 +0,0 @@
-import { capabilityContextKeys } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
-import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { TestingContextKeys } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContextKeys';
-
-const getTestItemContextOverlay = (test, capabilities) => {
-    if (!test) {
-        return [];
-    }
-    const testId = TestId.fromString(test.item.extId);
-    return [
-        [TestingContextKeys.testItemExtId.key, testId.localId],
-        [TestingContextKeys.controllerId.key, test.controllerId],
-        [TestingContextKeys.testItemHasUri.key, !!test.item.uri],
-        ...capabilityContextKeys(capabilities),
-    ];
-};
-
-export { getTestItemContextOverlay };

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/testingObjectTree.js

@@ -1,46 +0,0 @@
-import { WorkbenchObjectTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { TestItemTreeElement } from './index.js';
-import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-
-class TestingObjectTree extends WorkbenchObjectTree {
-    getOptimizedViewState(updatePreviousState) {
-        const root = updatePreviousState || {};
-        const build = (node, parent) => {
-            if (!(node.element instanceof TestItemTreeElement)) {
-                return false;
-            }
-            const localId = TestId.localId(node.element.test.item.extId);
-            const inTree = parent.children?.[localId] || {};
-            inTree.collapsed = node.depth === 0 || !node.collapsed ? node.collapsed : undefined;
-            let hasAnyNonDefaultValue = inTree.collapsed !== undefined;
-            if (node.children.length) {
-                for (const child of node.children) {
-                    hasAnyNonDefaultValue = build(child, inTree) || hasAnyNonDefaultValue;
-                }
-            }
-            if (hasAnyNonDefaultValue) {
-                parent.children ??= {};
-                parent.children[localId] = inTree;
-            }
-            else if (parent.children?.hasOwnProperty(localId)) {
-                delete parent.children[localId];
-            }
-            return hasAnyNonDefaultValue;
-        };
-        root.children ??= {};
-        for (const node of this.getNode().children) {
-            if (node.element instanceof TestItemTreeElement) {
-                if (node.element.test.controllerId === node.element.test.item.extId) {
-                    build(node, root);
-                }
-                else {
-                    const ctrlNode = root.children[node.element.test.controllerId] ??= { children: {} };
-                    build(node, ctrlNode);
-                }
-            }
-        }
-        return root;
-    }
-}
-
-export { TestingObjectTree };

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/testingViewState.js

@@ -1,17 +0,0 @@
-import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-
-function isCollapsedInSerializedTestTree(serialized, id) {
-    if (!(id instanceof TestId)) {
-        id = TestId.fromString(id);
-    }
-    let node = serialized;
-    for (const part of id.path) {
-        if (!node.children?.hasOwnProperty(part)) {
-            return undefined;
-        }
-        node = node.children[part];
-    }
-    return node.collapsed;
-}
-
-export { isCollapsedInSerializedTestTree };

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.js

@@ -1,225 +0,0 @@
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { getChildrenForParent, testIdentityProvider, TestItemTreeElement, TestTreeErrorMessage } from './index.js';
-import { isCollapsedInSerializedTestTree } from './testingViewState.js';
-import { refreshComputedState } from 'vscode/vscode/vs/workbench/contrib/testing/common/getComputedState';
-import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
-import { applyTestItemUpdate } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
-
-const computedStateAccessor = {
-    getOwnState: i => i instanceof TestItemTreeElement ? i.ownState : 0 ,
-    getCurrentComputedState: i => i.state,
-    setComputedState: (i, s) => i.state = s,
-    getCurrentComputedDuration: i => i.duration,
-    getOwnDuration: i => i instanceof TestItemTreeElement ? i.ownDuration : undefined,
-    setComputedDuration: (i, d) => i.duration = d,
-    getChildren: i => Iterable.filter(( i.children.values()), (t) => t instanceof TreeTestItemElement),
-    *getParents(i) {
-        for (let parent = i.parent; parent; parent = parent.parent) {
-            yield parent;
-        }
-    },
-};
-class TreeTestItemElement extends TestItemTreeElement {
-    get description() {
-        return this.test.item.description;
-    }
-    constructor(test, parent, addedOrRemoved) {
-        super({ ...test, item: { ...test.item } }, parent);
-        this.addedOrRemoved = addedOrRemoved;
-        this.ownState = 0 ;
-        this.updateErrorVisibility();
-    }
-    update(patch) {
-        applyTestItemUpdate(this.test, patch);
-        this.updateErrorVisibility(patch);
-        this.fireChange();
-    }
-    fireChange() {
-        this.changeEmitter.fire();
-    }
-    updateErrorVisibility(patch) {
-        if (this.errorChild && (!this.test.item.error || patch?.item?.error)) {
-            this.addedOrRemoved(this);
-            this.children.delete(this.errorChild);
-            this.errorChild = undefined;
-        }
-        if (this.test.item.error && !this.errorChild) {
-            this.errorChild = ( new TestTreeErrorMessage(this.test.item.error, this));
-            this.children.add(this.errorChild);
-            this.addedOrRemoved(this);
-        }
-    }
-}
-let TreeProjection = class TreeProjection extends Disposable {
-    get rootsWithChildren() {
-        const rootsIt = ( Iterable.map(this.testService.collection.rootItems, r => this.items.get(r.item.extId)));
-        return Iterable.filter(rootsIt, (r) => !!r?.children.size);
-    }
-    constructor(lastState, testService, results) {
-        super();
-        this.lastState = lastState;
-        this.testService = testService;
-        this.results = results;
-        this.updateEmitter = ( new Emitter());
-        this.changedParents = ( new Set());
-        this.resortedParents = ( new Set());
-        this.items = ( new Map());
-        this.onUpdate = this.updateEmitter.event;
-        this._register(testService.onDidProcessDiff((diff) => this.applyDiff(diff)));
-        this._register(results.onResultsChanged((evt) => {
-            if (!('removed' in evt)) {
-                return;
-            }
-            for (const inTree of [...( this.items.values())].sort((a, b) => b.depth - a.depth)) {
-                const lookup = this.results.getStateById(inTree.test.item.extId)?.[1];
-                inTree.ownDuration = lookup?.ownDuration;
-                refreshComputedState(computedStateAccessor, inTree, lookup?.ownComputedState ?? 0 ).forEach(i => i.fireChange());
-            }
-        }));
-        this._register(results.onTestChanged(ev => {
-            if (ev.reason === 2 ) {
-                return;
-            }
-            let result = ev.item;
-            if (result.ownComputedState === 0  || ev.result !== results.results[0]) {
-                const fallback = results.getStateById(result.item.extId);
-                if (fallback) {
-                    result = fallback[1];
-                }
-            }
-            const item = this.items.get(result.item.extId);
-            if (!item) {
-                return;
-            }
-            const refreshDuration = ev.reason === 1  && ev.previousOwnDuration !== result.ownDuration;
-            const explicitComputed = item.children.size ? undefined : result.computedState;
-            item.retired = !!result.retired;
-            item.ownState = result.ownComputedState;
-            item.ownDuration = result.ownDuration;
-            item.fireChange();
-            refreshComputedState(computedStateAccessor, item, explicitComputed, refreshDuration).forEach(i => i.fireChange());
-        }));
-        for (const test of testService.collection.all) {
-            this.storeItem(this.createItem(test));
-        }
-    }
-    getElementByTestId(testId) {
-        return this.items.get(testId);
-    }
-    applyDiff(diff) {
-        for (const op of diff) {
-            switch (op.op) {
-                case 0 : {
-                    const item = this.createItem(op.item);
-                    this.storeItem(item);
-                    break;
-                }
-                case 1 : {
-                    const patch = op.item;
-                    const existing = this.items.get(patch.extId);
-                    if (!existing) {
-                        break;
-                    }
-                    const needsParentUpdate = existing.test.expand === 0  && patch.expand;
-                    existing.update(patch);
-                    if (needsParentUpdate) {
-                        this.changedParents.add(existing.parent);
-                    }
-                    else {
-                        this.resortedParents.add(existing.parent);
-                    }
-                    break;
-                }
-                case 3 : {
-                    const toRemove = this.items.get(op.itemId);
-                    if (!toRemove) {
-                        break;
-                    }
-                    const parent = toRemove.parent;
-                    const affectsRootElement = toRemove.depth === 1 && parent?.children.size === 1;
-                    this.changedParents.add(affectsRootElement ? null : parent);
-                    const queue = [[toRemove]];
-                    while (queue.length) {
-                        for (const item of queue.pop()) {
-                            if (item instanceof TreeTestItemElement) {
-                                queue.push(this.unstoreItem(item));
-                            }
-                        }
-                    }
-                    if (parent instanceof TreeTestItemElement) {
-                        refreshComputedState(computedStateAccessor, parent, undefined, !!parent.duration).forEach(i => i.fireChange());
-                    }
-                }
-            }
-        }
-        if (diff.length !== 0) {
-            this.updateEmitter.fire();
-        }
-    }
-    applyTo(tree) {
-        for (const s of [this.changedParents, this.resortedParents]) {
-            for (const element of s) {
-                if (element && !tree.hasElement(element)) {
-                    s.delete(element);
-                }
-            }
-        }
-        for (const parent of this.changedParents) {
-            tree.setChildren(parent, getChildrenForParent(this.lastState, this.rootsWithChildren, parent), { diffIdentityProvider: testIdentityProvider });
-        }
-        for (const parent of this.resortedParents) {
-            tree.resort(parent, false);
-        }
-    }
-    expandElement(element, depth) {
-        if (!(element instanceof TreeTestItemElement)) {
-            return;
-        }
-        if (element.test.expand === 0 ) {
-            return;
-        }
-        this.testService.collection.expand(element.test.item.extId, depth);
-    }
-    createItem(item) {
-        const parentId = TestId.parentId(item.item.extId);
-        const parent = parentId ? this.items.get(parentId) : null;
-        return ( new TreeTestItemElement(item, parent, n => this.changedParents.add(n)));
-    }
-    unstoreItem(treeElement) {
-        const parent = treeElement.parent;
-        parent?.children.delete(treeElement);
-        this.items.delete(treeElement.test.item.extId);
-        return treeElement.children;
-    }
-    storeItem(treeElement) {
-        treeElement.parent?.children.add(treeElement);
-        this.items.set(treeElement.test.item.extId, treeElement);
-        const affectsParent = treeElement.parent?.children.size === 1;
-        const affectedParent = affectsParent ? treeElement.parent.parent : treeElement.parent;
-        this.changedParents.add(affectedParent);
-        if (affectedParent?.depth === 0) {
-            this.changedParents.add(null);
-        }
-        if (treeElement.depth === 0 || isCollapsedInSerializedTestTree(this.lastState, treeElement.test.item.extId) === false) {
-            this.expandElement(treeElement, 0);
-        }
-        const prevState = this.results.getStateById(treeElement.test.item.extId)?.[1];
-        if (prevState) {
-            treeElement.retired = !!prevState.retired;
-            treeElement.ownState = prevState.computedState;
-            treeElement.ownDuration = prevState.ownDuration;
-            refreshComputedState(computedStateAccessor, treeElement, undefined, !!treeElement.ownDuration).forEach(i => i.fireChange());
-        }
-    }
-};
-TreeProjection = ( __decorate([
-    ( __param(1, ITestService)),
-    ( __param(2, ITestResultService))
-], TreeProjection));
-
-export { TreeProjection };