@codingame/monaco-vscode-api 19.1.4 → 20.0.0

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

@@ -13,7 +13,7 @@ import { McpServerLaunch, McpServerTransportType, McpConnectionState, extensionP
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { McpServerDefinition } from './extHostTypeConverters.js';
-import { parseWWWAuthenticateHeader, getMetadataWithDefaultValues, getDefaultMetadataForUrl, isAuthorizationProtectedResourceMetadata, getResourceServerBaseUrlFromDiscoveryUrl, AUTH_SERVER_METADATA_DISCOVERY_PATH, isAuthorizationServerMetadata } from '../../../base/common/oauth.js';
+import { parseWWWAuthenticateHeader, getDefaultMetadataForUrl, isAuthorizationProtectedResourceMetadata, AUTH_SERVER_METADATA_DISCOVERY_PATH, OPENID_CONNECT_DISCOVERY_PATH, isAuthorizationServerMetadata } from '../../../base/common/oauth.js';
 import { URI } from '../../../base/common/uri.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { CancellationError } from '../../../base/common/errors.js';
@@ -101,7 +101,7 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
                 servers.push({
                     id,
                     label: item.label,
-                    cacheNonce: item.version,
+                    cacheNonce: item.version || '$$NONE',
                     launch: McpServerDefinition.from(item),
                 });
             }
@@ -163,20 +163,26 @@ class McpHTTPHandle extends Disposable {
     }
     async send(message) {
         try {
-            await this._requestSequencer.queue(() => {
-                if (this._mode.value === HttpMode.SSE) {
-                    return this._sendLegacySSE(this._mode.endpoint, message);
-                }
-                else {
-                    return this._sendStreamableHttp(message, this._mode.value === HttpMode.Http ? this._mode.sessionId : undefined);
-                }
-            });
+            if (this._mode.value === HttpMode.Unknown) {
+                await this._requestSequencer.queue(() => this._send(message));
+            }
+            else {
+                await this._send(message);
+            }
         }
         catch (err) {
             const msg = `Error sending message to ${this._launch.uri}: ${String(err)}`;
             this._proxy.$onDidChangeState(this._id, { state: McpConnectionState.Kind.Error, message: msg });
         }
     }
