@codingame/monaco-vscode-extensions-service-override 11.1.2 → 12.0.1

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

@@ -1,9 +1,10 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 +32,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.d.ts

@@ -0,0 +1,80 @@
+import { MainThreadTerminalServiceShape, TerminalLaunchConfig, ExtHostTerminalIdentifier } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IProcessProperty, IProcessReadyWindowsPty, ITerminalOutputMatch, ITerminalOutputMatcher } from "vscode/vscode/vs/platform/terminal/common/terminal";
+import { ITerminalGroupService } from "vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { ITerminalEditorService } from "vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { ITerminalService } from "vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { IEnvironmentVariableService } from "vscode/vscode/vs/workbench/contrib/terminal/common/environmentVariable.service";
+import { ITerminalProfileService } from "vscode/vscode/vs/workbench/contrib/terminal/common/terminal.service";
+import { ITerminalProfileResolverService } from "vscode/vscode/vs/workbench/contrib/terminal/common/terminal.service";
+import { IRemoteAgentService } from "vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
+import { ITerminalLinkProviderService } from "vscode/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.service";
+import { ITerminalQuickFixService } from "vscode/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service";
+import { ITerminalCompletionService } from "vscode/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service";
+export declare class MainThreadTerminalService implements MainThreadTerminalServiceShape {
+    private readonly _extHostContext;
+    private readonly _terminalService;
+    private readonly _terminalLinkProviderService;
+    private readonly _terminalQuickFixService;
+    private readonly _instantiationService;
+    private readonly _environmentVariableService;
+    private readonly _logService;
+    private readonly _terminalProfileResolverService;
+    private readonly _terminalGroupService;
+    private readonly _terminalEditorService;
+    private readonly _terminalProfileService;
+    private readonly _terminalCompletionService;
+    private readonly _store;
+    private readonly _proxy;
+    private readonly _extHostTerminals;
+    private readonly _terminalProcessProxies;
+    private readonly _profileProviders;
+    private readonly _completionProviders;
+    private readonly _quickFixProviders;
+    private readonly _dataEventTracker;
+    private readonly _sendCommandEventListener;
+    private readonly _linkProvider;
+    private _os;
+    constructor(_extHostContext: IExtHostContext, _terminalService: ITerminalService, _terminalLinkProviderService: ITerminalLinkProviderService, _terminalQuickFixService: ITerminalQuickFixService, _instantiationService: IInstantiationService, _environmentVariableService: IEnvironmentVariableService, _logService: ILogService, _terminalProfileResolverService: ITerminalProfileResolverService, remoteAgentService: IRemoteAgentService, _terminalGroupService: ITerminalGroupService, _terminalEditorService: ITerminalEditorService, _terminalProfileService: ITerminalProfileService, _terminalCompletionService: ITerminalCompletionService);
+    dispose(): void;
+    private _updateDefaultProfile;
+    private _getTerminalInstance;
+    $createTerminal(extHostTerminalId: string, launchConfig: TerminalLaunchConfig): Promise<void>;
+    private _deserializeParentTerminal;
+    $show(id: ExtHostTerminalIdentifier, preserveFocus: boolean): Promise<void>;
+    $hide(id: ExtHostTerminalIdentifier): Promise<void>;
+    $dispose(id: ExtHostTerminalIdentifier): Promise<void>;
+    $sendText(id: ExtHostTerminalIdentifier, text: string, shouldExecute: boolean): Promise<void>;
+    $sendProcessExit(terminalId: number, exitCode: number | undefined): void;
+    $startSendingDataEvents(): void;
+    $stopSendingDataEvents(): void;
+    $startSendingCommandEvents(): void;
+    $stopSendingCommandEvents(): void;
+    $startLinkProvider(): void;
+    $stopLinkProvider(): void;
+    $registerProcessSupport(isSupported: boolean): void;
+    $registerCompletionProvider(id: string, extensionIdentifier: string, ...triggerCharacters: string[]): void;
+    $unregisterCompletionProvider(id: string): void;
+    $registerProfileProvider(id: string, extensionIdentifier: string): void;
+    $unregisterProfileProvider(id: string): void;
+    $registerQuickFixProvider(id: string, extensionId: string): Promise<void>;
+    $unregisterQuickFixProvider(id: string): void;
+    private _onActiveTerminalChanged;
+    private _onTerminalData;
+    private _onDidExecuteCommand;
+    private _onTitleChanged;
+    private _onTerminalDisposed;
+    private _onTerminalOpened;
+    private _onTerminalProcessIdReady;
+    private _onInstanceDimensionsChanged;
+    private _onInstanceMaximumDimensionsChanged;
+    private _onRequestStartExtensionTerminal;
+    $sendProcessData(terminalId: number, data: string): void;
+    $sendProcessReady(terminalId: number, pid: number, cwd: string, windowsPty: IProcessReadyWindowsPty | undefined): void;
+    $sendProcessProperty(terminalId: number, property: IProcessProperty<any>): void;
+    $setEnvironmentVariableCollection(extensionIdentifier: string, persistent: boolean, collection: ISerializableEnvironmentVariableCollection | undefined, descriptionMap: ISerializableEnvironmentDescriptionMap): void;
+}
+export declare function getOutputMatchForLines(lines: string[], outputMatcher: ITerminalOutputMatcher): ITerminalOutputMatch | undefined;

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

