@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/api/common/extHostSCM.js

@@ -3,12 +3,13 @@ import { URI } from '../../../base/common/uri.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { debounce } from '../../../base/common/decorators.js';
 import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { asPromise } from '../../../base/common/async.js';
+import { asPromise, Sequencer } from '../../../base/common/async.js';
 import { MainContext } from './extHost.protocol.js';
-import { equals, sortedDiff } from '../../../base/common/arrays.js';
+import { sortedDiff, equals } from '../../../base/common/arrays.js';
 import { comparePaths } from '../../../base/common/comparers.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { MarkdownString } from './extHostTypeConverters.js';
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
@@ -222,7 +223,7 @@ class ExtHostSCMInputBox {
     }
     set value(value) {
         value = value ?? '';
-        this.#proxy.$setInputBoxValue(this._sourceControlHandle, value);
+        this._sequencer.queue(async () => this.#proxy.$setInputBoxValue(this._sourceControlHandle, value));
         this.updateValue(value);
     }
     get onDidChange() {
@@ -232,7 +233,7 @@ class ExtHostSCMInputBox {
         return this._placeholder;
     }
     set placeholder(placeholder) {
-        this.#proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder);
+        this._sequencer.queue(async () => this.#proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder));
         this._placeholder = placeholder;
     }
     get validateInput() {
@@ -247,7 +248,7 @@ class ExtHostSCMInputBox {
             ));
         }
         this._validateInput = fn;
-        this.#proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn);
+        this._sequencer.queue(async () => this.#proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn));
     }
     get enabled() {
         return this._enabled;
@@ -258,7 +259,7 @@ class ExtHostSCMInputBox {
             return;
         }
         this._enabled = enabled;
-        this.#proxy.$setInputBoxEnablement(this._sourceControlHandle, enabled);
+        this._sequencer.queue(async () => this.#proxy.$setInputBoxEnablement(this._sourceControlHandle, enabled));
     }
     get visible() {
         return this._visible;
@@ -269,14 +270,15 @@ class ExtHostSCMInputBox {
             return;
         }
         this._visible = visible;
-        this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible);
+        this._sequencer.queue(async () => this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible));
     }
     get document() {
         checkProposedApiEnabled(this._extension, 'scmTextDocument');
         return this.#extHostDocuments.getDocument(this._documentUri);
     }
-    constructor(_extension, _extHostDocuments, proxy, _sourceControlHandle, _documentUri) {
+    constructor(_extension, _extHostDocuments, proxy, _sequencer, _sourceControlHandle, _documentUri) {
         this._extension = _extension;
+        this._sequencer = _sequencer;
         this._sourceControlHandle = _sourceControlHandle;
         this._documentUri = _documentUri;
         this._value = '';
@@ -289,7 +291,7 @@ class ExtHostSCMInputBox {
     }
     showValidationMessage(message, type) {
         checkProposedApiEnabled(this._extension, 'scmValidation');
-        this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type);
+        this._sequencer.queue(async () => this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type));
     }
     $onInputBoxValueChange(value) {
         this.updateValue(value);
@@ -306,12 +308,12 @@ class ExtHostSourceControlResourceGroup {
     get label() { return this._label; }
     set label(label) {
         this._label = label;
-        this._proxy.$updateGroupLabel(this._sourceControlHandle, this.handle, label);
+        this._sequencer.queue(async () => this._proxy.$updateGroupLabel(this._sourceControlHandle, this.handle, label));
     }
     get hideWhenEmpty() { return this._hideWhenEmpty; }
     set hideWhenEmpty(hideWhenEmpty) {
         this._hideWhenEmpty = hideWhenEmpty;
-        this._proxy.$updateGroup(this._sourceControlHandle, this.handle, this.features);
+        this._sequencer.queue(async () => this._proxy.$updateGroup(this._sourceControlHandle, this.handle, this.features));
     }
     get features() {
         return {
@@ -323,9 +325,10 @@ class ExtHostSourceControlResourceGroup {
         this._resourceStates = [...resources];
         this._onDidUpdateResourceStates.fire();
     }
-    constructor(_proxy, _commands, _sourceControlHandle, _id, _label, multiDiffEditorEnableViewChanges, _extension) {
+    constructor(_proxy, _commands, _sequencer, _sourceControlHandle, _id, _label, multiDiffEditorEnableViewChanges, _extension) {
         this._proxy = _proxy;
         this._commands = _commands;
+        this._sequencer = _sequencer;
         this._sourceControlHandle = _sourceControlHandle;
         this._id = _id;
         this._label = _label;
@@ -433,7 +436,7 @@ class ExtHostSourceControl {
             return;
         }
         this._count = count;
-        this.#proxy.$updateSourceControl(this.handle, { count });
+        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { count }));
     }
     get quickDiffProvider() {
         return this._quickDiffProvider;
@@ -444,7 +447,7 @@ class ExtHostSourceControl {
         if (isProposedApiEnabled(this._extension, 'quickDiffProvider')) {
             quickDiffLabel = quickDiffProvider?.label;
         }
-        this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider, quickDiffLabel });
+        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider, quickDiffLabel }));
     }
     get historyProvider() {
         checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
@@ -454,11 +457,11 @@ class ExtHostSourceControl {
         checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
         this._historyProvider = historyProvider;
         this._historyProviderDisposable.value = ( new DisposableStore());
-        this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider });
+        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider }));
         if (historyProvider) {
             this._historyProviderDisposable.value.add(historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
                 this._historyProviderCurrentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
-                this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup);
+                this._sequencer.queue(async () => this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup));
             }));
         }
     }