+    _send(message) {
+        if (this._mode.value === HttpMode.SSE) {
+            return this._sendLegacySSE(this._mode.endpoint, message);
+        }
+        else {
+            return this._sendStreamableHttp(message, this._mode.value === HttpMode.Http ? this._mode.sessionId : undefined);
+        }
+    }
     async _sendStreamableHttp(message, sessionId) {
         const asBytes = ( new TextEncoder()).encode(message);
         const headers = {
@@ -221,7 +227,7 @@ class McpHTTPHandle extends Disposable {
         if (wasUnknown) {
             this._attachStreamableBackchannel();
         }
-        this._handleSuccessfulStreamableHttp(res, message);
+        await this._handleSuccessfulStreamableHttp(res, message);
     }
     async _sseFallbackWithMessage(message) {
         const endpoint = await this._attachSSE();
@@ -230,7 +236,7 @@ class McpHTTPHandle extends Disposable {
             await this._sendLegacySSE(endpoint, message);
         }
     }
-    async _populateAuthMetadata(originalResponse) {
+    async _populateAuthMetadata(url, originalResponse) {
         let resourceMetadataChallenge;
         if (( originalResponse.headers.has('WWW-Authenticate'))) {
             const authHeader = originalResponse.headers.get('WWW-Authenticate');
@@ -244,6 +250,11 @@ class McpHTTPHandle extends Disposable {
         let resource;
         if (resourceMetadataChallenge) {
             const resourceMetadata = await this._getResourceMetadata(resourceMetadataChallenge);
+            if (( ( new URL(resourceMetadata.resource)).toString()) !== ( ( new URL(url)).toString())) {
+                throw ( new Error(
+                    `Protected Resource Metadata resource "${resourceMetadata.resource}" does not match MCP server resolved resource "${url}". The MCP server must follow OAuth spec https://datatracker.ietf.org/doc/html/rfc9728#PRConfigurationValidation`
+                ));
+            }
             serverMetadataUrl = resourceMetadata.authorization_servers?.[0];
             scopesSupported = resourceMetadata.scopes_supported;
             resource = resourceMetadata;
@@ -258,10 +269,9 @@ class McpHTTPHandle extends Disposable {
         }
         try {
             const serverMetadataResponse = await this._getAuthorizationServerMetadata(serverMetadataUrl, addtionalHeaders);
-            const serverMetadataWithDefaults = getMetadataWithDefaultValues(serverMetadataResponse);
             this._authMetadata = {
                 authorizationServer: ( URI.parse(serverMetadataUrl)),
-                serverMetadata: serverMetadataWithDefaults,
+                serverMetadata: serverMetadataResponse,
                 resourceMetadata: resource
             };
             return;
@@ -301,12 +311,6 @@ class McpHTTPHandle extends Disposable {
         }
         const body = await resourceMetadataResponse.json();
         if (isAuthorizationProtectedResourceMetadata(body)) {
-            const resolvedResource = getResourceServerBaseUrlFromDiscoveryUrl(resourceMetadata);
-            if (body.resource !== resolvedResource) {
-                throw ( new Error(
-                    `Protected Resource Metadata resource "${body.resource}" does not match MCP server resolved resource "${resolvedResource}". The MCP server must follow OAuth spec https://datatracker.ietf.org/doc/html/rfc9728#PRConfigurationValidation`
-                ));
-            }
             return body;
         }
         else {
@@ -326,7 +330,8 @@ class McpHTTPHandle extends Disposable {
             }
         });
         if (authServerMetadataResponse.status !== 200) {
-            authServerMetadataResponse = await this._fetch(( URI.joinPath(( URI.parse(authorizationServer)), '.well-known', 'openid-configuration').toString(true)), {
+            const openidPathInsertionUrl = ( ( new URL(OPENID_CONNECT_DISCOVERY_PATH, authorizationServer)).toString()) + extraPath;
+            authServerMetadataResponse = await this._fetch(openidPathInsertionUrl, {
                 method: 'GET',
                 headers: {
                     ...addtionalHeaders,
@@ -335,9 +340,19 @@ class McpHTTPHandle extends Disposable {
                 }
             });
             if (authServerMetadataResponse.status !== 200) {
-                throw ( new Error(
-                    `Failed to fetch authorization server metadata: ${authServerMetadataResponse.status} ${await this._getErrText(authServerMetadataResponse)}`
-                ));
+                authServerMetadataResponse = await this._fetch(( URI.joinPath(( URI.parse(authorizationServer)), OPENID_CONNECT_DISCOVERY_PATH).toString(true)), {
+                    method: 'GET',
+                    headers: {
+                        ...addtionalHeaders,
+                        'Accept': 'application/json',
+                        'MCP-Protocol-Version': MCP.LATEST_PROTOCOL_VERSION
+                    }
+                });
+                if (authServerMetadataResponse.status !== 200) {
+                    throw ( new Error(
+                        `Failed to fetch authorization server metadata: ${authServerMetadataResponse.status} ${await this._getErrText(authServerMetadataResponse)}`
+                    ));
+                }
             }
         }
         const body = await authServerMetadataResponse.json();
@@ -542,7 +557,7 @@ class McpHTTPHandle extends Disposable {
         let res = await doFetch();
         if (res.status === 401) {
             if (!this._authMetadata) {
-                await this._populateAuthMetadata(res);
+                await this._populateAuthMetadata(url, res);
                 await this._addAuthHeader(headers);
                 if (headers['Authorization']) {
                     init.headers = headers;

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

@@ -262,7 +262,7 @@ class ExtHostNotebookController {
             ));
         }
         if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
-            throw new FileOperationError(( localize(2604, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
+            throw new FileOperationError(( localize(2631, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
         }
         const data = {
             metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
@@ -434,7 +434,7 @@ class ExtHostNotebookController {
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
             typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
-            throw new FileOperationError(( localize(2605, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(( localize(2632, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }

package/vscode/src/vs/workbench/api/common/extHostSCM.d.ts

@@ -43,7 +43,6 @@ export declare class ExtHostSCM implements ExtHostSCMShape {
     private _commands;
     private _extHostDocuments;
     private readonly logService;
-    private static _handlePool;
     private _proxy;
     private readonly _telemetry;
     private _sourceControls;
@@ -52,7 +51,7 @@ export declare class ExtHostSCM implements ExtHostSCMShape {
     get onDidChangeActiveProvider(): Event<vscode.SourceControl>;
     private _selectedSourceControlHandle;
     constructor(mainContext: IMainContext, _commands: ExtHostCommands, _extHostDocuments: ExtHostDocuments, logService: ILogService);
-    createSourceControl(extension: IExtensionDescription, id: string, label: string, rootUri: vscode.Uri | undefined): vscode.SourceControl;
+    createSourceControl(extension: IExtensionDescription, id: string, label: string, rootUri: vscode.Uri | undefined, iconPath: vscode.IconPath | undefined, parent: vscode.SourceControl | undefined): vscode.SourceControl;
     getLastInputBox(extension: IExtensionDescription): ExtHostSCMInputBox | undefined;
     $provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Promise<UriComponents | null>;
     $provideSecondaryOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Promise<UriComponents | null>;

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

@@ -17,8 +17,8 @@ import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/ex
 import { Schemas } from '../../../base/common/network.js';
 import { isLinux } from '../../../base/common/platform.js';
 import { structuralEquals } from '../../../base/common/equals.js';
+import { Iterable } from '../../../base/common/iterator.js';
 
-var ExtHostSCM_1;
 function isUri(thing) {
     return thing instanceof URI;
 }
@@ -453,6 +453,18 @@ class ExtHostSourceControl {
     get rootUri() {
         return this._rootUri;
     }
+    get contextValue() {
+        checkProposedApiEnabled(this._extension, 'scmProviderOptions');
+        return this._contextValue;
+    }
+    set contextValue(contextValue) {
+        checkProposedApiEnabled(this._extension, 'scmProviderOptions');
+        if (this._contextValue === contextValue) {
+            return;
+        }
+        this._contextValue = contextValue;
+        this.#proxy.$updateSourceControl(this.handle, { contextValue });
+    }
     get inputBox() { return this._inputBox; }
     get count() {
         return this._count;
@@ -574,13 +586,16 @@ class ExtHostSourceControl {
     get selected() {
         return this._selected;
     }
-    constructor(_extension, _extHostDocuments, proxy, _commands, _id, _label, _rootUri) {
+    constructor(_extension, _extHostDocuments, proxy, _commands, _id, _label, _rootUri, _iconPath, _parent) {
         this._extension = _extension;
         this._commands = _commands;
         this._id = _id;
         this._label = _label;
         this._rootUri = _rootUri;
+        this._onDidDispose = ( new Emitter());
+        this.onDidDispose = this._onDidDispose.event;
         this._groups = ( new Map());
+        this._contextValue = undefined;
         this._count = undefined;
         this._quickDiffProvider = undefined;
         this._secondaryQuickDiffProvider = undefined;
@@ -610,7 +625,8 @@ class ExtHostSourceControl {
             this.handle,
             inputBoxDocumentUri
         ));
-        this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri);
+        this.#proxy.$registerSourceControl(this.handle, _parent?.handle, _id, _label, _rootUri, getHistoryItemIconDto(_iconPath), inputBoxDocumentUri);
+        this.onDidDisposeParent = _parent ? _parent.onDidDispose : Event.None;
     }
     createResourceGroup(id, label, options) {
         const multiDiffEditorEnableViewChanges = isProposedApiEnabled(this._extension, 'scmMultiDiffEditor') && options?.multiDiffEditorEnableViewChanges === true;
@@ -680,6 +696,8 @@ class ExtHostSourceControl {
         this._statusBarDisposables.dispose();
         this._groups.forEach(group => group.dispose());
         this.#proxy.$unregisterSourceControl(this.handle);
+        this._onDidDispose.fire();
+        this._onDidDispose.dispose();
     }
 }
 ExtHostSourceControl.__decorator = ( __decorate([
@@ -689,8 +707,6 @@ ExtHostSourceControl.__decorator = ( __decorate([
     debounce(100)
 ], ExtHostSourceControl.prototype, "eventuallyUpdateResourceStates", null));
 let ExtHostSCM = class ExtHostSCM {
-    static { ExtHostSCM_1 = this; }
-    static { this._handlePool = 0; }
     get onDidChangeActiveProvider() { return this._onDidChangeActiveProvider.event; }
     constructor(mainContext, _commands, _extHostDocuments, logService) {
         this._commands = _commands;
@@ -732,12 +748,12 @@ let ExtHostSCM = class ExtHostSCM {
             }
         });
     }
-    createSourceControl(extension, id, label, rootUri) {
+    createSourceControl(extension, id, label, rootUri, iconPath, parent) {
         this.logService.trace('ExtHostSCM#createSourceControl', extension.identifier.value, id, label, rootUri);
         this._telemetry.$publicLog2('api/scm/createSourceControl', {
             extensionId: extension.identifier.value,
         });
-        const handle = ExtHostSCM_1._handlePool++;
+        const parentSourceControl = parent ? Iterable.find(( this._sourceControls.values()), s => s === parent) : undefined;
         const sourceControl = ( new ExtHostSourceControl(
             extension,
             this._extHostDocuments,
@@ -745,9 +761,11 @@ let ExtHostSCM = class ExtHostSCM {
             this._commands,
             id,
             label,
-            rootUri
+            rootUri,
+            iconPath,
+            parentSourceControl
         ));
-        this._sourceControls.set(handle, sourceControl);
+        this._sourceControls.set(sourceControl.handle, sourceControl);
         const sourceControls = this._sourceControlsByExtension.get(extension.identifier) || [];
         sourceControls.push(sourceControl);
         this._sourceControlsByExtension.set(extension.identifier, sourceControls);
@@ -887,7 +905,7 @@ let ExtHostSCM = class ExtHostSCM {
         }
     }
 };
-ExtHostSCM = ExtHostSCM_1 = ( __decorate([
+ExtHostSCM = ( __decorate([
     ( __param(3, ILogService))
 ], ExtHostSCM));
 

package/vscode/src/vs/workbench/api/common/extHostSecretState.d.ts

@@ -15,6 +15,7 @@ export declare class ExtHostSecretState implements ExtHostSecretStateShape {
     get(extensionId: string, key: string): Promise<string | undefined>;
     store(extensionId: string, key: string, value: string): Promise<void>;
     delete(extensionId: string, key: string): Promise<void>;
+    keys(extensionId: string): Promise<string[]>;
 }
 export interface IExtHostSecretState extends ExtHostSecretState {
 }

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

@@ -21,6 +21,9 @@ class ExtHostSecretState {
     delete(extensionId, key) {
         return this._proxy.$deletePassword(extensionId, key);
     }
+    keys(extensionId) {
+        return this._proxy.$getKeys(extensionId);
+    }
 }
 const IExtHostSecretState = ( createDecorator('IExtHostSecretState'));
 

package/vscode/src/vs/workbench/api/common/extHostSecrets.d.ts

@@ -5,6 +5,7 @@ import { Event } from "../../../base/common/event.js";
 import { DisposableStore } from "../../../base/common/lifecycle.js";
 export declare class ExtensionSecrets implements vscode.SecretStorage {
     #private;
+    private readonly _extensionDescription;
     protected readonly _id: string;
     readonly onDidChange: Event<vscode.SecretStorageChangeEvent>;
     readonly disposables: DisposableStore;
@@ -13,4 +14,5 @@ export declare class ExtensionSecrets implements vscode.SecretStorage {
     get(key: string): Promise<string | undefined>;
     store(key: string, value: string): Promise<void>;
     delete(key: string): Promise<void>;
+    keys(): Promise<string[]>;
 }

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

@@ -2,11 +2,13 @@
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { Event } from '../../../base/common/event.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 class ExtensionSecrets {
     #secretState;
     constructor(extensionDescription, secretState) {
         this.disposables = ( new DisposableStore());
+        this._extensionDescription = extensionDescription;
         this._id = ExtensionIdentifier.toKey(extensionDescription.identifier);
         this.#secretState = secretState;
         this.onDidChange = ( Event.map(
@@ -27,6 +29,10 @@ class ExtensionSecrets {
     delete(key) {
         return this.#secretState.delete(this._id, key);
     }
+    keys() {
+        checkProposedApiEnabled(this._extensionDescription, 'secretStorageKeys');
+        return ( this.#secretState.keys(this._id)) || [];
+    }
 }
 
 export { ExtensionSecrets };

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

@@ -188,7 +188,7 @@ class ExtHostStatusBarEntry {
             }
             else {
                 name = ( localize(
-                    2606,
+                    2633,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -221,7 +221,7 @@ class StatusBarMessage {
     constructor(statusBar) {
         this._messages = [];
         this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', StatusBarAlignment.Left, Number.MIN_VALUE);
-        this._item.name = ( localize(2607, "Extension Status"));
+        this._item.name = ( localize(2634, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

package/vscode/src/vs/workbench/api/common/extHostTask.d.ts

@@ -46,11 +46,14 @@ declare class TaskExecutionImpl implements vscode.TaskExecution {
     #private;
     readonly _id: string;
     private readonly _task;
+    private _terminal;
     constructor(tasks: ExtHostTaskBase, _id: string, _task: vscode.Task);
     get task(): vscode.Task;
     terminate(): void;
     fireDidStartProcess(value: tasks.ITaskProcessStartedDTO): void;
     fireDidEndProcess(value: tasks.ITaskProcessEndedDTO): void;
+    get terminal(): vscode.Terminal | undefined;
+    set terminal(term: vscode.Terminal | undefined);
 }
 export interface HandlerData {
     type: string;

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

@@ -377,6 +377,12 @@ class TaskExecutionImpl {
     }
     fireDidEndProcess(value) {
     }
+    get terminal() {
+        return this._terminal;
+    }
+    set terminal(term) {
+        this._terminal = term;
+    }
 }
 let ExtHostTaskBase = class ExtHostTaskBase {
     constructor(extHostRpc, initData, workspaceService, editorService, configurationService, extHostTerminalService, logService, deprecationService) {
@@ -450,8 +456,13 @@ let ExtHostTaskBase = class ExtHostTaskBase {
             this._terminalService.attachPtyToTerminal(terminalId, await customExecution.callback(resolvedDefinition));
         }
         this._lastStartedTask = execution.id;
+        const taskExecution = await this.getTaskExecution(execution);
+        const terminal = this._terminalService.getTerminalById(terminalId)?.value;
+        if (taskExecution) {
+            taskExecution.terminal = terminal;
+        }
         this._onDidExecuteTask.fire({
-            execution: await this.getTaskExecution(execution)
+            execution: taskExecution
         });
     }
     get onDidEndTask() {

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

@@ -28,7 +28,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         const id = initData.remote.isRemote ? 'remoteExtHostTelemetry' : isWorker ? 'workerExtHostTelemetry' : 'extHostTelemetry';
         this._outputLogger = this._register(loggerService.createLogger(id, {
             name: ( localize(
-                2608,
+                2635,
                 "Extension Telemetry{0}",
                 this._inLoggingOnlyMode ? ' (Not Sent)' : ''
             )),

package/vscode/src/vs/workbench/api/common/extHostTerminalService.d.ts

@@ -6,7 +6,7 @@ import { IExtHostRpcService } from "./extHostRpcService.js";
 import { IDisposable, Disposable } from "../../../base/common/lifecycle.js";
 import { TerminalExitReason, TerminalCompletionItem } from "./extHostTypes.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
-import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableMutator, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
+import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableMutator, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
 import { ICreateContributedTerminalProfileOptions, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation, TerminalShellType } from "../../../platform/terminal/common/terminal.js";
 import { ThemeColor } from "../../../base/common/themables.js";
 import { IExtHostCommands } from "./extHostCommands.js";

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

@@ -485,7 +485,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localize(2609, "Could not find the terminal with id {0} on the extension host", id)) };
+            return { message: ( localize(2636, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( new Promise(r => {

package/vscode/src/vs/workbench/api/common/extHostTreeViews.d.ts

@@ -8,16 +8,16 @@ import { IExtensionDescription } from "../../../platform/extensions/common/exten
 import { CancellationToken } from "../../../base/common/cancellation.js";
 export declare class ExtHostTreeViews extends Disposable implements ExtHostTreeViewsShape {
     private _proxy;
-    private commands;
-    private logService;
-    private treeViews;
-    private treeDragAndDropService;
-    constructor(_proxy: MainThreadTreeViewsShape, commands: ExtHostCommands, logService: ILogService);
+    private _commands;
+    private _logService;
+    private _treeViews;
+    private _treeDragAndDropService;
+    constructor(_proxy: MainThreadTreeViewsShape, _commands: ExtHostCommands, _logService: ILogService);
     registerTreeDataProvider<T>(id: string, treeDataProvider: vscode.TreeDataProvider<T>, extension: IExtensionDescription): vscode.Disposable;
     createTreeView<T>(viewId: string, options: vscode.TreeViewOptions<T>, extension: IExtensionDescription): vscode.TreeView<T>;
     $getChildren(treeViewId: string, treeItemHandles?: string[]): Promise<(number | ITreeItem)[][] | undefined>;
     $handleDrop(destinationViewId: string, requestId: number, treeDataTransferDTO: DataTransferDTO, targetItemHandle: string | undefined, token: CancellationToken, operationUuid?: string, sourceViewId?: string, sourceTreeItemHandles?: string[]): Promise<void>;
-    private addAdditionalTransferItems;
+    private _addAdditionalTransferItems;
     $handleDrag(sourceViewId: string, sourceTreeItemHandles: string[], operationUuid: string, token: CancellationToken): Promise<DataTransferDTO | undefined>;
     $hasResolve(treeViewId: string): Promise<boolean>;
     $resolve(treeViewId: string, treeItemHandle: string, token: vscode.CancellationToken): Promise<ITreeItem | undefined>;
@@ -25,6 +25,6 @@ export declare class ExtHostTreeViews extends Disposable implements ExtHostTreeV
     $setSelectionAndFocus(treeViewId: string, selectedHandles: string[], focusedHandle: string): void;
     $setVisible(treeViewId: string, isVisible: boolean): void;
     $changeCheckboxState(treeViewId: string, checkboxUpdate: CheckboxUpdate[]): void;
-    private createExtHostTreeView;
-    private convertArgument;
+    private _createExtHostTreeView;
+    private _convertArgument;
 }