@codingame/monaco-vscode-extensions-service-override 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js

@@ -1,17 +1,22 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
-import { DisposableStore, dispose, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, dispose, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IQuickDiffService } from 'vscode/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { ResourceTree } from 'vscode/vscode/vs/base/common/resourceTree';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 
 function getIconFromIconDto(iconDto) {
     if (iconDto === undefined) {
@@ -28,6 +33,21 @@ function getIconFromIconDto(iconDto) {
         return { light: URI.revive(icon.light), dark: URI.revive(icon.dark) };
     }
 }
+class SCMInputBoxContentProvider extends Disposable {
+    constructor(textModelService, modelService, languageService) {
+        super();
+        this.modelService = modelService;
+        this.languageService = languageService;
+        this._register(textModelService.registerTextModelContentProvider(Schemas.vscodeSourceControl, this));
+    }
+    async provideTextContent(resource) {
+        const existing = this.modelService.getModel(resource);
+        if (existing) {
+            return existing;
+        }
+        return this.modelService.createModel('', this.languageService.createById('scminput'), resource);
+    }
+}
 class MainThreadSCMResourceGroup {
     get resourceTree() {
         if (!this._resourceTree) {
@@ -57,7 +77,7 @@ class MainThreadSCMResourceGroup {
     }
     toJSON() {
         return {
-            $mid: 4 ,
+            $mid: MarshalledId.ScmResourceGroup,
             sourceControlHandle: this.sourceControlHandle,
             groupHandle: this.handle
         };
@@ -95,7 +115,7 @@ class MainThreadSCMResource {
     }
     toJSON() {
         return {
-            $mid: 3 ,
+            $mid: MarshalledId.ScmResource,
             sourceControlHandle: this.sourceControlHandle,
             groupHandle: this.groupHandle,
             handle: this.handle
@@ -141,7 +161,7 @@ class MainThreadSCMProvider {
     get handle() { return this._handle; }
     get label() { return this._label; }
     get rootUri() { return this._rootUri; }
-    get inputBoxDocumentUri() { return this._inputBoxDocumentUri; }
+    get inputBoxTextModel() { return this._inputBoxTextModel; }
     get contextValue() { return this._providerId; }
     get commitTemplate() { return this.features.commitTemplate || ''; }
     get historyProvider() { return this._historyProvider; }
@@ -151,13 +171,13 @@ class MainThreadSCMProvider {
     get count() { return this.features.count; }
     get name() { return this._name ?? this._label; }
     get onDidChangeStatusBarCommands() { return this._onDidChangeStatusBarCommands.event; }
-    constructor(proxy, _handle, _providerId, _label, _rootUri, _inputBoxDocumentUri, _quickDiffService, _uriIdentService, _workspaceContextService) {
+    constructor(proxy, _handle, _providerId, _label, _rootUri, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
         this.proxy = proxy;
         this._handle = _handle;
         this._providerId = _providerId;
         this._label = _label;
         this._rootUri = _rootUri;
-        this._inputBoxDocumentUri = _inputBoxDocumentUri;
+        this._inputBoxTextModel = _inputBoxTextModel;
         this._quickDiffService = _quickDiffService;
         this._uriIdentService = _uriIdentService;
         this._workspaceContextService = _workspaceContextService;
@@ -313,7 +333,7 @@ class MainThreadSCMProvider {
     }
     toJSON() {
         return {
-            $mid: 5 ,
+            $mid: MarshalledId.ScmProvider,
             handle: this.handle
         };
     }
@@ -322,9 +342,12 @@ class MainThreadSCMProvider {
     }
 }
 let MainThreadSCM = class MainThreadSCM {
-    constructor(extHostContext, scmService, scmViewService, quickDiffService, _uriIdentService, workspaceContextService) {
+    constructor(extHostContext, scmService, scmViewService, languageService, modelService, textModelService, quickDiffService, _uriIdentService, workspaceContextService) {
         this.scmService = scmService;
         this.scmViewService = scmViewService;
+        this.languageService = languageService;
+        this.modelService = modelService;
+        this.textModelService = textModelService;
         this.quickDiffService = quickDiffService;
         this._uriIdentService = _uriIdentService;
         this.workspaceContextService = workspaceContextService;
@@ -332,6 +355,7 @@ let MainThreadSCM = class MainThreadSCM {
         this._repositoryDisposables = ( new Map());
         this._disposables = ( new DisposableStore());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostSCM));
+        this._disposables.add(( new SCMInputBoxContentProvider(this.textModelService, this.modelService, this.languageService)));
     }
     dispose() {
         dispose(( this._repositories.values()));
@@ -340,21 +364,22 @@ let MainThreadSCM = class MainThreadSCM {
         this._repositoryDisposables.clear();
         this._disposables.dispose();
     }
-    $registerSourceControl(handle, id, label, rootUri, inputBoxDocumentUri) {
+    async $registerSourceControl(handle, id, label, rootUri, inputBoxDocumentUri) {
+        const inputBoxTextModelRef = await this.textModelService.createModelReference(URI.revive(inputBoxDocumentUri));
         const provider = ( new MainThreadSCMProvider(
             this._proxy,
             handle,
             id,
             label,
             rootUri ? URI.revive(rootUri) : undefined,
-            URI.revive(inputBoxDocumentUri),
+            inputBoxTextModelRef.object.textEditorModel,
             this.quickDiffService,
             this._uriIdentService,
             this.workspaceContextService
         ));
         const repository = this.scmService.registerSCMProvider(provider);
         this._repositories.set(handle, repository);
-        const disposable = combinedDisposable(Event.filter(this.scmViewService.onDidFocusRepository, r => r === repository)(_ => this._proxy.$setSelectedSourceControl(handle)), repository.input.onDidChange(({ value }) => this._proxy.$onInputBoxValueChange(handle, value)));
+        const disposable = combinedDisposable(inputBoxTextModelRef, Event.filter(this.scmViewService.onDidFocusRepository, r => r === repository)(_ => this._proxy.$setSelectedSourceControl(handle)), repository.input.onDidChange(({ value }) => this._proxy.$onInputBoxValueChange(handle, value)));
         if (this.scmViewService.focusedRepository === repository) {
             setTimeout(() => this._proxy.$setSelectedSourceControl(handle), 0);
         }
@@ -485,9 +510,12 @@ MainThreadSCM = __decorate([
     extHostNamedCustomer(MainContext.MainThreadSCM),
     ( __param(1, ISCMService)),
     ( __param(2, ISCMViewService)),
-    ( __param(3, IQuickDiffService)),
-    ( __param(4, IUriIdentityService)),
-    ( __param(5, IWorkspaceContextService))
+    ( __param(3, ILanguageService)),
+    ( __param(4, IModelService)),
+    ( __param(5, ITextModelService)),
+    ( __param(6, IQuickDiffService)),
+    ( __param(7, IUriIdentityService)),
+    ( __param(8, IWorkspaceContextService))
 ], MainThreadSCM);
 
 export { MainThreadSCM };

package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js

@@ -5,6 +5,7 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { SearchProviderType, QueryType } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
@@ -25,32 +26,20 @@ let MainThreadSearch = class MainThreadSearch {
         this._searchProvider.clear();
     }
     $registerTextSearchProvider(handle, scheme) {
-        this._searchProvider.set(handle, ( new RemoteSearchProvider(
-            this._searchService,
-            1 ,
-            scheme,
-            handle,
-            this._proxy
-        )));
+        this._searchProvider.set(handle, ( new RemoteSearchProvider(this._searchService, SearchProviderType.text, scheme, handle, this._proxy)));
     }
     $registerAITextSearchProvider(handle, scheme) {
         SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(true);
         this._searchProvider.set(handle, ( new RemoteSearchProvider(
             this._searchService,
-            2 ,
+            SearchProviderType.aiText,
             scheme,
             handle,
             this._proxy
         )));
     }
     $registerFileSearchProvider(handle, scheme) {
-        this._searchProvider.set(handle, ( new RemoteSearchProvider(
-            this._searchService,
-            0 ,
-            scheme,
-            handle,
-            this._proxy
-        )));
+        this._searchProvider.set(handle, ( new RemoteSearchProvider(this._searchService, SearchProviderType.file, scheme, handle, this._proxy)));
     }
     $unregisterProvider(handle) {
         dispose(this._searchProvider.get(handle));
@@ -155,9 +144,9 @@ class RemoteSearchProvider {
     }
     _provideSearchResults(query, session, token) {
         switch (query.type) {
-            case 1 :
+            case QueryType.File:
                 return this._proxy.$provideFileSearchResults(this._handle, session, query, token);
-            case 2 :
+            case QueryType.Text:
                 return this._proxy.$provideTextSearchResults(this._handle, session, query, token);
             default:
                 return this._proxy.$provideAITextSearchResults(this._handle, session, query, token);

package/vscode/src/vs/workbench/api/browser/mainThreadSpeech.js

@@ -1,8 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { raceCancellation } from 'vscode/vscode/vs/base/common/async';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { TextToSpeechStatus } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService';
 import { ISpeechService } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
@@ -12,6 +14,7 @@ let MainThreadSpeech = class MainThreadSpeech {
         this.logService = logService;
         this.providerRegistrations = ( new Map());
         this.speechToTextSessions = ( new Map());
+        this.textToSpeechSessions = ( new Map());
         this.keywordRecognitionSessions = ( new Map());
         this.proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostSpeech));
     }
@@ -39,6 +42,31 @@ let MainThreadSpeech = class MainThreadSpeech {
                     onDidChange: onDidChange.event
                 };
             },
+            createTextToSpeechSession: (token, options) => {
+                if (token.isCancellationRequested) {
+                    return {
+                        onDidChange: Event.None,
+                        synthesize: async () => { }
+                    };
+                }
+                const disposables = ( new DisposableStore());
+                const session = Math.random();
+                this.proxy.$createTextToSpeechSession(handle, session, options?.language);
+                const onDidChange = disposables.add(( new Emitter()));
+                this.textToSpeechSessions.set(session, { onDidChange });
+                disposables.add(token.onCancellationRequested(() => {
+                    this.proxy.$cancelTextToSpeechSession(session);
+                    this.textToSpeechSessions.delete(session);
+                    disposables.dispose();
+                }));
+                return {
+                    onDidChange: onDidChange.event,
+                    synthesize: async (text) => {
+                        await this.proxy.$synthesizeSpeech(session, text);
+                        await raceCancellation(Event.toPromise(Event.filter(onDidChange.event, e => e.status === TextToSpeechStatus.Stopped)), token);
+                    }
+                };
+            },
             createKeywordRecognitionSession: token => {
                 if (token.isCancellationRequested) {
                     return {
@@ -77,6 +105,10 @@ let MainThreadSpeech = class MainThreadSpeech {
         const providerSession = this.speechToTextSessions.get(session);
         providerSession?.onDidChange.fire(event);
     }
+    $emitTextToSpeechEvent(session, event) {
+        const providerSession = this.textToSpeechSessions.get(session);
+        providerSession?.onDidChange.fire(event);
+    }
     $emitKeywordRecognitionEvent(session, event) {
         const providerSession = this.keywordRecognitionSessions.get(session);
         providerSession?.onDidChange.fire(event);
@@ -86,6 +118,8 @@ let MainThreadSpeech = class MainThreadSpeech {
         this.providerRegistrations.clear();
         this.speechToTextSessions.forEach(session => session.onDidChange.dispose());
         this.speechToTextSessions.clear();
+        this.textToSpeechSessions.forEach(session => session.onDidChange.dispose());
+        this.textToSpeechSessions.clear();
         this.keywordRecognitionSessions.forEach(session => session.onDidChange.dispose());
         this.keywordRecognitionSessions.clear();
     }

package/vscode/src/vs/workbench/api/browser/mainThreadStatusBar.js

@@ -2,7 +2,8 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarService';
+import { StatusBarUpdateKind, IExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarService';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 
 let MainThreadStatusBar = class MainThreadStatusBar {
     constructor(extHostContext, statusbarService) {
@@ -27,7 +28,7 @@ let MainThreadStatusBar = class MainThreadStatusBar {
                 tooltip: item.entry.tooltip,
                 command: typeof item.entry.command === 'string' ? item.entry.command : typeof item.entry.command === 'object' ? item.entry.command.id : undefined,
                 priority: item.priority,
-                alignLeft: item.alignment === 0 ,
+                alignLeft: item.alignment === StatusbarAlignment.LEFT,
                 accessibilityInformation: item.entry.ariaLabel ? { label: item.entry.ariaLabel, role: item.entry.role } : undefined
             };
         }
@@ -37,7 +38,7 @@ let MainThreadStatusBar = class MainThreadStatusBar {
     }
     $setEntry(entryId, id, extensionId, name, text, tooltip, command, color, backgroundColor, alignLeft, priority, accessibilityInformation) {
         const kind = this.statusbarService.setOrUpdateEntry(entryId, id, extensionId, name, text, tooltip, command, color, backgroundColor, alignLeft, priority, accessibilityInformation);
-        if (kind === 0 ) {
+        if (kind === StatusBarUpdateKind.DidDefine) {
             this._store.add(toDisposable(() => this.statusbarService.unsetEntry(entryId)));
         }
     }

package/vscode/src/vs/workbench/api/browser/mainThreadStorage.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -18,7 +19,7 @@ let MainThreadStorage = class MainThreadStorage {
         this._storageListener = ( new DisposableStore());
         this._sharedStorageKeysToWatch = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostStorage));
-        this._storageListener.add(this._storageService.onDidChangeValue(0 , undefined, this._storageListener)(e => {
+        this._storageListener.add(this._storageService.onDidChangeValue(StorageScope.PROFILE, undefined, this._storageListener)(e => {
             if (( this._sharedStorageKeysToWatch.has(e.key))) {
                 const rawState = this._extensionStorageService.getExtensionStateRaw(e.key, true);
                 if (typeof rawState === 'string') {

package/vscode/src/vs/workbench/api/browser/mainThreadTask.js

@@ -3,10 +3,10 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { isString } from 'vscode/vscode/vs/base/common/types';
-import { platform } from 'vscode/vscode/vs/base/common/platform';
+import { platform, Platform } from 'vscode/vscode/vs/base/common/platform';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
-import { TaskDefinition, PresentationOptions, RunOptions, CommandOptions, RuntimeType, TaskSourceKind, CustomTask, ContributedTask, ConfiguringTask } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
+import { TaskDefinition, PresentationOptions, RunOptions, CommandOptions, RuntimeType, TaskSourceKind, TaskScope, CustomTask, ContributedTask, ConfiguringTask, TaskEventKind } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
@@ -268,7 +268,7 @@ var TaskSourceDTO;
         }
         else if (value.kind === TaskSourceKind.Workspace) {
             result.extensionId = '$core';
-            result.scope = value.config.workspaceFolder ? value.config.workspaceFolder.uri : 1 ;
+            result.scope = value.config.workspaceFolder ? value.config.workspaceFolder.uri : TaskScope.Global;
         }
         return result;
     }
@@ -276,13 +276,13 @@ var TaskSourceDTO;
     function to(value, workspace) {
         let scope;
         let workspaceFolder;
-        if ((value.scope === undefined) || ((typeof value.scope === 'number') && ((value.scope !== 1) ))) {
+        if ((value.scope === undefined) || ((typeof value.scope === 'number') && (value.scope !== TaskScope.Global))) {
             if (workspace.getWorkspace().folders.length === 0) {
-                scope = 1 ;
+                scope = TaskScope.Global;
                 workspaceFolder = undefined;
             }
             else {
-                scope = 3 ;
+                scope = TaskScope.Folder;
                 workspaceFolder = workspace.getWorkspace().folders[0];
             }
         }
@@ -290,7 +290,7 @@ var TaskSourceDTO;
             scope = value.scope;
         }
         else {
-            scope = 3 ;
+            scope = TaskScope.Folder;
             workspaceFolder = workspace.getWorkspaceFolder(URI.revive(value.scope)) ?? undefined;
         }
         const result = {
@@ -439,11 +439,11 @@ let MainThreadTask = class MainThreadTask extends Disposable {
         this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostTask)));
         this._providers = ( (new Map()));
         this._register(this._taskService.onDidStateChange(async (event) => {
-            if (event.kind === "changed" ) {
+            if (event.kind === TaskEventKind.Changed) {
                 return;
             }
             const task = event.__task;
-            if (event.kind === "start" ) {
+            if (event.kind === TaskEventKind.Start) {
                 const execution = TaskExecutionDTO.from(task.getTaskExecution());
                 let resolvedDefinition = execution.task.definition;
                 if (execution.task?.execution && CustomExecutionDTO.is(execution.task.execution) && event.resolvedVariables) {
@@ -455,13 +455,13 @@ let MainThreadTask = class MainThreadTask extends Disposable {
                 }
                 this._proxy.$onDidStartTask(execution, event.terminalId, resolvedDefinition);
             }
-            else if (event.kind === "processStarted" ) {
+            else if (event.kind === TaskEventKind.ProcessStarted) {
                 this._proxy.$onDidStartTaskProcess(TaskProcessStartedDTO.from(task.getTaskExecution(), event.processId));
             }
-            else if (event.kind === "processEnded" ) {
+            else if (event.kind === TaskEventKind.ProcessEnded) {
                 this._proxy.$onDidEndTaskProcess(TaskProcessEndedDTO.from(task.getTaskExecution(), event.exitCode));
             }
-            else if (event.kind === "end" ) {
+            else if (event.kind === TaskEventKind.End) {
                 this._proxy.$OnDidEndTask(TaskExecutionDTO.from(task.getTaskExecution()));
             }
         }));
@@ -672,16 +672,16 @@ let MainThreadTask = class MainThreadTask extends Disposable {
         let platform$1;
         switch (info.platform) {
             case 'Web':
-                platform$1 = 0 ;
+                platform$1 = Platform.Web;
                 break;
             case 'win32':
-                platform$1 = 3 ;
+                platform$1 = Platform.Windows;
                 break;
             case 'darwin':
-                platform$1 = 1 ;
+                platform$1 = Platform.Mac;
                 break;
             case 'linux':
-                platform$1 = 2 ;
+                platform$1 = Platform.Linux;
                 break;
             default:
                 platform$1 = platform;

package/vscode/src/vs/workbench/api/browser/mainThreadTelemetry.js

@@ -3,7 +3,7 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TelemetryLevel } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { supportsTelemetry } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -31,7 +31,7 @@ let MainThreadTelemetry = class MainThreadTelemetry extends Disposable {
     }
     get telemetryLevel() {
         if (!supportsTelemetry(this._productService, this._environmentService)) {
-            return 0 ;
+            return TelemetryLevel.NONE;
         }
         return this._telemetryService.telemetryLevel;
     }

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js

@@ -5,7 +5,7 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { TerminalLocation, TerminalExitReason } from 'vscode/vscode/vs/platform/terminal/common/terminal';
+import { TerminalLocation, TerminalExitReason, ProcessPropertyType } from 'vscode/vscode/vs/platform/terminal/common/terminal';
 import { TerminalDataBufferer } from 'vscode/vscode/vs/platform/terminal/common/terminalDataBuffering';
 import { ITerminalService, ITerminalGroupService, ITerminalEditorService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { TerminalProcessExtHostProxy } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
@@ -18,6 +18,7 @@ import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { ITerminalLinkProviderService } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.service';
 import { TerminalQuickFixType } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
 import { ITerminalQuickFixService } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service';
+import { TerminalCapability } from 'vscode/vscode/vs/platform/terminal/common/capabilities/capabilities';
 
 let MainThreadTerminalService = class MainThreadTerminalService {
     constructor(_extHostContext, _terminalService, _terminalLinkProviderService, _terminalQuickFixService, _instantiationService, _environmentVariableService, _logService, _terminalProfileResolverService, remoteAgentService, _terminalGroupService, _terminalEditorService, _terminalProfileService) {
@@ -189,7 +190,7 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         if (this._sendCommandEventListener.value) {
             return;
         }
-        const multiplexer = this._terminalService.createOnInstanceCapabilityEvent(2 , capability => capability.onCommandFinished);
+        const multiplexer = this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, capability => capability.onCommandFinished);
         const sub = multiplexer.event(e => {
             this._onDidExecuteCommand(e.instance.instanceId, {
                 commandLine: e.data.command,
@@ -322,7 +323,7 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         this._terminalProcessProxies.get(terminalId)?.emitReady(pid, cwd, windowsPty);
     }
     $sendProcessProperty(terminalId, property) {
-        if (property.type === "title" ) {
+        if (property.type === ProcessPropertyType.Title) {
             const instance = this._terminalService.getInstanceFromId(terminalId);
             instance?.rename(property.value);
         }

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { TerminalCapability } from 'vscode/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ITerminalService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
@@ -21,11 +22,11 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
         }));
         const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
             return ( Event.map(Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
-                return e === 2 ;
+                return e === TerminalCapability.CommandDetection;
             }), () => instance));
         })).event;
         this._store.add(onDidAddCommandDetection(e => this._proxy.$shellIntegrationChange(e.instanceId)));
-        const commandDetectionStartEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(2 , e => e.onCommandExecuted));
+        const commandDetectionStartEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onCommandExecuted));
         let currentCommand;
         this._store.add(commandDetectionStartEvent.event(e => {
             if (e.data === currentCommand) {
@@ -37,7 +38,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
             instanceDataListeners.get(instanceId)?.dispose();
             instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join())));
         }));
-        const commandDetectionEndEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(2 , e => e.onCommandFinished));
+        const commandDetectionEndEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onCommandFinished));
         this._store.add(commandDetectionEndEvent.event(e => {
             currentCommand = undefined;
             const instanceId = e.instance.instanceId;
@@ -46,7 +47,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
                 this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
             });
         }));
-        const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(0 , e => e.onDidChangeCwd));
+        const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CwdDetection, e => e.onDidChangeCwd));
         this._store.add(cwdChangeEvent.event(e => {
             this._proxy.$cwdChange(e.instance.instanceId, this._convertCwdToUri(e.data));
         }));

package/vscode/src/vs/workbench/api/browser/mainThreadTesting.js

@@ -18,7 +18,7 @@ import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/
 import { LiveTestResult } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResult';
 import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
 import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
-import { ITestItem, IFileCoverage, CoverageDetails, ITestMessage, TestsDiffOp } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
+import { TestRunProfileBitset, ITestItem, IFileCoverage, CoverageDetails, ITestMessage, TestsDiffOp } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 
@@ -32,12 +32,17 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
         this.diffListener = this._register(( new MutableDisposable()));
         this.testProviderRegistrations = ( new Map());
         this.proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostTesting));
+        this._register(this.testService.registerExtHost({
+            provideTestFollowups: (req, token) => this.proxy.$provideTestFollowups(req, token),
+            executeTestFollowup: id => this.proxy.$executeTestFollowup(id),
+            disposeTestFollowups: ids => this.proxy.$disposeTestFollowups(ids),
+        }));
         this._register(this.testService.onDidCancelTestRun(({ runId }) => {
             this.proxy.$cancelExtensionTestRun(runId);
         }));
         this._register(Event.debounce(testProfiles.onDidChange, (_last, e) => e)(() => {
             const obj = {};
-            for (const group of [2 , 4 , 8 ]) {
+            for (const group of [TestRunProfileBitset.Run, TestRunProfileBitset.Debug, TestRunProfileBitset.Coverage]) {
                 for (const profile of this.testProfiles.getGroupDefaultProfiles(group)) {
                     obj[profile.controllerId] ??= [];
                     obj[profile.controllerId].push(profile.profileId);
@@ -100,7 +105,7 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
             transaction(tx => {
                 let value = task.coverage.read(undefined);
                 if (!value) {
-                    value = ( new TestCoverage(taskId, this.uriIdentityService, {
+                    value = ( new TestCoverage(run, taskId, this.uriIdentityService, {
                         getCoverageDetails: (id, token) => this.proxy.$getCoverageDetails(id, token)
                             .then(r => ( r.map(CoverageDetails.deserialize))),
                     }));

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js

@@ -3,7 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ExtHostContext, CandidatePortSource, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { TunnelDtoConverter } from 'vscode/vscode/vs/workbench/api/common/extHostTunnelService';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_OUTPUT } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_HYBRID } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
 import { TunnelProtocol } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
 import { ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel.service';
@@ -206,6 +206,11 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
                         .registerDefaultConfigurations([{ overrides: { 'remote.autoForwardPortsSource': PORT_AUTO_SOURCE_SETTING_OUTPUT } }]);
                     break;
                 }
+                case CandidatePortSource.Hybrid: {
+                    ( (Registry.as(Extensions.Configuration)))
+                        .registerDefaultConfigurations([{ overrides: { 'remote.autoForwardPortsSource': PORT_AUTO_SOURCE_SETTING_HYBRID } }]);
+                    break;
+                }
             }
         }).catch(() => {
         });

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js

@@ -14,7 +14,7 @@ import { ExtensionKeyedWebviewOriginStore } from 'vscode/vscode/vs/workbench/con
 import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
 import { editorGroupToColumn } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { GroupsOrder, GroupLocation, preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ACTIVE_GROUP, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -160,11 +160,11 @@ let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
             return SIDE_GROUP;
         }
         if (showOptions.viewColumn >= 0) {
-            const groupInColumn = this._editorGroupService.getGroups(2 )[showOptions.viewColumn];
+            const groupInColumn = this._editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[showOptions.viewColumn];
             if (groupInColumn) {
                 return groupInColumn.id;
             }
-            const newGroup = this._editorGroupService.findGroup({ location: 1  });
+            const newGroup = this._editorGroupService.findGroup({ location: GroupLocation.LAST });
             if (newGroup) {
                 const direction = preferredSideBySideGroupDirection(this._configurationService);
                 return this._editorGroupService.addGroup(newGroup, direction);