@codingame/monaco-vscode-api 6.0.2 → 7.0.0

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

@@ -3,9 +3,9 @@ import { URI } from '../../../base/common/uri.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { debounce } from '../../../base/common/decorators.js';
 import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { asPromise, Sequencer } from '../../../base/common/async.js';
+import { asPromise } from '../../../base/common/async.js';
 import { MainContext } from './extHost.protocol.js';
-import { sortedDiff, equals } from '../../../base/common/arrays.js';
+import { equals, sortedDiff } from '../../../base/common/arrays.js';
 import { comparePaths } from '../../../base/common/comparers.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
@@ -42,21 +42,26 @@ function getIconResource(decorations) {
         return undefined;
     }
 }
-function getHistoryItemIconDto(historyItem) {
-    if (!historyItem.icon) {
+function getHistoryItemIconDto(icon) {
+    if (!icon) {
         return undefined;
     }
-    else if (URI.isUri(historyItem.icon)) {
-        return historyItem.icon;
+    else if (URI.isUri(icon)) {
+        return icon;
     }
-    else if (ThemeIcon.isThemeIcon(historyItem.icon)) {
-        return historyItem.icon;
+    else if (ThemeIcon.isThemeIcon(icon)) {
+        return icon;
     }
     else {
-        const icon = historyItem.icon;
-        return { light: icon.light, dark: icon.dark };
+        const iconDto = icon;
+        return { light: iconDto.light, dark: iconDto.dark };
     }
 }
+function toSCMHistoryItemDto(historyItem) {
+    const icon = getHistoryItemIconDto(historyItem.icon);
+    const labels = historyItem.labels?.map(l => ({ title: l.title, icon: getHistoryItemIconDto(l.icon) }));
+    return { ...historyItem, icon, labels };
+}
 function compareResourceThemableDecorations(a, b) {
     if (!a.iconPath && !b.iconPath) {
         return 0;
@@ -223,7 +228,7 @@ class ExtHostSCMInputBox {
     }
     set value(value) {
         value = value ?? '';
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxValue(this._sourceControlHandle, value));
+        this.#proxy.$setInputBoxValue(this._sourceControlHandle, value);
         this.updateValue(value);
     }
     get onDidChange() {
@@ -233,7 +238,7 @@ class ExtHostSCMInputBox {
         return this._placeholder;
     }
     set placeholder(placeholder) {
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder));
+        this.#proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder);
         this._placeholder = placeholder;
     }
     get validateInput() {
@@ -248,7 +253,7 @@ class ExtHostSCMInputBox {
             ));
         }
         this._validateInput = fn;
-        this._sequencer.queue(async () => this.#proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn));
+        this.#proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn);
     }
     get enabled() {
         return this._enabled;
@@ -259,7 +264,7 @@ class ExtHostSCMInputBox {
             return;
         }
         this._enabled = enabled;
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxEnablement(this._sourceControlHandle, enabled));
+        this.#proxy.$setInputBoxEnablement(this._sourceControlHandle, enabled);
     }
     get visible() {
         return this._visible;
@@ -270,15 +275,14 @@ class ExtHostSCMInputBox {
             return;
         }
         this._visible = visible;
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible));
+        this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible);
     }
     get document() {
         checkProposedApiEnabled(this._extension, 'scmTextDocument');
         return this.#extHostDocuments.getDocument(this._documentUri);
     }