@@ -1,14 +1,15 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { DisposableStore, MutableDisposable, combinedDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 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';
+import { TerminalProcessExtHostProxy } from '@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
 import { IEnvironmentVariableService } from 'vscode/vscode/vs/workbench/contrib/terminal/common/environmentVariable.service';
 import { serializeEnvironmentVariableCollection, deserializeEnvironmentVariableCollection, deserializeEnvironmentDescriptionMap } from 'vscode/vscode/vs/platform/terminal/common/environmentVariableShared';
 import { ITerminalProfileResolverService, ITerminalProfileService } from 'vscode/vscode/vs/workbench/contrib/terminal/common/terminal.service';
@@ -16,11 +17,13 @@ import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/
 import { OS } from 'vscode/vscode/vs/base/common/platform';
 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 { TerminalQuickFixType } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
 import { ITerminalQuickFixService } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service';
+import { TerminalCapability } from '@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { ITerminalCompletionService } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service';
 
 let MainThreadTerminalService = class MainThreadTerminalService {
-    constructor(_extHostContext, _terminalService, _terminalLinkProviderService, _terminalQuickFixService, _instantiationService, _environmentVariableService, _logService, _terminalProfileResolverService, remoteAgentService, _terminalGroupService, _terminalEditorService, _terminalProfileService) {
+    constructor(_extHostContext, _terminalService, _terminalLinkProviderService, _terminalQuickFixService, _instantiationService, _environmentVariableService, _logService, _terminalProfileResolverService, remoteAgentService, _terminalGroupService, _terminalEditorService, _terminalProfileService, _terminalCompletionService) {
         this._extHostContext = _extHostContext;
         this._terminalService = _terminalService;
         this._terminalLinkProviderService = _terminalLinkProviderService;
@@ -32,10 +35,12 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         this._terminalGroupService = _terminalGroupService;
         this._terminalEditorService = _terminalEditorService;
         this._terminalProfileService = _terminalProfileService;
+        this._terminalCompletionService = _terminalCompletionService;
         this._store = ( new DisposableStore());
         this._extHostTerminals = ( new Map());
         this._terminalProcessProxies = ( new Map());
         this._profileProviders = ( new Map());
+        this._completionProviders = ( new Map());
         this._quickFixProviders = ( new Map());
         this._dataEventTracker = ( new MutableDisposable());
         this._sendCommandEventListener = ( new MutableDisposable());
@@ -189,7 +194,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,
@@ -212,6 +217,18 @@ let MainThreadTerminalService = class MainThreadTerminalService {
     $registerProcessSupport(isSupported) {
         this._terminalService.registerProcessSupport(isSupported);
     }
+    $registerCompletionProvider(id, extensionIdentifier, ...triggerCharacters) {
+        this._completionProviders.set(id, this._terminalCompletionService.registerTerminalCompletionProvider(extensionIdentifier, id, {
+            id,
+            provideCompletions: async (commandLine, cursorPosition, token) => {
+                return await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition }, token);
+            }
+        }, ...triggerCharacters));
+    }
+    $unregisterCompletionProvider(id) {
+        this._completionProviders.get(id)?.dispose();
+        this._completionProviders.delete(id);
+    }
     $registerProfileProvider(id, extensionIdentifier) {
         this._profileProviders.set(id, this._terminalProfileService.registerTerminalProfileProvider(extensionIdentifier, id, {
             createContributedTerminalProfile: async (options) => {
@@ -246,7 +263,7 @@ let MainThreadTerminalService = class MainThreadTerminalService {
                     return;
                 }
                 const matchResult = { commandLineMatch, outputMatch, commandLine: terminalCommand.command };
-                if (matchResult) {
+                {
                     const result = await this._proxy.$provideTerminalQuickFixes(id, matchResult, token);
                     if (result && Array.isArray(result)) {
                         return ( result.map(r => parseQuickFix(id, extensionId, r)));
@@ -322,7 +339,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);
         }
@@ -354,7 +371,8 @@ MainThreadTerminalService = __decorate([
     ( __param(8, IRemoteAgentService)),
     ( __param(9, ITerminalGroupService)),
     ( __param(10, ITerminalEditorService)),
-    ( __param(11, ITerminalProfileService))
+    ( __param(11, ITerminalProfileService)),
+    ( __param(12, ITerminalCompletionService))
 ], MainThreadTerminalService);
 let TerminalDataEventTracker = class TerminalDataEventTracker extends Disposable {
     constructor(_callback, _terminalService) {

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.d.ts

@@ -0,0 +1,12 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { type MainThreadTerminalShellIntegrationShape } 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";
+import { type IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+export declare class MainThreadTerminalShellIntegration extends Disposable implements MainThreadTerminalShellIntegrationShape {
+    private readonly _terminalService;
+    private readonly _proxy;
+    constructor(extHostContext: IExtHostContext, _terminalService: ITerminalService, workbenchEnvironmentService: IWorkbenchEnvironmentService);
+    $executeCommand(terminalId: number, commandLine: string): void;
+    private _convertCwdToUri;
+}

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

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 '@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/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 +23,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 || e === TerminalCapability.CwdDetection;
             }), () => 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 +39,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 +48,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.d.ts

@@ -0,0 +1,44 @@
+import { VSBuffer } from "vscode/vscode/vs/base/common/buffer";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { ITestProfileService } from "vscode/vscode/vs/workbench/contrib/testing/common/testProfileService.service";
+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 { CoverageDetails, ExtensionRunTestsRequest, IFileCoverage, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, TestControllerCapability, TestResultState, TestsDiffOp } from "vscode/vscode/vs/workbench/contrib/testing/common/testTypes";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { ILocationDto, ITestControllerPatch, MainThreadTestingShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadTesting extends Disposable implements MainThreadTestingShape {
+    private readonly uriIdentityService;
+    private readonly testService;
+    private readonly testProfiles;
+    private readonly resultService;
+    private readonly proxy;
+    private readonly diffListener;
+    private readonly testProviderRegistrations;
+    constructor(extHostContext: IExtHostContext, uriIdentityService: IUriIdentityService, testService: ITestService, testProfiles: ITestProfileService, resultService: ITestResultService);
+    $markTestRetired(testIds: string[] | undefined): void;
+    $publishTestRunProfile(profile: ITestRunProfile): void;
+    $updateTestRunConfig(controllerId: string, profileId: number, update: Partial<ITestRunProfile>): void;
+    $removeTestProfile(controllerId: string, profileId: number): void;
+    $addTestsToRun(controllerId: string, runId: string, tests: ITestItem.Serialized[]): void;
+    $appendCoverage(runId: string, taskId: string, coverage: IFileCoverage.Serialized): void;
+    $startedExtensionTestRun(req: ExtensionRunTestsRequest): void;
+    $startedTestRunTask(runId: string, task: ITestRunTask): void;
+    $finishedTestRunTask(runId: string, taskId: string): void;
+    $finishedExtensionTestRun(runId: string): void;
+    $updateTestStateInRun(runId: string, taskId: string, testId: string, state: TestResultState, duration?: number): void;
+    $appendOutputToRun(runId: string, taskId: string, output: VSBuffer, locationDto?: ILocationDto, testId?: string): void;
+    $appendTestMessagesInRun(runId: string, taskId: string, testId: string, messages: ITestMessage.Serialized[]): void;
+    $registerTestController(controllerId: string, _label: string, _capabilities: TestControllerCapability): void;
+    $updateController(controllerId: string, patch: ITestControllerPatch): void;
+    $unregisterTestController(controllerId: string): void;
+    $subscribeToDiffs(): void;
+    $unsubscribeFromDiffs(): void;
+    $publishDiff(controllerId: string, diff: TestsDiffOp.Serialized[]): void;
+    $runTests(req: ResolvedTestRunRequest, token: CancellationToken): Promise<string>;
+    $getCoverageDetails(resultId: string, taskIndex: number, uri: UriComponents, token: CancellationToken): Promise<CoverageDetails.Serialized[]>;
+    dispose(): void;
+    private withLiveRun;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { transaction, observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
@@ -11,13 +12,13 @@ import { WellDefinedPrefixTree } from 'vscode/vscode/vs/base/common/prefixTree';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { TestCoverage } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverage';
+import { TestCoverage } from '@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common/vscode/vs/workbench/contrib/testing/common/testCoverage';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
 import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService.service';
-import { LiveTestResult } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResult';
+import { LiveTestResult } from '@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common/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';
 
@@ -42,7 +43,7 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
         }));
         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);

package/vscode/src/vs/workbench/api/browser/mainThreadTheming.d.ts

@@ -0,0 +1,10 @@
+import { MainThreadThemingShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+export declare class MainThreadTheming implements MainThreadThemingShape {
+    private readonly _themeService;
+    private readonly _proxy;
+    private readonly _themeChangeListener;
+    constructor(extHostContext: IExtHostContext, themeService: IThemeService);
+    dispose(): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadTimeline.d.ts

@@ -0,0 +1,16 @@
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { MainThreadTimelineShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { TimelineChangeEvent, TimelineProviderDescriptor } from "vscode/vscode/vs/workbench/contrib/timeline/common/timeline";
+import { ITimelineService } from "vscode/vscode/vs/workbench/contrib/timeline/common/timeline.service";
+export declare class MainThreadTimeline implements MainThreadTimelineShape {
+    private readonly logService;
+    private readonly _timelineService;
+    private readonly _proxy;
+    private readonly _providerEmitters;
+    constructor(context: IExtHostContext, logService: ILogService, _timelineService: ITimelineService);
+    $registerTimelineProvider(provider: TimelineProviderDescriptor): void;
+    $unregisterTimelineProvider(id: string): void;
+    $emitTimelineChangeEvent(e: TimelineChangeEvent): void;
+    dispose(): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';

package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.d.ts

@@ -0,0 +1,45 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { MainThreadTreeViewsShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { ITreeItem, IRevealOptions, IViewBadge } from "vscode/vscode/vs/workbench/common/views";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { VSBuffer } from "vscode/vscode/vs/base/common/buffer";
+import { IMarkdownString } from "vscode/vscode/vs/base/common/htmlContent";
+import { IViewsService } from "vscode/vscode/vs/workbench/services/views/common/viewsService.service";
+export declare class MainThreadTreeViews extends Disposable implements MainThreadTreeViewsShape {
+    private readonly viewsService;
+    private readonly notificationService;
+    private readonly extensionService;
+    private readonly logService;
+    private readonly _proxy;
+    private readonly _dataProviders;
+    private readonly _dndControllers;
+    constructor(extHostContext: IExtHostContext, viewsService: IViewsService, notificationService: INotificationService, extensionService: IExtensionService, logService: ILogService);
+    $registerTreeViewDataProvider(treeViewId: string, options: {
+        showCollapseAll: boolean;
+        canSelectMany: boolean;
+        dropMimeTypes: string[];
+        dragMimeTypes: string[];
+        hasHandleDrag: boolean;
+        hasHandleDrop: boolean;
+        manuallyManageCheckboxes: boolean;
+    }): Promise<void>;
+    $reveal(treeViewId: string, itemInfo: {
+        item: ITreeItem;
+        parentChain: ITreeItem[];
+    } | undefined, options: IRevealOptions): Promise<void>;
+    $refresh(treeViewId: string, itemsToRefreshByHandle: {
+        [treeItemHandle: string]: ITreeItem;
+    }): Promise<void>;
+    $setMessage(treeViewId: string, message: string | IMarkdownString): void;
+    $setTitle(treeViewId: string, title: string, description: string | undefined): void;
+    $setBadge(treeViewId: string, badge: IViewBadge | undefined): void;
+    $resolveDropFileData(destinationViewId: string, requestId: number, dataItemId: string): Promise<VSBuffer>;
+    $disposeTree(treeViewId: string): Promise<void>;
+    private reveal;
+    private registerListeners;
+    private getTreeView;
+    dispose(): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { Extensions, NoTreeViewError, ResolvableTreeItem } from 'vscode/vscode/vs/workbench/common/views';
@@ -235,18 +236,35 @@ class TreeViewDataProvider {
         this.itemsMap = ( new Map());
         this.hasResolve = this._proxy.$hasResolve(this.treeViewId);
     }
-    getChildren(treeItem) {
-        if (!treeItem) {
+    async getChildren(treeItem) {
+        const batches = await this.getChildrenBatch(treeItem ? [treeItem] : undefined);
+        return batches?.[0];
+    }
+    getChildrenBatch(treeItems) {
+        if (!treeItems) {
             this.itemsMap.clear();
         }
-        return this._proxy.$getChildren(this.treeViewId, treeItem ? treeItem.handle : undefined)
-            .then(children => this.postGetChildren(children), err => {
+        return this._proxy.$getChildren(this.treeViewId, treeItems ? ( treeItems.map(item => item.handle)) : undefined)
+            .then(children => {
+            const convertedChildren = this.convertTransferChildren(treeItems ?? [], children);
+            return this.postGetChildren(convertedChildren);
+        }, err => {
             if (!NoTreeViewError.is(err)) {
                 this.notificationService.error(err);
             }
             return [];
         });
     }
+    convertTransferChildren(parents, children) {
+        const convertedChildren = Array(parents.length);
+        if (children) {
+            for (const childGroup of children) {
+                const childGroupIndex = childGroup[0];
+                convertedChildren[childGroupIndex] = childGroup.slice(1);
+            }
+        }
+        return convertedChildren;
+    }
     getItemsToRefresh(itemsToRefreshByHandle) {
         const itemsToRefresh = [];
         const checkboxesToRefresh = [];
@@ -281,22 +299,29 @@ class TreeViewDataProvider {
     isEmpty() {
         return this.itemsMap.size === 0;
     }
-    async postGetChildren(elements) {
-        if (elements === undefined) {
+    async postGetChildren(elementGroups) {
+        if (elementGroups === undefined) {
             return undefined;
         }
-        const result = [];
+        const resultGroups = [];
         const hasResolve = await this.hasResolve;
-        if (elements) {
-            for (const element of elements) {
-                const resolvable = ( new ResolvableTreeItem(element, hasResolve ? (token) => {
-                    return this._proxy.$resolve(this.treeViewId, element.handle, token);
-                } : undefined));
-                this.itemsMap.set(element.handle, resolvable);
-                result.push(resolvable);
+        if (elementGroups) {
+            for (const elements of elementGroups) {
+                const result = [];
+                resultGroups.push(result);
+                if (!elements) {
+                    continue;
+                }
+                for (const element of elements) {
+                    const resolvable = ( new ResolvableTreeItem(element, hasResolve ? (token) => {
+                        return this._proxy.$resolve(this.treeViewId, element.handle, token);
+                    } : undefined));
+                    this.itemsMap.set(element.handle, resolvable);
+                    result.push(resolvable);
+                }
             }
         }
-        return result;
+        return resultGroups;
     }
     updateTreeItem(current, treeItem) {
         treeItem.children = treeItem.children ? treeItem.children : undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.d.ts

@@ -0,0 +1,44 @@
+import { MainThreadTunnelServiceShape, CandidatePortSource, PortAttributesSelector, TunnelDto } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IRemoteExplorerService } from "vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service";
+import { TunnelProviderFeatures, TunnelOptions, ProvidedPortAttributes, PortAttributesProvider } from "vscode/vscode/vs/platform/tunnel/common/tunnel";
+import { ITunnelService } from "vscode/vscode/vs/platform/tunnel/common/tunnel.service";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import type { TunnelDescription } from "vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IRemoteAgentService } from "vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { CandidatePort } from "vscode/vscode/vs/workbench/services/remote/common/tunnelModel";
+export declare class MainThreadTunnelService extends Disposable implements MainThreadTunnelServiceShape, PortAttributesProvider {
+    private readonly remoteExplorerService;
+    private readonly tunnelService;
+    private readonly notificationService;
+    private readonly configurationService;
+    private readonly logService;
+    private readonly remoteAgentService;
+    private readonly contextKeyService;
+    private readonly _proxy;
+    private elevateionRetry;
+    private portsAttributesProviders;
+    constructor(extHostContext: IExtHostContext, remoteExplorerService: IRemoteExplorerService, tunnelService: ITunnelService, notificationService: INotificationService, configurationService: IConfigurationService, logService: ILogService, remoteAgentService: IRemoteAgentService, contextKeyService: IContextKeyService);
+    private processFindingEnabled;
+    $setRemoteTunnelService(processId: number): Promise<void>;
+    private _alreadyRegistered;
+    $registerPortsAttributesProvider(selector: PortAttributesSelector, providerHandle: number): Promise<void>;
+    $unregisterPortsAttributesProvider(providerHandle: number): Promise<void>;
+    providePortAttributes(ports: number[], pid: number | undefined, commandLine: string | undefined, token: CancellationToken): Promise<ProvidedPortAttributes[]>;
+    $openTunnel(tunnelOptions: TunnelOptions, source: string): Promise<TunnelDto | undefined>;
+    private elevationPrompt;
+    $closeTunnel(remote: {
+        host: string;
+        port: number;
+    }): Promise<void>;
+    $getTunnels(): Promise<TunnelDescription[]>;
+    $onFoundNewCandidates(candidates: CandidatePort[]): Promise<void>;
+    $setTunnelProvider(features: TunnelProviderFeatures | undefined, isResolver: boolean): Promise<void>;
+    $setCandidateFilter(): Promise<void>;
+    $setCandidatePortSource(source: CandidatePortSource): Promise<void>;
+}