@codingame/monaco-vscode-api 9.0.3 → 10.0.0

package/vscode/src/vs/workbench/contrib/testing/common/testItemCollection.js

@@ -2,18 +2,8 @@ import { RunOnceScheduler, Barrier, isThenable } from '../../../../base/common/a
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { assertNever } from '../../../../base/common/assert.js';
-import { TestDiffOpType, applyTestItemUpdate, TestItemExpandState, namespaceTestTag } from './testTypes.js';
+import { applyTestItemUpdate, namespaceTestTag } from './testTypes.js';
 import { TestId } from './testId.js';
-var TestItemEventOp;
-( (function(TestItemEventOp) {
-    TestItemEventOp[TestItemEventOp["Upsert"] = 0] = "Upsert";
-    TestItemEventOp[TestItemEventOp["SetTags"] = 1] = "SetTags";
-    TestItemEventOp[TestItemEventOp["UpdateCanResolveChildren"] = 2] = "UpdateCanResolveChildren";
-    TestItemEventOp[TestItemEventOp["RemoveChild"] = 3] = "RemoveChild";
-    TestItemEventOp[TestItemEventOp["SetProp"] = 4] = "SetProp";
-    TestItemEventOp[TestItemEventOp["Bulk"] = 5] = "Bulk";
-    TestItemEventOp[TestItemEventOp["DocumentSynced"] = 6] = "DocumentSynced";
-})(TestItemEventOp || (TestItemEventOp = {})));
 const strictEqualComparator = (a, b) => a === b;
 const diffableProps = {
     range: (a, b) => {
@@ -87,23 +77,23 @@ class TestItemCollection extends Disposable {
     }
     pushDiff(diff) {
         switch (diff.op) {
-            case TestDiffOpType.DocumentSynced: {
+            case 2 : {
                 for (const existing of this.diff) {
-                    if (existing.op === TestDiffOpType.DocumentSynced && existing.uri === diff.uri) {
+                    if (existing.op === 2  && existing.uri === diff.uri) {
                         existing.docv = diff.docv;
                         return;
                     }
                 }
                 break;
             }
-            case TestDiffOpType.Update: {
+            case 1 : {
                 const last = this.diff[this.diff.length - 1];
                 if (last) {
-                    if (last.op === TestDiffOpType.Update && last.item.extId === diff.item.extId) {
+                    if (last.op === 1  && last.item.extId === diff.item.extId) {
                         applyTestItemUpdate(last.item, diff.item);
                         return;
                     }
-                    if (last.op === TestDiffOpType.Add && last.item.item.extId === diff.item.extId) {
+                    if (last.op === 0  && last.item.item.extId === diff.item.extId) {
                         applyTestItemUpdate(last.item, diff.item);
                         return;
                     }
@@ -124,13 +114,13 @@ class TestItemCollection extends Disposable {
         if (internal.expandLevels === undefined || levels > internal.expandLevels) {
             internal.expandLevels = levels;
         }
-        if (internal.expand === TestItemExpandState.Expandable) {
+        if (internal.expand === 1 ) {
             const r = this.resolveChildren(internal);
             return !r.isOpen()
                 ? r.wait().then(() => this.expandChildren(internal, levels - 1))
                 : this.expandChildren(internal, levels - 1);
         }
-        else if (internal.expand === TestItemExpandState.Expanded) {
+        else if (internal.expand === 3 ) {
             return internal.resolveBarrier?.isOpen() === false
                 ? internal.resolveBarrier.wait().then(() => this.expandChildren(internal, levels - 1))
                 : this.expandChildren(internal, levels - 1);
@@ -146,33 +136,33 @@ class TestItemCollection extends Disposable {
     }
     onTestItemEvent(internal, evt) {
         switch (evt.op) {
-            case TestItemEventOp.RemoveChild:
+            case 3 :
                 this.removeItem(TestId.joinToString(internal.fullId, evt.id));
                 break;
-            case TestItemEventOp.Upsert:
+            case 0 :
                 this.upsertItem(evt.item, internal);
                 break;
-            case TestItemEventOp.Bulk:
+            case 5 :
                 for (const op of evt.ops) {
                     this.onTestItemEvent(internal, op);
                 }
                 break;
-            case TestItemEventOp.SetTags:
+            case 1 :
                 this.diffTagRefs(evt.new, evt.old, ( internal.fullId.toString()));
                 break;
-            case TestItemEventOp.UpdateCanResolveChildren:
+            case 2 :
                 this.updateExpandability(internal);
                 break;
-            case TestItemEventOp.SetProp:
+            case 4 :
                 this.pushDiff({
-                    op: TestDiffOpType.Update,
+                    op: 1 ,
                     item: {
                         extId: ( internal.fullId.toString()),
                         item: evt.update,
                     }
                 });
                 break;
-            case TestItemEventOp.DocumentSynced:
+            case 6 :
                 this.documentSynced(internal.actual.uri);
                 break;
             default:
@@ -182,7 +172,7 @@ class TestItemCollection extends Disposable {
     documentSynced(uri) {
         if (uri) {
             this.pushDiff({
-                op: TestDiffOpType.DocumentSynced,
+                op: 2 ,
                 uri,
                 docv: this.options.getDocumentVersion(uri)
             });
@@ -200,13 +190,13 @@ class TestItemCollection extends Disposable {
                 fullId,
                 actual,
                 expandLevels: parent?.expandLevels  ? parent.expandLevels - 1 : undefined,
-                expand: TestItemExpandState.NotExpandable,
+                expand: 0 ,
             };
             actual.tags.forEach(this.incrementTagRefs, this);
             this.tree.set(( internal.fullId.toString()), internal);
             this.setItemParent(actual, parent);
             this.pushDiff({
-                op: TestDiffOpType.Add,
+                op: 0 ,
                 item: {
                     controllerId: this.options.controllerId,
                     expand: internal.expand,
@@ -230,13 +220,13 @@ class TestItemCollection extends Disposable {
         this.options.getApiFor(oldActual).listener = undefined;
         internal.actual = actual;
         internal.resolveBarrier = undefined;
-        internal.expand = TestItemExpandState.NotExpandable;
+        internal.expand = 0 ;
         if (update) {
             if (update.hasOwnProperty('tags')) {
                 this.diffTagRefs(actual.tags, oldActual.tags, ( fullId.toString()));
                 delete update.tags;
             }
-            this.onTestItemEvent(internal, { op: TestItemEventOp.SetProp, update });
+            this.onTestItemEvent(internal, { op: 4 , update });
         }
         this.connectItemAndChildren(actual, internal, parent);
         for (const [_, child] of oldChildren) {
@@ -247,7 +237,7 @@ class TestItemCollection extends Disposable {
         const expandLevels = internal.expandLevels;
         if (expandLevels !== undefined) {
             queueMicrotask(() => {
-                if (internal.expand === TestItemExpandState.Expandable) {
+                if (internal.expand === 1 ) {
                     internal.expandLevels = undefined;
                     this.expand(( fullId.toString()), expandLevels);
                 }
@@ -263,7 +253,7 @@ class TestItemCollection extends Disposable {
             }
         }
         this.pushDiff({
-            op: TestDiffOpType.Update,
+            op: 1 ,
             item: { extId, item: { tags: ( newTags.map(v => namespaceTestTag(this.options.controllerId, v.id))) } }
         });
         toDelete.forEach(this.decrementTagRefs, this);
@@ -276,7 +266,7 @@ class TestItemCollection extends Disposable {
         else {
             this.tags.set(tag.id, { refCount: 1 });
             this.pushDiff({
-                op: TestDiffOpType.AddTag, tag: {
+                op: 6 , tag: {
                     id: namespaceTestTag(this.options.controllerId, tag.id),
                 }
             });
@@ -286,7 +276,7 @@ class TestItemCollection extends Disposable {
         const existing = this.tags.get(tagId);
         if (existing && !--existing.refCount) {
             this.tags.delete(tagId);
-            this.pushDiff({ op: TestDiffOpType.RemoveTag, id: namespaceTestTag(this.options.controllerId, tagId) });
+            this.pushDiff({ op: 7 , id: namespaceTestTag(this.options.controllerId, tagId) });
         }
     }
     setItemParent(actual, parent) {
@@ -308,24 +298,24 @@ class TestItemCollection extends Disposable {
     updateExpandability(internal) {
         let newState;
         if (!this._resolveHandler) {
-            newState = TestItemExpandState.NotExpandable;
+            newState = 0 ;
         }
         else if (internal.resolveBarrier) {
             newState = internal.resolveBarrier.isOpen()
-                ? TestItemExpandState.Expanded
-                : TestItemExpandState.BusyExpanding;
+                ? 3
+                : 2 ;
         }
         else {
             newState = internal.actual.canResolveChildren
-                ? TestItemExpandState.Expandable
-                : TestItemExpandState.NotExpandable;
+                ? 1
+                : 0 ;
         }
         if (newState === internal.expand) {
             return;
         }
         internal.expand = newState;
-        this.pushDiff({ op: TestDiffOpType.Update, item: { extId: ( internal.fullId.toString()), expand: newState } });
-        if (newState === TestItemExpandState.Expandable && internal.expandLevels !== undefined) {
+        this.pushDiff({ op: 1 , item: { extId: ( internal.fullId.toString()), expand: newState } });
+        if (newState === 1  && internal.expandLevels !== undefined) {
             this.resolveChildren(internal);
         }
     }
@@ -353,7 +343,7 @@ class TestItemCollection extends Disposable {
             b.open();
             return b;
         }
-        internal.expand = TestItemExpandState.BusyExpanding;
+        internal.expand = 2 ;
         this.pushExpandStateUpdate(internal);
         const barrier = internal.resolveBarrier = ( new Barrier());
         const applyError = (err) => {
@@ -379,14 +369,14 @@ class TestItemCollection extends Disposable {
         return internal.resolveBarrier;
     }
     pushExpandStateUpdate(internal) {
-        this.pushDiff({ op: TestDiffOpType.Update, item: { extId: ( internal.fullId.toString()), expand: internal.expand } });
+        this.pushDiff({ op: 1 , item: { extId: ( internal.fullId.toString()), expand: internal.expand } });
     }
     removeItem(childId) {
         const childItem = this.tree.get(childId);
         if (!childItem) {
             throw ( new Error('attempting to remove non-existent child'));
         }
-        this.pushDiff({ op: TestDiffOpType.Remove, itemId: childId });
+        this.pushDiff({ op: 3 , itemId: childId });
         const queue = [childItem];
         while (queue.length) {
             const item = queue.pop();
@@ -442,7 +432,7 @@ const createTestItemChildren = (api, getApi, checkCtor) => {
         replace(items) {
             const newMapped = ( new Map());
             const toDelete = ( new Set(( mapped.keys())));
-            const bulk = { op: TestItemEventOp.Bulk, ops: [] };
+            const bulk = { op: 5 , ops: [] };
             for (const item of items) {
                 if (!(item instanceof checkCtor)) {
                     throw ( new InvalidTestItemError(item.id));
@@ -456,10 +446,10 @@ const createTestItemChildren = (api, getApi, checkCtor) => {
                 }
                 newMapped.set(item.id, item);
                 toDelete.delete(item.id);
-                bulk.ops.push({ op: TestItemEventOp.Upsert, item });
+                bulk.ops.push({ op: 0 , item });
             }
             for (const id of ( toDelete.keys())) {
-                bulk.ops.push({ op: TestItemEventOp.RemoveChild, id });
+                bulk.ops.push({ op: 3 , id });
             }
             api.listener?.(bulk);
             mapped = newMapped;
@@ -469,11 +459,11 @@ const createTestItemChildren = (api, getApi, checkCtor) => {
                 throw ( new InvalidTestItemError(item.id));
             }
             mapped.set(item.id, item);
-            api.listener?.({ op: TestItemEventOp.Upsert, item });
+            api.listener?.({ op: 0 , item });
         },
         delete(id) {
             if (mapped.delete(id)) {
-                api.listener?.({ op: TestItemEventOp.RemoveChild, id });
+                api.listener?.({ op: 3 , id });
             }
         },
         get(itemId) {
@@ -484,4 +474,4 @@ const createTestItemChildren = (api, getApi, checkCtor) => {
         },
     };
 };
-export { DuplicateTestItemError, InvalidTestItemError, MixedTestItemController, TestItemCollection, TestItemEventOp, createTestItemChildren };
+export { DuplicateTestItemError, InvalidTestItemError, MixedTestItemController, TestItemCollection, createTestItemChildren };

package/vscode/src/vs/workbench/contrib/testing/common/testResult.js

@@ -5,18 +5,18 @@ import { Event, Emitter } from '../../../../base/common/event.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
-import '../../../../base/common/arrays.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { language } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { refreshComputedState } from './getComputedState.js';
 import { TestId } from './testId.js';
 import { makeEmptyCounts, terminalStatePriorities, maxPriority, statesInOrder } from './testingStates.js';
-import { TestResultItem, TestResultState, getMarkId, TestMessageType, TestItemExpandState } from './testTypes.js';
+import { TestResultItem, getMarkId } from './testTypes.js';
 const emptyRawOutput = {
     buffers: [],
     length: 0,
@@ -71,11 +71,6 @@ class TaskRawOutput {
             this.push(data);
             return { offset, length };
         }
-        let TrimBytes;
-        ( ((function(TrimBytes) {
-            TrimBytes[TrimBytes["CR"] = 13] = "CR";
-            TrimBytes[TrimBytes["LF"] = 10] = "LF";
-        })(TrimBytes || (TrimBytes = {}))));
         const start = VSBuffer.fromString(getMarkCode(marker, true));
         const end = VSBuffer.fromString(getMarkCode(marker, false));
         length += start.byteLength + end.byteLength;
@@ -83,7 +78,7 @@ class TaskRawOutput {
         let trimLen = data.byteLength;
         for (; trimLen > 0; trimLen--) {
             const last = data.buffer[trimLen - 1];
-            if (last !== TrimBytes.CR && last !== TrimBytes.LF) {
+            if (last !== 13  && last !== 10 ) {
                 break;
             }
         }
@@ -115,24 +110,18 @@ const maxCountPriority = (counts) => {
             return state;
         }
     }
-    return TestResultState.Unset;
+    return 0 ;
 };
 const getMarkCode = (marker, start) => `\x1b]633;SetMark;Id=${getMarkId(marker, start)};Hidden\x07`;
 const itemToNode = (controllerId, item, parent) => ({
     controllerId,
-    expand: TestItemExpandState.NotExpandable,
+    expand: 0 ,
     item: { ...item },
     children: [],
     tasks: [],
-    ownComputedState: TestResultState.Unset,
-    computedState: TestResultState.Unset,
+    ownComputedState: 0 ,
+    computedState: 0 ,
 });
-var TestResultItemChangeReason;
-( ((function(TestResultItemChangeReason) {
-    TestResultItemChangeReason[TestResultItemChangeReason["ComputedStateChange"] = 0] = "ComputedStateChange";
-    TestResultItemChangeReason[TestResultItemChangeReason["OwnStateChange"] = 1] = "OwnStateChange";
-    TestResultItemChangeReason[TestResultItemChangeReason["NewMessage"] = 2] = "NewMessage";
-})(TestResultItemChangeReason || (TestResultItemChangeReason = {}))));
 let LiveTestResult = class LiveTestResult extends Disposable {
     get completedAt() {
         return this._completedAt;
@@ -164,7 +153,7 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         this.onEndTask = this.endTaskEmitter.event;
         this.tasks = [];
         this.name = ( localize(
-            8112,
+            8177,
             'Test run at {0}',
             ( (new Date())).toLocaleString(language)
         ));
@@ -225,12 +214,12 @@ let LiveTestResult = class LiveTestResult extends Disposable {
             offset,
             length,
             marker,
-            type: TestMessageType.Output,
+            type: 1 ,
         };
         const test = testId && this.testById.get(testId);
         if (test) {
             test.tasks[index].messages.push(message);
-            this.changeEmitter.fire({ item: test, result: this, reason: TestResultItemChangeReason.NewMessage, message });
+            this.changeEmitter.fire({ item: test, result: this, reason: 2 , message });
         }
         else {
             task.otherMessages.push(message);
@@ -239,7 +228,7 @@ let LiveTestResult = class LiveTestResult extends Disposable {
     addTask(task) {
         this.tasks.push({ ...task, coverage: observableValue(this, undefined), otherMessages: [], output: ( (new TaskRawOutput())) });
         for (const test of this.tests) {
-            test.tasks.push({ duration: undefined, messages: [], state: TestResultState.Unset });
+            test.tasks.push({ duration: undefined, messages: [], state: 0  });
         }
         this.newTaskEmitter.fire(this.tasks.length - 1);
     }
@@ -273,14 +262,14 @@ let LiveTestResult = class LiveTestResult extends Disposable {
             return;
         }
         entry.tasks[this.mustGetTaskIndex(taskId)].messages.push(message);
-        this.changeEmitter.fire({ item: entry, result: this, reason: TestResultItemChangeReason.NewMessage, message });
+        this.changeEmitter.fire({ item: entry, result: this, reason: 2 , message });
     }
     markTaskComplete(taskId) {
         const index = this.mustGetTaskIndex(taskId);
         const task = this.tasks[index];
         task.running = false;
         task.output.end();
-        this.setAllToState(TestResultState.Unset, taskId, t => t.state === TestResultState.Queued || t.state === TestResultState.Running);
+        this.setAllToState(0 , taskId, t => t.state === 1  || t.state === 2 );
         this.endTaskEmitter.fire(index);
     }
     markComplete() {
@@ -295,8 +284,8 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         this._completedAt = Date.now();
         this.completeEmitter.fire();
         this.telemetry.publicLog2('test.outcomes', {
-            failures: this.counts[TestResultState.Errored] + this.counts[TestResultState.Failed],
-            passes: this.counts[TestResultState.Passed],
+            failures: this.counts[6 ] + this.counts[4 ],
+            passes: this.counts[3 ],
             controller: ( (this.request.targets.map(t => t.controllerId))).join(',')
         });
     }
@@ -304,7 +293,7 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         for (const [id, test] of this.testById) {
             if (!test.retired && (!testIds || testIds.hasKeyOrParent(TestId.fromString(id).path))) {
                 test.retired = true;
-                this.changeEmitter.fire({ reason: TestResultItemChangeReason.ComputedStateChange, item: test, result: this });
+                this.changeEmitter.fire({ reason: 0 , item: test, result: this });
             }
         }
     }
@@ -328,7 +317,7 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         const changeEvent = {
             item: entry,
             result: this,
-            reason: TestResultItemChangeReason.OwnStateChange,
+            reason: 1 ,
             previousState: previousOwnComputed,
             previousOwnDuration: previousOwnDuration,
         };
@@ -350,19 +339,19 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         refreshComputedState(this.computedStateAccessor, entry).forEach(t => this.changeEmitter.fire(t === entry ? changeEvent : {
             item: t,
             result: this,
-            reason: TestResultItemChangeReason.ComputedStateChange,
+            reason: 0 ,
         }));
     }
     addTestToRun(controllerId, item, parent) {
         const node = itemToNode(controllerId, item);
         this.testById.set(item.extId, node);
-        this.counts[TestResultState.Unset]++;
+        this.counts[0 ]++;
         if (parent) {
             this.testById.get(parent)?.children.push(node);
         }
         if (this.tasks.length) {
             for (let i = 0; i < this.tasks.length; i++) {
-                node.tasks.push({ duration: undefined, messages: [], state: TestResultState.Unset });
+                node.tasks.push({ duration: undefined, messages: [], state: 0  });
             }
         }
         return node;
@@ -393,7 +382,7 @@ class HydratedTestResult {
         this.completedAt = serialized.completedAt;
         this.tasks = ( (serialized.tasks.map((task, i) => ({
             id: task.id,
-            name: task.name || ( localize(8113, 'Unnamed Task')),
+            name: task.name || ( localize(8178, 'Unnamed Task')),
             ctrlId: task.ctrlId,
             running: false,
             coverage: observableValue(this, undefined),
@@ -418,4 +407,4 @@ class HydratedTestResult {
         return this.toJSON();
     }
 }
-export { HydratedTestResult, LiveTestResult, TaskRawOutput, TestResultItemChangeReason, maxCountPriority, resultItemParents };
+export { HydratedTestResult, LiveTestResult, TaskRawOutput, maxCountPriority, resultItemParents };