-    constructor(_extension, _extHostDocuments, proxy, _sequencer, _sourceControlHandle, _documentUri) {
+    constructor(_extension, _extHostDocuments, proxy, _sourceControlHandle, _documentUri) {
         this._extension = _extension;
-        this._sequencer = _sequencer;
         this._sourceControlHandle = _sourceControlHandle;
         this._documentUri = _documentUri;
         this._value = '';
@@ -291,7 +295,7 @@ class ExtHostSCMInputBox {
     }
     showValidationMessage(message, type) {
         checkProposedApiEnabled(this._extension, 'scmValidation');
-        this._sequencer.queue(async () => this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type));
+        this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type);
     }
     $onInputBoxValueChange(value) {
         this.updateValue(value);
@@ -308,12 +312,12 @@ class ExtHostSourceControlResourceGroup {
     get label() { return this._label; }
     set label(label) {
         this._label = label;
-        this._sequencer.queue(async () => this._proxy.$updateGroupLabel(this._sourceControlHandle, this.handle, label));
+        this._proxy.$updateGroupLabel(this._sourceControlHandle, this.handle, label);
     }
     get hideWhenEmpty() { return this._hideWhenEmpty; }
     set hideWhenEmpty(hideWhenEmpty) {
         this._hideWhenEmpty = hideWhenEmpty;
-        this._sequencer.queue(async () => this._proxy.$updateGroup(this._sourceControlHandle, this.handle, this.features));
+        this._proxy.$updateGroup(this._sourceControlHandle, this.handle, this.features);
     }
     get features() {
         return {
@@ -325,10 +329,9 @@ class ExtHostSourceControlResourceGroup {
         this._resourceStates = [...resources];
         this._onDidUpdateResourceStates.fire();
     }
-    constructor(_proxy, _commands, _sequencer, _sourceControlHandle, _id, _label, multiDiffEditorEnableViewChanges, _extension) {
+    constructor(_proxy, _commands, _sourceControlHandle, _id, _label, multiDiffEditorEnableViewChanges, _extension) {
         this._proxy = _proxy;
         this._commands = _commands;
-        this._sequencer = _sequencer;
         this._sourceControlHandle = _sourceControlHandle;
         this._id = _id;
         this._label = _label;
@@ -436,7 +439,7 @@ class ExtHostSourceControl {
             return;
         }
         this._count = count;
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { count }));
+        this.#proxy.$updateSourceControl(this.handle, { count });
     }
     get quickDiffProvider() {
         return this._quickDiffProvider;
@@ -447,7 +450,7 @@ class ExtHostSourceControl {
         if (isProposedApiEnabled(this._extension, 'quickDiffProvider')) {
             quickDiffLabel = quickDiffProvider?.label;
         }
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider, quickDiffLabel }));
+        this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider, quickDiffLabel });
     }
     get historyProvider() {
         checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
@@ -457,11 +460,11 @@ class ExtHostSourceControl {
         checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
         this._historyProvider = historyProvider;
         this._historyProviderDisposable.value = ( new DisposableStore());
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider }));
+        this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider });
         if (historyProvider) {
             this._historyProviderDisposable.value.add(historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
                 this._historyProviderCurrentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
-                this._sequencer.queue(async () => this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup));
+                this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup);
             }));
         }
     }
@@ -473,7 +476,7 @@ class ExtHostSourceControl {
             return;
         }
         this._commitTemplate = commitTemplate;
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { commitTemplate }));
+        this.#proxy.$updateSourceControl(this.handle, { commitTemplate });
     }
     get acceptInputCommand() {
         return this._acceptInputCommand;
@@ -482,7 +485,7 @@ class ExtHostSourceControl {
         this._acceptInputDisposables.value = ( new DisposableStore());
         this._acceptInputCommand = acceptInputCommand;
         const internal = this._commands.converter.toInternal(acceptInputCommand, this._acceptInputDisposables.value);
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal }));
+        this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal });
     }
     get actionButton() {
         checkProposedApiEnabled(this._extension, 'scmActionButton');
@@ -503,13 +506,15 @@ class ExtHostSourceControl {
                 description: actionButton.description,
                 enabled: actionButton.enabled
             } : undefined;
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null }));
+        this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null });
     }
     get statusBarCommands() {
         return this._statusBarCommands;
     }
     set statusBarCommands(statusBarCommands) {
+        this.logService.trace('ExtHostSourceControl#statusBarCommands', ( (statusBarCommands ?? []).map(c => c.command)).join(', '));
         if (this._statusBarCommands && statusBarCommands && commandListEquals(this._statusBarCommands, statusBarCommands)) {
+            this.logService.trace('ExtHostSourceControl#statusBarCommands are equal');
             return;
         }
         this._statusBarDisposables.value = ( new DisposableStore());
@@ -517,18 +522,18 @@ class ExtHostSourceControl {
         const internal = ( (statusBarCommands || []).map(
             c => this._commands.converter.toInternal(c, this._statusBarDisposables.value)
         ));
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal }));
+        this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
     }
     get selected() {
         return this._selected;
     }
-    constructor(_extension, _extHostDocuments, proxy, _commands, _id, _label, _rootUri) {
+    constructor(_extension, _extHostDocuments, proxy, _commands, logService, _id, _label, _rootUri) {
         this._extension = _extension;
         this._commands = _commands;
+        this.logService = logService;
         this._id = _id;
         this._label = _label;
         this._rootUri = _rootUri;
-        this._sequencer = ( new Sequencer());
         this._groups = ( new Map());
         this._count = undefined;
         this._quickDiffProvider = undefined;
@@ -551,22 +556,20 @@ class ExtHostSourceControl {
             path: `${_id}/scm${this.handle}/input`,
             query: _rootUri ? `rootUri=${encodeURIComponent(( _rootUri.toString()))}` : undefined
         }));
