@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -1,12 +1,12 @@
 import { URI } from '../../../base/common/uri.js';
 import { mixin, equals } from '../../../base/common/objects.js';
-import { Range, Selection as Selection$1, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
+import { Selection as Selection$1, Range, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
 import { CodeActionKind, Disposable, SyntaxTokenType, DocumentSymbol, Range as Range$2, InternalDataTransferItem, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, Location, CompletionList, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from './extHostTypes.js';
 import { InlineCompletionTriggerKind } from '../../../editor/common/languages.js';
 import { MainContext } from './extHost.protocol.js';
 import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
 import { Range as Range$1 } from '../../../editor/common/core/range.js';
-import { isNonEmptyArray, isFalsyOrEmpty, coalesce } from '../../../base/common/arrays.js';
+import { isNonEmptyArray, coalesce, isFalsyOrEmpty } from '../../../base/common/arrays.js';
 import { assertType, isObject } from '../../../base/common/types.js';
 import { Selection } from '../../../editor/common/core/selection.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
@@ -78,11 +78,13 @@ class DocumentSymbolAdapter {
     }
 }
 class CodeLensAdapter {
-    static { this._badCmd = { command: 'missing', title: '!!MISSING: command!!' }; }
-    constructor(_documents, _commands, _provider) {
+    constructor(_documents, _commands, _provider, _extension, _extTelemetry, _logService) {
         this._documents = _documents;
         this._commands = _commands;
         this._provider = _provider;
+        this._extension = _extension;
+        this._extTelemetry = _extTelemetry;
+        this._logService = _logService;
         this._cache = ( new Cache('CodeLens'));
         this._disposables = ( new Map());
     }
@@ -130,7 +132,15 @@ class CodeLensAdapter {
         if (!disposables) {
             return undefined;
         }
-        symbol.command = this._commands.toInternal(resolvedLens.command ?? CodeLensAdapter._badCmd, disposables);
+        if (!resolvedLens.command) {
+            const error = ( new Error(
+                'INVALID code lens resolved, lacks command: ' + this._extension.identifier.value
+            ));
+            this._extTelemetry.onExtensionError(this._extension.identifier, error);
+            this._logService.error(error);
+            return undefined;
+        }
+        symbol.command = this._commands.toInternal(resolvedLens.command, disposables);
         return symbol;
     }
     releaseCodeLenses(cachedId) {
@@ -372,6 +382,7 @@ class CodeActionAdapter {
                         this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
                     }
                 }
+                const range = candidate.ranges ?? [];
                 actions.push({
                     cacheId: [cacheId, i],
                     title: candidate.title,
@@ -381,6 +392,7 @@ class CodeActionAdapter {
                     kind: candidate.kind && candidate.kind.value,
                     isPreferred: candidate.isPreferred,
                     isAI: isProposedApiEnabled(this._extension, 'codeActionAI') ? candidate.isAI : false,
+                    ranges: isProposedApiEnabled(this._extension, 'codeActionRanges') ? coalesce(( range.map(Range.from))) : undefined,
                     disabled: candidate.disabled?.reason
                 });
             }
@@ -1181,17 +1193,25 @@ class InlayHintsAdapter {
             result.label = hint.label;
         }
         else {
-            result.label = ( hint.label.map(part => {
-                const result = { label: part.value };
-                result.tooltip = MarkdownString.fromStrict(part.tooltip);
+            const parts = [];
+            result.label = parts;
+            for (const part of hint.label) {
+                if (!part.value) {
+                    console.warn('INVALID inlay hint, empty label part', this._extension.identifier.value);
+                    continue;
+                }
+                const part2 = {
+                    label: part.value,
+                    tooltip: MarkdownString.fromStrict(part.tooltip)
+                };
                 if (Location.isLocation(part.location)) {
-                    result.location = location.from(part.location);
+                    part2.location = location.from(part.location);
                 }
                 if (part.command) {
-                    result.command = this._commands.toInternal(part.command, disposables);
+                    part2.command = this._commands.toInternal(part.command, disposables);
                 }
-                return result;
-            }));
+                parts.push(part2);
+            }
         }
         return result;
     }
@@ -1603,7 +1623,14 @@ class ExtHostLanguageFeatures {
     registerCodeLensProvider(extension, selector, provider) {
         const handle = this._nextHandle();
         const eventHandle = typeof provider.onDidChangeCodeLenses === 'function' ? this._nextHandle() : undefined;
-        this._adapter.set(handle, ( new AdapterData(( new CodeLensAdapter(this._documents, this._commands.converter, provider)), extension)));
+        this._adapter.set(handle, ( new AdapterData(( new CodeLensAdapter(
+            this._documents,
+            this._commands.converter,
+            provider,
+            extension,
+            this._extensionTelemetry,
+            this._logService
+        )), extension)));
         this._proxy.$registerCodeLensSupport(handle, this._transformDocumentSelector(selector, extension), eventHandle);
         let result = this._createDisposable(handle);
         if (eventHandle !== undefined) {

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

@@ -28,6 +28,7 @@ let ExtHostMessageService = class ExtHostMessageService {
             checkProposedApiEnabled(extension, 'resolvers');
         }
         const commands = [];
+        let hasCloseAffordance = false;
         for (let handle = 0; handle < items.length; handle++) {
             const command = items[handle];
             if (typeof command === 'string') {
@@ -36,9 +37,17 @@ let ExtHostMessageService = class ExtHostMessageService {
             else if (typeof command === 'object') {
                 const { title, isCloseAffordance } = command;
                 commands.push({ title, isCloseAffordance: !!isCloseAffordance, handle });
+                if (isCloseAffordance) {
+                    if (hasCloseAffordance) {
+                        this._logService.warn(`[${extension.identifier}] Only one message item can have 'isCloseAffordance':`, command);
+                    }
+                    else {
+                        hasCloseAffordance = true;
+                    }
+                }
             }
             else {
-                this._logService.warn('Invalid message item:', command);
+                this._logService.warn(`[${extension.identifier}] Invalid message item:`, command);
             }
         }
         return this._proxy.$showMessage(severity, message, options, commands).then(handle => {

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

@@ -15,7 +15,6 @@ import { Disposable, NotebookCellData } from './extHostTypes.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { ExtHostNotebookDocument, ExtHostCell } from './extHostNotebookDocument.js';
 import { ExtHostNotebookEditor } from './extHostNotebookEditor.js';
-import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 import { filter } from '../../../base/common/objects.js';
 import { Schemas } from '../../../base/common/network.js';
 import { CellSearchModel } from '../../contrib/search/common/cellSearchModel.js';
@@ -37,14 +36,14 @@ class ExtHostNotebookController {
         this._notebookStatusBarItemProviders = ( new Map());
         this._documents = ( new ResourceMap());
         this._editors = ( new Map());
-        this._onDidChangeActiveNotebookEditor = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
+        this._onDidChangeActiveNotebookEditor = ( new Emitter());
         this.onDidChangeActiveNotebookEditor = this._onDidChangeActiveNotebookEditor.event;
         this._visibleNotebookEditors = [];
-        this._onDidOpenNotebookDocument = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
+        this._onDidOpenNotebookDocument = ( new Emitter());
         this.onDidOpenNotebookDocument = this._onDidOpenNotebookDocument.event;
-        this._onDidCloseNotebookDocument = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
+        this._onDidCloseNotebookDocument = ( new Emitter());
         this.onDidCloseNotebookDocument = this._onDidCloseNotebookDocument.event;
-        this._onDidChangeVisibleNotebookEditors = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
+        this._onDidChangeVisibleNotebookEditors = ( new Emitter());
         this.onDidChangeVisibleNotebookEditors = this._onDidChangeVisibleNotebookEditors.event;
         this._statusBarCache = ( new Cache('NotebookCellStatusBarCache'));
         this._handlePool = 0;
@@ -294,8 +293,13 @@ class ExtHostNotebookController {
         const runFileQueries = async (includes, token, textQuery) => {
             await Promise.all(( includes.map(async (include) => await Promise.all(( include.filenamePatterns.map(filePattern => {
                 const query = {
-                    ...textQuery,
-                    ...{ type: 1 , filePattern }
+                    _reason: textQuery._reason,
+                    folderQueries: textQuery.folderQueries,
+                    includePattern: textQuery.includePattern,
+                    excludePattern: textQuery.excludePattern,
+                    maxResults: textQuery.maxResults,
+                    type: 1 ,
+                    filePattern
                 };
                 return this._extHostSearch.doInternalFileSearchWithCustomCallback(query, token, (data) => {
                     data.forEach(uri => {

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 import { Emitter } from '../../../base/common/event.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { NotebookRange, ViewColumn } from './extHostTypeConverters.js';
@@ -7,8 +6,8 @@ let ExtHostNotebookEditors = class ExtHostNotebookEditors {
     constructor(_logService, _notebooksAndEditors) {
         this._logService = _logService;
         this._notebooksAndEditors = _notebooksAndEditors;
-        this._onDidChangeNotebookEditorSelection = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
-        this._onDidChangeNotebookEditorVisibleRanges = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
+        this._onDidChangeNotebookEditorSelection = ( new Emitter());
+        this._onDidChangeNotebookEditorVisibleRanges = ( new Emitter());
         this.onDidChangeNotebookEditorSelection = this._onDidChangeNotebookEditorSelection.event;
         this.onDidChangeNotebookEditorVisibleRanges = this._onDidChangeNotebookEditorVisibleRanges.event;
     }

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

@@ -16,6 +16,7 @@ import { asWebviewUri } from '../../contrib/webview/common/webview.js';
 import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { variablePageSize } from '../../contrib/notebook/common/notebookKernelService.js';
 let ExtHostNotebookKernels = class ExtHostNotebookKernels {
     constructor(mainContext, _initData, _extHostNotebook, _commands, _logService) {
         this._initData = _initData;
@@ -32,6 +33,8 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
         this._handlePool = 0;
         this._onDidChangeCellExecutionState = ( new Emitter());
         this.onDidChangeNotebookCellExecutionState = this._onDidChangeCellExecutionState.event;
+        this.id = 0;
+        this.variableStore = {};
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadNotebookKernels));
         const selectKernelApiCommand = ( new ApiCommand(
             'notebook.selectKernel',
@@ -337,7 +340,7 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
             }
         }
     }
-    async $provideVariables(handle, requestId, notebookUri, parentName, kind, start, token) {
+    async $provideVariables(handle, requestId, notebookUri, parentId, kind, start, token) {
         const obj = this._kernelData.get(handle);
         if (!obj) {
             return;
@@ -347,14 +350,36 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
         if (!variableProvider) {
             return;
         }
-        const parent = parentName ? { name: parentName, value: '' } : undefined;
+        let parent = undefined;
+        if (parentId !== undefined) {
+            parent = this.variableStore[parentId];
+            if (!parent) {
+                return;
+            }
+        }
+        else {
+            this.variableStore = {};
+        }
         const requestKind = kind === 'named' ? NotebookVariablesRequestKind.Named : NotebookVariablesRequestKind.Indexed;
-        const variables = variableProvider.provideVariables(document.apiNotebook, parent, requestKind, start, token);
-        for await (const variable of variables) {
+        const variableResults = variableProvider.provideVariables(document.apiNotebook, parent, requestKind, start, token);
+        let resultCount = 0;
+        for await (const result of variableResults) {
             if (token.isCancellationRequested) {
                 return;
             }
+            const variable = {
+                id: this.id++,
+                name: result.variable.name,
+                value: result.variable.value,
+                type: result.variable.type,
+                hasNamedChildren: result.hasNamedChildren,
+                indexedChildrenCount: result.indexedChildrenCount
+            };
+            this.variableStore[variable.id] = result.variable;
             this._proxy.$receiveVariable(requestId, variable);
+            if (resultCount++ >= variablePageSize) {
+                return;
+            }
         }
     }
     $acceptKernelMessageFromRenderer(handle, editorId, message) {

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

@@ -8,7 +8,7 @@ class ExtHostProfileContentHandlers {
         this.handlers = ( new Map());
         this.proxy = ( mainContext.getProxy(MainContext.MainThreadProfileContentHandlers));
     }
-    registrProfileContentHandler(extension, id, handler) {
+    registerProfileContentHandler(extension, id, handler) {
         checkProposedApiEnabled(extension, 'profileContentHandlers');
         if (( this.handlers.has(id))) {
             throw new Error(`Handler with id '${id}' already registered`);

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

@@ -1,7 +1,6 @@
 import { __decorate } from '../../../../../../external/tslib/tslib.es6.js';
 import { ProgressLocation } from './extHostTypeConverters.js';
 import { Progress } from '../../../platform/progress/common/progress.js';
-import { localizeWithPath } from '../../../nls.js';
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { throttle } from '../../../base/common/decorators.js';
 import { onUnexpectedExternalError } from '../../../base/common/errors.js';
@@ -14,12 +13,7 @@ class ExtHostProgress {
     async withProgress(extension, options, task) {
         const handle = this._handles++;
         const { title, location, cancellable } = options;
-        const source = { label: ( localizeWithPath(
-            'vs/workbench/api/common/extHostProgress',
-            'extensionSource',
-            "{0} (Extension)",
-            extension.displayName || extension.name
-        )), id: extension.identifier.value };
+        const source = { label: extension.displayName || extension.name, id: extension.identifier.value };
         this._proxy.$startProgress(handle, { location: ProgressLocation.from(location), title, source, cancellable }, !extension.isUnderDevelopment ? extension.identifier.value : undefined).catch(onUnexpectedExternalError);
         return this._withProgress(handle, task, !!cancellable);
     }

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { URI } from '../../../base/common/uri.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { debounce } from '../../../base/common/decorators.js';
-import { DisposableStore, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { asPromise } from '../../../base/common/async.js';
 import { MainContext } from './extHost.protocol.js';
 import { sortedDiff, equals } from '../../../base/common/arrays.js';
@@ -41,21 +41,6 @@ function getIconResource(decorations) {
         return undefined;
     }
 }
-function getInputBoxActionButtonIcon(actionButton) {
-    if (!actionButton?.icon) {
-        return undefined;
-    }
-    else if (URI.isUri(actionButton.icon)) {
-        return actionButton.icon;
-    }
-    else if (ThemeIcon.isThemeIcon(actionButton.icon)) {
-        return actionButton.icon;
-    }
-    else {
-        const icon = actionButton.icon;
-        return { light: icon.light, dark: icon.dark };
-    }
-}
 function getHistoryItemIconDto(historyItem) {
     if (!historyItem.icon) {
         return undefined;
@@ -71,21 +56,6 @@ function getHistoryItemIconDto(historyItem) {
         return { light: icon.light, dark: icon.dark };
     }
 }
-function getSourceControlInputBoxValueProviderIcon(provider) {
-    if (!provider.icon) {
-        return undefined;
-    }
-    else if (URI.isUri(provider.icon)) {
-        return provider.icon;
-    }
-    else if (ThemeIcon.isThemeIcon(provider.icon)) {
-        return provider.icon;
-    }
-    else {
-        const icon = provider.icon;
-        return { light: icon.light, dark: icon.dark };
-    }
-}
 function compareResourceThemableDecorations(a, b) {
     if (!a.iconPath && !b.iconPath) {
         return 0;
@@ -207,6 +177,24 @@ function compareResourceStates(a, b) {
     else if (b.decorations) {
         return -1;
     }
+    if (a.multiFileDiffEditorModifiedUri && b.multiFileDiffEditorModifiedUri) {
+        result = comparePaths(a.multiFileDiffEditorModifiedUri.fsPath, b.multiFileDiffEditorModifiedUri.fsPath, true);
+    }
+    else if (a.multiFileDiffEditorModifiedUri) {
+        return 1;
+    }
+    else if (b.multiFileDiffEditorModifiedUri) {
+        return -1;
+    }
+    if (a.multiDiffEditorOriginalUri && b.multiDiffEditorOriginalUri) {
+        result = comparePaths(a.multiDiffEditorOriginalUri.fsPath, b.multiDiffEditorOriginalUri.fsPath, true);
+    }
+    else if (a.multiDiffEditorOriginalUri) {
+        return 1;
+    }
+    else if (b.multiDiffEditorOriginalUri) {
+        return -1;
+    }
     return result;
 }
 function compareArgs(a, b) {
@@ -281,29 +269,12 @@ class ExtHostSCMInputBox {
         this._visible = visible;
         this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible);
     }
-    get actionButton() {
-        checkProposedApiEnabled(this._extension, 'scmInputBoxActionButton');
-        return this._actionButton;
-    }
-    set actionButton(actionButton) {
-        checkProposedApiEnabled(this._extension, 'scmInputBoxActionButton');
-        this._actionButtonDisposables.value = ( new DisposableStore());
-        this._actionButton = actionButton;
-        const internal = actionButton !== undefined ?
-            {
-                command: this._commands.converter.toInternal(actionButton.command, this._actionButtonDisposables.value),
-                icon: getInputBoxActionButtonIcon(actionButton),
-                enabled: actionButton.enabled
-            } : undefined;
-        this.#proxy.$setInputBoxActionButton(this._sourceControlHandle, internal ?? null);
-    }
     get document() {
         checkProposedApiEnabled(this._extension, 'scmTextDocument');
         return this.#extHostDocuments.getDocument(this._documentUri);
     }
-    constructor(_extension, _commands, _extHostDocuments, proxy, _sourceControlHandle, _documentUri) {
+    constructor(_extension, _extHostDocuments, proxy, _sourceControlHandle, _documentUri) {
         this._extension = _extension;
-        this._commands = _commands;
         this._sourceControlHandle = _sourceControlHandle;
         this._documentUri = _documentUri;
         this._value = '';
@@ -311,7 +282,6 @@ class ExtHostSCMInputBox {
         this._placeholder = '';
         this._enabled = true;
         this._visible = true;
-        this._actionButtonDisposables = ( new MutableDisposable());
         this.#extHostDocuments = _extHostDocuments;
         this.#proxy = proxy;
     }
@@ -351,12 +321,14 @@ class ExtHostSourceControlResourceGroup {
         this._resourceStates = [...resources];
         this._onDidUpdateResourceStates.fire();
     }
-    constructor(_proxy, _commands, _sourceControlHandle, _id, _label) {
+    constructor(_proxy, _commands, _sourceControlHandle, _id, _label, multiDiffEditorEnableViewChanges, _extension) {
         this._proxy = _proxy;
         this._commands = _commands;
         this._sourceControlHandle = _sourceControlHandle;
         this._id = _id;
         this._label = _label;
+        this.multiDiffEditorEnableViewChanges = multiDiffEditorEnableViewChanges;
+        this._extension = _extension;
         this._resourceHandlePool = 0;
         this._resourceStates = [];
         this._resourceStatesMap = ( new Map());
@@ -401,6 +373,9 @@ class ExtHostSourceControlResourceGroup {
                         this._resourceStatesCommandsMap.set(handle, r.command);
                     }
                 }
+                const hasScmMultiDiffEditorProposalEnabled = isProposedApiEnabled(this._extension, 'scmMultiDiffEditor');
+                const multiFileDiffEditorOriginalUri = hasScmMultiDiffEditorProposalEnabled ? r.multiDiffEditorOriginalUri : undefined;
+                const multiFileDiffEditorModifiedUri = hasScmMultiDiffEditorProposalEnabled ? r.multiFileDiffEditorModifiedUri : undefined;
                 const icon = getIconResource(r.decorations);
                 const lightIcon = r.decorations && getIconResource(r.decorations.light) || icon;
                 const darkIcon = r.decorations && getIconResource(r.decorations.dark) || icon;
@@ -409,7 +384,7 @@ class ExtHostSourceControlResourceGroup {
                 const strikeThrough = r.decorations && !!r.decorations.strikeThrough;
                 const faded = r.decorations && !!r.decorations.faded;
                 const contextValue = r.contextValue || '';
-                const rawResource = [handle, sourceUri, icons, tooltip, strikeThrough, faded, contextValue, command];
+                const rawResource = [handle, sourceUri, icons, tooltip, strikeThrough, faded, contextValue, command, multiFileDiffEditorOriginalUri, multiFileDiffEditorModifiedUri];
                 return { rawResource, handle };
             }));
             return { start: diff.start, deleteCount: diff.deleteCount, toInsert };
@@ -483,17 +458,6 @@ class ExtHostSourceControl {
                 this._historyProviderCurrentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
                 this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup);
             }));
-            this._historyProviderDisposable.value.add(historyProvider.onDidChangeActionButton(() => {
-                checkProposedApiEnabled(this._extension, 'scmActionButton');
-                this._historyProviderActionButtonDisposable.value = ( new DisposableStore());
-                const internal = historyProvider.actionButton !== undefined ?
-                    {
-                        command: this._commands.converter.toInternal(historyProvider.actionButton.command, this._historyProviderActionButtonDisposable.value),
-                        description: historyProvider.actionButton.description,
-                        enabled: historyProvider.actionButton.enabled
-                    } : undefined;
-                this.#proxy.$onDidChangeHistoryProviderActionButton(this.handle, internal ?? null);
-            }));
         }
     }
     get commitTemplate() {
@@ -563,7 +527,6 @@ class ExtHostSourceControl {
         this._count = undefined;
         this._quickDiffProvider = undefined;
         this._historyProviderDisposable = ( new MutableDisposable());
-        this._historyProviderActionButtonDisposable = ( new MutableDisposable());
         this._commitTemplate = undefined;
         this._acceptInputDisposables = ( new MutableDisposable());
         this._acceptInputCommand = undefined;
@@ -584,7 +547,6 @@ class ExtHostSourceControl {
         }));
         this._inputBox = ( new ExtHostSCMInputBox(
             _extension,
-            _commands,
             _extHostDocuments,
             this.#proxy,
             this.handle,
@@ -592,8 +554,17 @@ class ExtHostSourceControl {
         ));
         this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri);
     }
-    createResourceGroup(id, label) {
-        const group = ( new ExtHostSourceControlResourceGroup(this.#proxy, this._commands, this.handle, id, label));
+    createResourceGroup(id, label, options) {
+        const multiDiffEditorEnableViewChanges = isProposedApiEnabled(this._extension, 'scmMultiDiffEditor') && options?.multiDiffEditorEnableViewChanges === true;
+        const group = ( new ExtHostSourceControlResourceGroup(
+            this.#proxy,
+            this._commands,
+            this.handle,
+            id,
+            label,
+            multiDiffEditorEnableViewChanges,
+            this._extension
+        ));
         const disposable = Event.once(group.onDidDispose)(() => this.createdResourceGroups.delete(group));
         this.createdResourceGroups.set(group, disposable);
         this.eventuallyAddResourceGroups();
@@ -614,7 +585,7 @@ class ExtHostSourceControl {
                 this._groups.delete(group.handle);
                 this.#proxy.$unregisterGroup(this.handle, group.handle);
             });
-            groups.push([group.handle, group.id, group.label, group.features]);
+            groups.push([group.handle, group.id, group.label, group.features, group.multiDiffEditorEnableViewChanges]);
             const snapshot = group._takeResourceStateSnapshot();
             if (snapshot.length > 0) {
                 splices.push([group.handle, snapshot]);
@@ -662,7 +633,6 @@ ExtHostSourceControl.__decorator = ( __decorate([
 let ExtHostSCM = class ExtHostSCM {
     static { ExtHostSCM_1 = this; }
     static { this._handlePool = 0; }
-    static { this._inputBoxValueProviderHandlePool = 0; }
     get onDidChangeActiveProvider() { return this._onDidChangeActiveProvider.event; }
     constructor(mainContext, _commands, _extHostDocuments, logService) {
         this._commands = _commands;
@@ -671,7 +641,6 @@ let ExtHostSCM = class ExtHostSCM {
         this._sourceControls = ( new Map());
         this._sourceControlsByExtension = ( new ExtensionIdentifierMap());
         this._onDidChangeActiveProvider = ( new Emitter());
-        this._inputBoxValueProviders = ( new Map());
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadSCM));
         this._telemetry = ( mainContext.getProxy(MainContext.MainThreadTelemetry));
         _commands.registerArgumentProcessor({
@@ -726,23 +695,6 @@ let ExtHostSCM = class ExtHostSCM {
         this._sourceControlsByExtension.set(extension.identifier, sourceControls);
         return sourceControl;
     }
-    registerSourceControlInputBoxValueProvider(extension, sourceControlId, provider) {
-        this.logService.trace('ExtHostSCM#registerSourceControlInputBoxValueProvider', extension.identifier.value, provider.label);
-        const handle = ExtHostSCM_1._inputBoxValueProviderHandlePool++;
-        this._inputBoxValueProviders.set(handle, provider);
-        this._proxy.$registerSourceControlInputBoxValueProvider(handle, sourceControlId, provider.label, getSourceControlInputBoxValueProviderIcon(provider));
-        return toDisposable(() => {
-            this._proxy.$unregisterSourceControlInputBoxValueProvider(handle);
-            this._inputBoxValueProviders.delete(handle);
-        });
-    }
-    async $provideInputBoxValue(inputBoxValueProviderHandle, rootUri, context, token) {
-        const provider = this._inputBoxValueProviders.get(inputBoxValueProviderHandle);
-        if (!provider) {
-            return undefined;
-        }
-        return (await provider.provideValue(URI.revive(rootUri), context, token)) ?? undefined;
-    }
     getLastInputBox(extension) {
         this.logService.trace('ExtHostSCM#getLastInputBox', extension.identifier.value);
         const sourceControls = this._sourceControlsByExtension.get(extension.identifier);
@@ -811,10 +763,6 @@ let ExtHostSCM = class ExtHostSCM {
         this._selectedSourceControlHandle = selectedSourceControlHandle;
         return Promise.resolve(undefined);
     }
-    async $resolveHistoryItemGroupBase(sourceControlHandle, historyItemGroupId, token) {
-        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
-        return (await historyProvider?.resolveHistoryItemGroupBase(historyItemGroupId, token)) ?? undefined;
-    }
     async $resolveHistoryItemGroupCommonAncestor(sourceControlHandle, historyItemGroupId1, historyItemGroupId2, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
         return (await historyProvider?.resolveHistoryItemGroupCommonAncestor(historyItemGroupId1, historyItemGroupId2, token)) ?? undefined;
@@ -824,9 +772,17 @@ let ExtHostSCM = class ExtHostSCM {
         const historyItems = await historyProvider?.provideHistoryItems(historyItemGroupId, options, token);
         return historyItems?.map(item => ({ ...item, icon: getHistoryItemIconDto(item) })) ?? undefined;
     }
-    async $provideHistoryItemChanges(sourceControlHandle, historyItemId, token) {
+    async $provideHistoryItemSummary(sourceControlHandle, historyItemId, historyItemParentId, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        if (typeof historyProvider?.provideHistoryItemSummary !== 'function') {
+            return undefined;
+        }
+        const historyItem = await historyProvider.provideHistoryItemSummary(historyItemId, historyItemParentId, token);
+        return historyItem ? { ...historyItem, icon: getHistoryItemIconDto(historyItem) } : undefined;
+    }
+    async $provideHistoryItemChanges(sourceControlHandle, historyItemId, historyItemParentId, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
-        return (await historyProvider?.provideHistoryItemChanges(historyItemId, token)) ?? undefined;
+        return (await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId, token)) ?? undefined;
     }
 };
 ExtHostSCM = ExtHostSCM_1 = ( __decorate([

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

@@ -29,6 +29,27 @@ class ExtHostSpeech {
         this.sessions.get(session)?.dispose(true);
         this.sessions.delete(session);
     }
+    async $createKeywordRecognitionSession(handle, session) {
+        const provider = this.providers.get(handle);
+        if (!provider) {
+            return;
+        }
+        const disposables = ( new DisposableStore());
+        const cts = ( new CancellationTokenSource());
+        this.sessions.set(session, cts);
+        const keywordRecognitionSession = disposables.add(provider.provideKeywordRecognitionSession(cts.token));
+        disposables.add(keywordRecognitionSession.onDidChange(e => {
+            if (cts.token.isCancellationRequested) {
+                return;
+            }
+            this.proxy.$emitKeywordRecognitionEvent(session, e);
+        }));
+        disposables.add(cts.token.onCancellationRequested(() => disposables.dispose()));
+    }
+    async $cancelKeywordRecognitionSession(session) {
+        this.sessions.get(session)?.dispose(true);
+        this.sessions.delete(session);
+    }
     registerProvider(extension, identifier, provider) {
         const handle = ExtHostSpeech.ID_POOL++;
         this.providers.set(handle, provider);