@@ -470,7 +473,7 @@ class ExtHostSourceControl {
             return;
         }
         this._commitTemplate = commitTemplate;
-        this.#proxy.$updateSourceControl(this.handle, { commitTemplate });
+        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { commitTemplate }));
     }
     get acceptInputCommand() {
         return this._acceptInputCommand;
@@ -479,7 +482,7 @@ class ExtHostSourceControl {
         this._acceptInputDisposables.value = ( new DisposableStore());
         this._acceptInputCommand = acceptInputCommand;
         const internal = this._commands.converter.toInternal(acceptInputCommand, this._acceptInputDisposables.value);
-        this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal });
+        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal }));
     }
     get actionButton() {
         checkProposedApiEnabled(this._extension, 'scmActionButton');
@@ -500,7 +503,7 @@ class ExtHostSourceControl {
                 description: actionButton.description,
                 enabled: actionButton.enabled
             } : undefined;
-        this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null });
+        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null }));
     }
     get statusBarCommands() {
         return this._statusBarCommands;
@@ -514,7 +517,7 @@ class ExtHostSourceControl {
         const internal = ( (statusBarCommands || []).map(
             c => this._commands.converter.toInternal(c, this._statusBarDisposables.value)
         ));
-        this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
+        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal }));
     }
     get selected() {
         return this._selected;
@@ -525,6 +528,7 @@ class ExtHostSourceControl {
         this._id = _id;
         this._label = _label;
         this._rootUri = _rootUri;
+        this._sequencer = ( new Sequencer());
         this._groups = ( new Map());
         this._count = undefined;
         this._quickDiffProvider = undefined;
@@ -547,20 +551,22 @@ class ExtHostSourceControl {
             path: `${_id}/scm${this.handle}/input`,
             query: _rootUri ? `rootUri=${encodeURIComponent(( _rootUri.toString()))}` : undefined
         }));
+        this._sequencer.queue(() => this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri));
         this._inputBox = ( new ExtHostSCMInputBox(
             _extension,
             _extHostDocuments,
             this.#proxy,
+            this._sequencer,
             this.handle,
             inputBoxDocumentUri
         ));