-        this._sequencer.queue(() => this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri));
         this._inputBox = ( new ExtHostSCMInputBox(
             _extension,
             _extHostDocuments,
             this.#proxy,
-            this._sequencer,
             this.handle,
             inputBoxDocumentUri
         ));
+        this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri);
     }
     createResourceGroup(id, label, options) {
         const multiDiffEditorEnableViewChanges = isProposedApiEnabled(this._extension, 'scmMultiDiffEditor') && options?.multiDiffEditorEnableViewChanges === true;
         const group = ( new ExtHostSourceControlResourceGroup(
             this.#proxy,
             this._commands,
-            this._sequencer,
             this.handle,
             id,
             label,
@@ -591,7 +594,7 @@ class ExtHostSourceControl {
                 this.updatedResourceGroups.delete(group);
                 updateListener.dispose();
                 this._groups.delete(group.handle);
-                this._sequencer.queue(async () => this.#proxy.$unregisterGroup(this.handle, group.handle));
+                this.#proxy.$unregisterGroup(this.handle, group.handle);
             });
             groups.push([group.handle, group.id, group.label, group.features, group.multiDiffEditorEnableViewChanges]);
             const snapshot = group._takeResourceStateSnapshot();
@@ -600,7 +603,7 @@ class ExtHostSourceControl {
             }
             this._groups.set(group.handle, group);
         }
-        this._sequencer.queue(async () => this.#proxy.$registerGroups(this.handle, groups, splices));
+        this.#proxy.$registerGroups(this.handle, groups, splices);
         this.createdResourceGroups.clear();
     }
     eventuallyUpdateResourceStates() {
@@ -613,7 +616,7 @@ class ExtHostSourceControl {
             splices.push([group.handle, snapshot]);
         });
         if (splices.length > 0) {
-            this._sequencer.queue(async () => this.#proxy.$spliceResourceStates(this.handle, splices));
+            this.#proxy.$spliceResourceStates(this.handle, splices);
         }
         this.updatedResourceGroups.clear();
     }
@@ -629,7 +632,7 @@ class ExtHostSourceControl {
         this._actionButtonDisposables.dispose();
         this._statusBarDisposables.dispose();
         this._groups.forEach(group => group.dispose());
-        this._sequencer.queue(async () => this.#proxy.$unregisterSourceControl(this.handle));
+        this.#proxy.$unregisterSourceControl(this.handle);
     }
 }
 ExtHostSourceControl.__decorator = ( __decorate([
@@ -693,6 +696,7 @@ let ExtHostSCM = class ExtHostSCM {
             this._extHostDocuments,
             this._proxy,
             this._commands,
+            this.logService,
             id,
             label,
             rootUri
@@ -778,7 +782,12 @@ let ExtHostSCM = class ExtHostSCM {
     async $provideHistoryItems(sourceControlHandle, historyItemGroupId, options, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
         const historyItems = await historyProvider?.provideHistoryItems(historyItemGroupId, options, token);
-        return historyItems?.map(item => ({ ...item, icon: getHistoryItemIconDto(item) })) ?? undefined;
+        return historyItems?.map(item => toSCMHistoryItemDto(item)) ?? undefined;
+    }
+    async $provideHistoryItems2(sourceControlHandle, options, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        const historyItems = await historyProvider?.provideHistoryItems2(options, token);
+        return historyItems?.map(item => toSCMHistoryItemDto(item)) ?? undefined;
     }
     async $provideHistoryItemSummary(sourceControlHandle, historyItemId, historyItemParentId, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
@@ -786,7 +795,7 @@ let ExtHostSCM = class ExtHostSCM {
             return undefined;
         }
         const historyItem = await historyProvider.provideHistoryItemSummary(historyItemId, historyItemParentId, token);
-        return historyItem ? { ...historyItem, icon: getHistoryItemIconDto(historyItem) } : undefined;
+        return historyItem ? toSCMHistoryItemDto(historyItem) : undefined;
     }
     async $provideHistoryItemChanges(sourceControlHandle, historyItemId, historyItemParentId, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;

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

@@ -93,7 +93,7 @@ let ExtHostSearch = class ExtHostSearch {
     $provideTextSearchResults(handle, session, rawQuery, token) {
         const provider = this._textSearchProvider.get(handle);
         if (!provider || !provider.provideTextSearchResults) {
-            throw ( new Error(`2 Unknown provider ${handle}`));
+            throw ( new Error(`Unknown Text Search Provider ${handle}`));
         }
         const query = reviveQuery(rawQuery);
         const engine = this.createTextSearchManager(query, provider);
@@ -102,7 +102,7 @@ let ExtHostSearch = class ExtHostSearch {
     $provideAITextSearchResults(handle, session, rawQuery, token) {
         const provider = this._aiTextSearchProvider.get(handle);
         if (!provider || !provider.provideAITextSearchResults) {
-            throw ( new Error(`1 Unknown provider ${handle}`));
+            throw ( new Error(`Unknown AI Text Search Provider ${handle}`));
         }
         const query = reviveQuery(rawQuery);
         const engine = this.createAITextSearchManager(query, provider);

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

@@ -1,17 +1,20 @@
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { Emitter } from '../../../base/common/event.js';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 class ExtensionSecrets {
     #secretState;
     constructor(extensionDescription, secretState) {
-        this._onDidChange = ( new Emitter());
-        this.onDidChange = this._onDidChange.event;
+        this.disposables = ( new DisposableStore());
         this._id = ExtensionIdentifier.toKey(extensionDescription.identifier);
         this.#secretState = secretState;
-        this.#secretState.onDidChangePassword(e => {
-            if (e.extensionId === this._id) {
-                this._onDidChange.fire({ key: e.key });
-            }
-        });
+        this.onDidChange = ( Event.map(
+            Event.filter(this.#secretState.onDidChangePassword, e => e.extensionId === this._id),
+            e => ({ key: e.key }),
+            this.disposables
+        ));
+    }
+    dispose() {
+        this.disposables.dispose();
     }
     get(key) {
         return this.#secretState.get(this._id, key);

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

@@ -718,7 +718,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     getEnvironmentVariableCollection(extension) {
         let collection = this._environmentVariableCollections.get(extension.identifier.value);
         if (!collection) {
-            collection = ( (new UnifiedEnvironmentVariableCollection()));
+            collection = this._register(( (new UnifiedEnvironmentVariableCollection())));
             this._setEnvironmentVariableCollection(extension.identifier.value, collection);
         }
         return collection.getScopedEnvironmentVariableCollection(undefined);
@@ -731,7 +731,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     $initEnvironmentVariableCollections(collections) {
         collections.forEach(entry => {
             const extensionIdentifier = entry[0];
-            const collection = ( (new UnifiedEnvironmentVariableCollection(entry[1])));
+            const collection = this._register(( (new UnifiedEnvironmentVariableCollection(entry[1]))));
             this._setEnvironmentVariableCollection(extensionIdentifier, collection);
         });
     }
@@ -745,16 +745,16 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     }
     _setEnvironmentVariableCollection(extensionIdentifier, collection) {
         this._environmentVariableCollections.set(extensionIdentifier, collection);
-        collection.onDidChangeCollection(() => {
+        this._register(collection.onDidChangeCollection(() => {
             this._syncEnvironmentVariableCollection(extensionIdentifier, collection);
-        });
+        }));
     }
 };
 BaseExtHostTerminalService = ( (__decorate([
     ( (__param(1, IExtHostCommands))),
     ( (__param(2, IExtHostRpcService)))
 ], BaseExtHostTerminalService)));
-class UnifiedEnvironmentVariableCollection {
+class UnifiedEnvironmentVariableCollection extends Disposable {
     get persistent() { return this._persistent; }
     set persistent(value) {
         this._persistent = value;
@@ -762,6 +762,7 @@ class UnifiedEnvironmentVariableCollection {
     }
     get onDidChangeCollection() { return this._onDidChangeCollection && this._onDidChangeCollection.event; }
     constructor(serialized) {
+        super();
         this.map = ( (new Map()));
         this.scopedCollections = ( (new Map()));
         this.descriptionMap = ( (new Map()));
@@ -775,7 +776,7 @@ class UnifiedEnvironmentVariableCollection {
         if (!scopedCollection) {
             scopedCollection = ( (new ScopedEnvironmentVariableCollection(this, scope)));
             this.scopedCollections.set(scopedCollectionKey, scopedCollection);
-            scopedCollection.onDidChangeCollection(() => this._onDidChangeCollection.fire());
+            this._register(scopedCollection.onDidChangeCollection(() => this._onDidChangeCollection.fire()));
         }
         return scopedCollection;
     }