-        this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri);
     }
     createResourceGroup(id, label, options) {
         const multiDiffEditorEnableViewChanges = isProposedApiEnabled(this._extension, 'scmMultiDiffEditor') && options?.multiDiffEditorEnableViewChanges === true;
         const group = ( new ExtHostSourceControlResourceGroup(
             this.#proxy,
             this._commands,
+            this._sequencer,
             this.handle,
             id,
             label,
@@ -585,7 +591,7 @@ class ExtHostSourceControl {
                 this.updatedResourceGroups.delete(group);
                 updateListener.dispose();
                 this._groups.delete(group.handle);
-                this.#proxy.$unregisterGroup(this.handle, group.handle);
+                this._sequencer.queue(async () => this.#proxy.$unregisterGroup(this.handle, group.handle));
             });
             groups.push([group.handle, group.id, group.label, group.features, group.multiDiffEditorEnableViewChanges]);
             const snapshot = group._takeResourceStateSnapshot();
@@ -594,7 +600,7 @@ class ExtHostSourceControl {
             }
             this._groups.set(group.handle, group);
         }
-        this.#proxy.$registerGroups(this.handle, groups, splices);
+        this._sequencer.queue(async () => this.#proxy.$registerGroups(this.handle, groups, splices));
         this.createdResourceGroups.clear();
     }
     eventuallyUpdateResourceStates() {
@@ -607,7 +613,7 @@ class ExtHostSourceControl {
             splices.push([group.handle, snapshot]);
         });
         if (splices.length > 0) {
-            this.#proxy.$spliceResourceStates(this.handle, splices);
+            this._sequencer.queue(async () => this.#proxy.$spliceResourceStates(this.handle, splices));
         }
         this.updatedResourceGroups.clear();
     }
@@ -623,7 +629,7 @@ class ExtHostSourceControl {
         this._actionButtonDisposables.dispose();
         this._statusBarDisposables.dispose();
         this._groups.forEach(group => group.dispose());
-        this.#proxy.$unregisterSourceControl(this.handle);
+        this._sequencer.queue(async () => this.#proxy.$unregisterSourceControl(this.handle));
     }
 }
 ExtHostSourceControl.__decorator = ( __decorate([
@@ -647,7 +653,7 @@ let ExtHostSCM = class ExtHostSCM {
         this._telemetry = ( mainContext.getProxy(MainContext.MainThreadTelemetry));
         _commands.registerArgumentProcessor({
             processArgument: arg => {
-                if (arg && arg.$mid === 3 ) {
+                if (arg && arg.$mid === MarshalledId.ScmResource) {
                     const sourceControl = this._sourceControls.get(arg.sourceControlHandle);
                     if (!sourceControl) {
                         return arg;
@@ -658,14 +664,14 @@ let ExtHostSCM = class ExtHostSCM {
                     }
                     return group.getResourceState(arg.handle);
                 }
-                else if (arg && arg.$mid === 4 ) {
+                else if (arg && arg.$mid === MarshalledId.ScmResourceGroup) {
                     const sourceControl = this._sourceControls.get(arg.sourceControlHandle);
                     if (!sourceControl) {
                         return arg;
                     }
                     return sourceControl.getResourceGroup(arg.groupHandle);
                 }
-                else if (arg && arg.$mid === 5 ) {
+                else if (arg && arg.$mid === MarshalledId.ScmProvider) {
                     const sourceControl = this._sourceControls.get(arg.handle);
                     if (!sourceControl) {
                         return arg;

package/vscode/src/vs/workbench/api/common/extHostSpeech.js

@@ -6,6 +6,7 @@ class ExtHostSpeech {
     constructor(mainContext) {
         this.providers = ( new Map());
         this.sessions = ( new Map());
+        this.synthesizers = ( new Map());
         this.proxy = ( mainContext.getProxy(MainContext.MainThreadSpeech));
     }
     async $createSpeechToTextSession(handle, session, language) {
@@ -16,7 +17,10 @@ class ExtHostSpeech {
         const disposables = ( new DisposableStore());
         const cts = ( new CancellationTokenSource());
         this.sessions.set(session, cts);
-        const speechToTextSession = disposables.add(provider.provideSpeechToTextSession(cts.token, language ? { language } : undefined));
+        const speechToTextSession = await provider.provideSpeechToTextSession(cts.token, language ? { language } : undefined);
+        if (!speechToTextSession) {
+            return;
+        }
         disposables.add(speechToTextSession.onDidChange(e => {
             if (cts.token.isCancellationRequested) {
                 return;
@@ -29,6 +33,35 @@ class ExtHostSpeech {
         this.sessions.get(session)?.dispose(true);
         this.sessions.delete(session);
     }
+    async $createTextToSpeechSession(handle, session, language) {
+        const provider = this.providers.get(handle);
+        if (!provider) {
+            return;
+        }
+        const disposables = ( new DisposableStore());
+        const cts = ( new CancellationTokenSource());
+        this.sessions.set(session, cts);
+        const textToSpeech = await provider.provideTextToSpeechSession(cts.token, language ? { language } : undefined);
+        if (!textToSpeech) {
+            return;
+        }
+        this.synthesizers.set(session, textToSpeech);
+        disposables.add(textToSpeech.onDidChange(e => {
+            if (cts.token.isCancellationRequested) {
+                return;
+            }
+            this.proxy.$emitTextToSpeechEvent(session, e);
+        }));
+        disposables.add(cts.token.onCancellationRequested(() => disposables.dispose()));
+    }
+    async $synthesizeSpeech(session, text) {
+        this.synthesizers.get(session)?.synthesize(text);
+    }
+    async $cancelTextToSpeechSession(session) {
+        this.sessions.get(session)?.dispose(true);
+        this.sessions.delete(session);
+        this.synthesizers.delete(session);
+    }
     async $createKeywordRecognitionSession(handle, session) {
         const provider = this.providers.get(handle);
         if (!provider) {
@@ -37,7 +70,10 @@ class ExtHostSpeech {
         const disposables = ( new DisposableStore());
         const cts = ( new CancellationTokenSource());
         this.sessions.set(session, cts);
-        const keywordRecognitionSession = disposables.add(provider.provideKeywordRecognitionSession(cts.token));
+        const keywordRecognitionSession = await provider.provideKeywordRecognitionSession(cts.token);
+        if (!keywordRecognitionSession) {
+            return;
+        }
         disposables.add(keywordRecognitionSession.onDidChange(e => {
             if (cts.token.isCancellationRequested) {
                 return;

package/vscode/src/vs/workbench/api/common/extHostTask.js

@@ -13,7 +13,7 @@ import { IExtHostRpcService } from './extHostRpcService.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { Schemas } from '../../../base/common/network.js';
-import { PlatformToString } from '../../../base/common/platform.js';
+import { PlatformToString, Platform } from '../../../base/common/platform.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
 import '../../contrib/tasks/common/tasks.js';
@@ -595,7 +595,7 @@ let WorkerExtHostTask = class WorkerExtHostTask extends ExtHostTaskBase {
         this.registerTaskSystem(Schemas.vscodeRemote, {
             scheme: Schemas.vscodeRemote,
             authority: '',
-            platform: PlatformToString(0 )
+            platform: PlatformToString(Platform.Web)
         });
     }
     async executeTask(extension, task) {

package/vscode/src/vs/workbench/api/common/extHostTelemetry.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { Emitter } from '../../../base/common/event.js';
+import { TelemetryLevel } from '../../../platform/telemetry/common/telemetry.js';
 import { isLogLevel, LogLevel } from '../../../platform/log/common/log.js';
 import { ILoggerService } from '../../../platform/log/common/log.service.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
@@ -22,7 +23,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         this._onDidChangeTelemetryConfiguration = this._register(( (new Emitter())));
         this.onDidChangeTelemetryConfiguration = this._onDidChangeTelemetryConfiguration.event;
         this._productConfig = { usage: true, error: true };
-        this._level = 0 ;
+        this._level = TelemetryLevel.NONE;
         this._telemetryIsSupported = false;
         this._inLoggingOnlyMode = false;
         this._telemetryLoggers = ( (new Map()));
@@ -47,13 +48,13 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         this.loggerService.setVisibility(this.extHostTelemetryLogFile, this._telemetryIsSupported && this.loggerService.getLogLevel() === LogLevel.Trace);
     }
     getTelemetryConfiguration() {
-        return this._level === 3 ;
+        return this._level === TelemetryLevel.USAGE;
     }
     getTelemetryDetails() {
         return {
-            isCrashEnabled: this._level >= 1 ,
-            isErrorsEnabled: this._productConfig.error ? this._level >= 2  : false,
-            isUsageEnabled: this._productConfig.usage ? this._level >= 3  : false
+            isCrashEnabled: this._level >= TelemetryLevel.CRASH,
+            isErrorsEnabled: this._productConfig.error ? this._level >= TelemetryLevel.ERROR : false,
+            isUsageEnabled: this._productConfig.usage ? this._level >= TelemetryLevel.USAGE : false
         };
     }
     instantiateLogger(extension, sender, options) {
@@ -84,6 +85,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         commonProperties['common.vscodemachineid'] = this.initData.telemetryInfo.machineId;
         commonProperties['common.vscodesessionid'] = this.initData.telemetryInfo.sessionId;
         commonProperties['common.sqmid'] = this.initData.telemetryInfo.sqmId;
+        commonProperties['common.devDeviceId'] = this.initData.telemetryInfo.devDeviceId;
         commonProperties['common.vscodeversion'] = this.initData.version;
         commonProperties['common.isnewappinstall'] = isNewAppInstall(this.initData.telemetryInfo.firstSessionDate);
         commonProperties['common.product'] = this.initData.environment.appHost;

package/vscode/src/vs/workbench/api/common/extHostTerminalService.js

@@ -11,11 +11,13 @@ import { NotSupportedError } from '../../../base/common/errors.js';
 import { serializeEnvironmentVariableCollection, serializeEnvironmentDescriptionMap } from '../../../platform/terminal/common/environmentVariableShared.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { generateUuid } from '../../../base/common/uuid.js';
+import { ProcessPropertyType } from '../../../platform/terminal/common/terminal.js';
 import { TerminalDataBufferer } from '../../../platform/terminal/common/terminalDataBuffering.js';
 import { ThemeColor } from '../../../base/common/themables.js';
 import { Promises } from '../../../base/common/async.js';
 import { TerminalQuickFix, ViewColumn } from './extHostTypeConverters.js';
 import { IExtHostCommands } from './extHostCommands.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
 const _moduleId = "vs/workbench/api/common/extHostTerminalService";
 const IExtHostTerminalService = ( (createDecorator('IExtHostTerminalService')));
 class ExtHostTerminal extends Disposable {
@@ -243,11 +245,11 @@ class ExtHostPseudoterminal {
         });
         this._pty.onDidOverrideDimensions?.(e => {
             if (e) {
-                this._onDidChangeProperty.fire({ type: "overrideDimensions" , value: { cols: e.columns, rows: e.rows } });
+                this._onDidChangeProperty.fire({ type: ProcessPropertyType.OverrideDimensions, value: { cols: e.columns, rows: e.rows } });
             }
         });
         this._pty.onDidChangeName?.(title => {
-            this._onDidChangeProperty.fire({ type: "title" , value: title });
+            this._onDidChangeProperty.fire({ type: ProcessPropertyType.Title, value: title });
         });
         this._pty.open(initialDimensions ? initialDimensions : undefined);
         if (initialDimensions) {
@@ -309,11 +311,11 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
                     return this.getTerminalById(cast.instanceId)?.value;
                 };
                 switch (arg?.$mid) {
-                    case 15 : return deserialize(arg);
+                    case MarshalledId.TerminalContext: return deserialize(arg);
                     default: {
                         if (Array.isArray(arg)) {
                             for (let i = 0; i < arg.length; i++) {
-                                if (arg[i].$mid === 15 ) {
+                                if (arg[i].$mid === MarshalledId.TerminalContext) {
                                     arg[i] = deserialize(arg[i]);
                                 }
                                 else {
@@ -536,10 +538,10 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         this._terminalProcesses.get(id)?.shutdown(immediate);
     }
     $acceptProcessRequestInitialCwd(id) {
-        this._terminalProcesses.get(id)?.getInitialCwd().then(initialCwd => this._proxy.$sendProcessProperty(id, { type: "initialCwd" , value: initialCwd }));
+        this._terminalProcesses.get(id)?.getInitialCwd().then(initialCwd => this._proxy.$sendProcessProperty(id, { type: ProcessPropertyType.InitialCwd, value: initialCwd }));
     }
     $acceptProcessRequestCwd(id) {
-        this._terminalProcesses.get(id)?.getCwd().then(cwd => this._proxy.$sendProcessProperty(id, { type: "cwd" , value: cwd }));
+        this._terminalProcesses.get(id)?.getCwd().then(cwd => this._proxy.$sendProcessProperty(id, { type: ProcessPropertyType.Cwd, value: cwd }));
     }
     $acceptProcessRequestLatency(id) {
         return Promise.resolve(id);

package/vscode/src/vs/workbench/api/common/extHostTestItem.js

@@ -1,7 +1,7 @@
 import { Range } from '../../../editor/common/core/range.js';
 import { createPrivateApiFor, getPrivateApiFor } from './extHostTestingPrivateApi.js';
-import { TestId } from '../../contrib/testing/common/testId.js';
-import { createTestItemChildren, TestItemCollection } from '../../contrib/testing/common/testItemCollection.js';
+import { TestIdPathParts, TestId } from '../../contrib/testing/common/testId.js';
+import { createTestItemChildren, TestItemEventOp, TestItemCollection } from '../../contrib/testing/common/testItemCollection.js';
 import { denamespaceTestTag } from '../../contrib/testing/common/testTypes.js';
 import { TestTag, Range as Range$1, MarkdownString, TestItem } from './extHostTypeConverters.js';
 import { URI } from '../../../base/common/uri.js';
@@ -49,7 +49,7 @@ const propComparators = {
         return true;
     },
 };
-const evSetProps = (fn) => v => ({ op: 4 , update: fn(v) });
+const evSetProps = (fn) => v => ({ op: TestItemEventOp.SetProp, update: fn(v) });
 const makePropDescriptors = (api, label) => ({
     range: (() => {
         let value;
@@ -61,7 +61,7 @@ const makePropDescriptors = (api, label) => ({
                 return value;
             },
             set(newValue) {
-                api.listener?.({ op: 6  });
+                api.listener?.({ op: TestItemEventOp.DocumentSynced });
                 if (!propComparators.range(value, newValue)) {
                     value = newValue;
                     api.listener?.(updateProps(newValue));
@@ -73,13 +73,13 @@ const makePropDescriptors = (api, label) => ({
     description: testItemPropAccessor(api, undefined, propComparators.description, evSetProps(description => ({ description }))),
     sortText: testItemPropAccessor(api, undefined, propComparators.sortText, evSetProps(sortText => ({ sortText }))),
     canResolveChildren: testItemPropAccessor(api, false, propComparators.canResolveChildren, state => ({
-        op: 2 ,
+        op: TestItemEventOp.UpdateCanResolveChildren,
         state,
     })),
     busy: testItemPropAccessor(api, false, propComparators.busy, evSetProps(busy => ({ busy }))),
     error: testItemPropAccessor(api, undefined, propComparators.error, evSetProps(error => ({ error: MarkdownString.fromStrict(error) || null }))),
     tags: testItemPropAccessor(api, [], propComparators.tags, (current, previous) => ({
-        op: 1 ,
+        op: TestItemEventOp.SetTags,
         new: ( current.map(TestTag.from)),
         old: ( previous.map(TestTag.from)),
     })),
@@ -109,7 +109,7 @@ const toItemFromContext = (context) => {
 };
 class TestItemImpl {
     constructor(controllerId, id, label, uri) {
-        if (id.includes("\0" )) {
+        if (id.includes(TestIdPathParts.Delimiter)) {
             throw ( new Error(`Test IDs may not include the ${JSON.stringify(id)} symbol`));
         }
         const api = createPrivateApiFor(this, controllerId);