@codingame/monaco-vscode-api 2.0.3 → 2.1.0-update-vscode-1.86.1

package/vscode-dts/vscode.proposed.interactive.d.ts

@@ -33,6 +33,7 @@ declare module 'vscode' {
 		wholeRange: Range;
 		attempt: number;
 		live: boolean;
+		withIntentDetection: boolean;
 	}
 
 	// todo@API make classes
@@ -82,6 +83,15 @@ declare module 'vscode' {
 		title?: string;
 	}
 
+	export interface InteractiveEditorCommandFollowup {
+		commandId: string;
+		args?: any[];
+		title: string;
+		when?: string;
+	}
+
+	export type InteractiveEditorFollowup = InteractiveEditorReplyFollowup | InteractiveEditorCommandFollowup;
+
 	export interface InteractiveEditorSessionProvider<S extends InteractiveEditorSession = InteractiveEditorSession, R extends InteractiveEditorResponse | InteractiveEditorMessageResponse = InteractiveEditorResponse | InteractiveEditorMessageResponse> {
 
 		// Create a session. The lifetime of this session is the duration of the editing session with the input mode widget.
@@ -89,7 +99,7 @@ declare module 'vscode' {
 
 		provideInteractiveEditorResponse(session: S, request: InteractiveEditorRequest, progress: Progress<InteractiveEditorProgressItem>, token: CancellationToken): ProviderResult<R>;
 
-		provideFollowups?(session: S, response: R, token: CancellationToken): ProviderResult<InteractiveEditorReplyFollowup[]>;
+		provideFollowups?(session: S, response: R, token: CancellationToken): ProviderResult<InteractiveEditorFollowup[]>;
 
 		// eslint-disable-next-line local/vscode-dts-provider-naming
 		handleInteractiveEditorResponseFeedback?(session: S, response: R, kind: InteractiveEditorResponseFeedbackKind): void;
@@ -110,24 +120,11 @@ declare module 'vscode' {
 		inputPlaceholder?: string;
 	}
 
-	export interface InteractiveResponseCommand {
-		commandId: string;
-		args?: any[];
-		title: string; // supports codicon strings
-		when?: string;
-	}
-
-	export interface InteractiveSessionReplyFollowup {
-		message: string;
-		tooltip?: string;
-		title?: string;
-	}
-
-	export type InteractiveWelcomeMessageContent = string | MarkdownString | InteractiveSessionReplyFollowup[];
+	export type InteractiveWelcomeMessageContent = string | MarkdownString | ChatAgentReplyFollowup[];
 
 	export interface InteractiveSessionProvider<S extends InteractiveSession = InteractiveSession> {
 		provideWelcomeMessage?(token: CancellationToken): ProviderResult<InteractiveWelcomeMessageContent[]>;
-		provideSampleQuestions?(token: CancellationToken): ProviderResult<InteractiveSessionReplyFollowup[]>;
+		provideSampleQuestions?(token: CancellationToken): ProviderResult<ChatAgentReplyFollowup[]>;
 		prepareSession(token: CancellationToken): ProviderResult<S>;
 	}
 

package/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts

@@ -16,7 +16,7 @@ declare module 'vscode' {
 
 	interface VariablesResult {
 		variable: Variable;
-		namedChildrenCount: number;
+		hasNamedChildren: boolean;
 		indexedChildrenCount: number;
 	}
 
@@ -38,6 +38,9 @@ declare module 'vscode' {
 			An empty string can be used if no value should be shown in the UI.
 		*/
 		value: string;
+
+		/** The type of the variable's value */
+		type?: string;
 	}
 
 }

package/vscode-dts/vscode.proposed.resolvers.d.ts

@@ -124,6 +124,10 @@ declare module 'vscode' {
 			 * One of the the options must have the ID "private".
 			 */
 			privacyOptions: TunnelPrivacy[];
+			/**
+			 * Defaults to true for backwards compatibility.
+			 */
+			protocol?: boolean;
 		};
 	}
 

package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts

@@ -11,14 +11,8 @@ declare module 'vscode' {
 	}
 
 	export interface SourceControlHistoryProvider {
-		actionButton?: SourceControlActionButton;
 		currentHistoryItemGroup?: SourceControlHistoryItemGroup;
 
-		/**
-		 * Fires when the action button changes
-		 */
-		onDidChangeActionButton: Event<void>;
-
 		/**
 		 * Fires when the current history item group changes after
 		 * a user action (ex: commit, checkout, fetch, pull, push)
@@ -31,10 +25,10 @@ declare module 'vscode' {
 		// onDidChangeHistoryItemGroups: Event<SourceControlHistoryChangeEvent>;
 
 		provideHistoryItems(historyItemGroupId: string, options: SourceControlHistoryOptions, token: CancellationToken): ProviderResult<SourceControlHistoryItem[]>;
-		provideHistoryItemChanges(historyItemId: string, token: CancellationToken): ProviderResult<SourceControlHistoryItemChange[]>;
+		provideHistoryItemSummary?(historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): ProviderResult<SourceControlHistoryItem>;
+		provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): ProviderResult<SourceControlHistoryItemChange[]>;
 
-		resolveHistoryItemGroupBase(historyItemGroupId: string, token: CancellationToken): ProviderResult<SourceControlHistoryItemGroup | undefined>;
-		resolveHistoryItemGroupCommonAncestor(historyItemGroupId1: string, historyItemGroupId: string, token: CancellationToken): ProviderResult<{ id: string; ahead: number; behind: number }>;
+		resolveHistoryItemGroupCommonAncestor(historyItemGroupId1: string, historyItemGroupId2: string | undefined, token: CancellationToken): ProviderResult<{ id: string; ahead: number; behind: number }>;
 	}
 
 	export interface SourceControlHistoryOptions {
@@ -45,7 +39,7 @@ declare module 'vscode' {
 	export interface SourceControlHistoryItemGroup {
 		readonly id: string;
 		readonly label: string;
-		readonly upstream?: SourceControlRemoteHistoryItemGroup;
+		readonly base?: Omit<SourceControlRemoteHistoryItemGroup, 'base'>;
 	}
 
 	export interface SourceControlRemoteHistoryItemGroup {

package/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+	// https://github.com/microsoft/vscode/issues/199291
+
+	export interface SourceControlResourceState {
+		/**
+		 * The uri that resolves to the original document of this resource (before the change).
+		 * Used for the multi diff editor exclusively.
+		 */
+		readonly multiDiffEditorOriginalUri?: Uri;
+
+		/**
+		 * The uri that resolves to the modified document of this resource (after the change).
+		 * Used for the multi diff editor exclusively.
+		 */
+		readonly multiFileDiffEditorModifiedUri?: Uri;
+	}
+
+	export interface SourceControl {
+		/**
+		 * Create a new {@link SourceControlResourceGroup resource group}.
+		 * @param id An `id` for the {@link SourceControlResourceGroup resource group}.
+		 * @param label A human-readable string for the {@link SourceControlResourceGroup resource group}.
+		 * @param options Options for the {@link SourceControlResourceGroup resource group}.
+		 * 				Set `multiDiffEditorEnableViewChanges` to `true` to enable the "View Changes" option which opens the multi file diff editor.
+		 * @return An instance of {@link SourceControlResourceGroup resource group}.
+		 */
+		createResourceGroup(id: string, label: string, options: { multiDiffEditorEnableViewChanges?: boolean }): SourceControlResourceGroup;
+	}
+}

package/vscode-dts/vscode.proposed.speech.d.ts

@@ -5,6 +5,8 @@
 
 declare module 'vscode' {
 
+	// todo@bpasero work in progress speech API
+
 	export enum SpeechToTextStatus {
 		Started = 1,
 		Recognizing = 2,
@@ -21,15 +23,27 @@ declare module 'vscode' {
 		readonly onDidChange: Event<SpeechToTextEvent>;
 	}
 
+	export enum KeywordRecognitionStatus {
+		Recognized = 1,
+		Stopped = 2
+	}
+
+	export interface KeywordRecognitionEvent {
+		readonly status: KeywordRecognitionStatus;
+		readonly text?: string;
+	}
+
+	export interface KeywordRecognitionSession extends Disposable {
+		readonly onDidChange: Event<KeywordRecognitionEvent>;
+	}
+
 	export interface SpeechProvider {
 		provideSpeechToTextSession(token: CancellationToken): SpeechToTextSession;
+		provideKeywordRecognitionSession(token: CancellationToken): KeywordRecognitionSession;
 	}
 
 	export namespace speech {
 
-		/**
-		 * TODO@bpasero work in progress speech provider API
-		 */
 		export function registerSpeechProvider(id: string, provider: SpeechProvider): Disposable;
 	}
 }

package/vscode-dts/vscode.proposed.testCoverage.d.ts

@@ -164,11 +164,17 @@ declare module 'vscode' {
 		 */
 		location?: Position | Range;
 
+		/**
+		 * Label for the branch, used in the context of "the ${label} branch was
+		 * not taken," for example.
+		 */
+		label?: string;
+
 		/**
 		 * @param executionCount The number of times this branch was executed.
 		 * @param location The branch position.
 		 */
-		constructor(executionCount: number, location?: Position | Range);
+		constructor(executionCount: number, location?: Position | Range, label?: string);
 	}
 
 	/**

package/vscode-dts/vscode.proposed.tunnelFactory.d.ts

@@ -22,6 +22,10 @@ declare module 'vscode' {
 			 * One of the the options must have the ID "private".
 			 */
 			privacyOptions: TunnelPrivacy[];
+			/**
+			 * Defaults to true for backwards compatibility.
+			 */
+			protocol?: boolean;
 		};
 	}
 

package/vscode/src/vs/editor/browser/widget/diffEditor/colors.js

@@ -1,17 +0,0 @@
-import { localizeWithPath } from '../../../../nls.js';
-import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
-registerColor('diffEditor.move.border', { dark: '#8b8b8b9c', light: '#8b8b8b9c', hcDark: '#8b8b8b9c', hcLight: '#8b8b8b9c', }, ( localizeWithPath(
- 'vs/editor/browser/widget/diffEditor/colors',
- 'diffEditor.move.border',
- 'The border color for text that got moved in the diff editor.'
-)));
-registerColor('diffEditor.moveActive.border', { dark: '#FFA500', light: '#FFA500', hcDark: '#FFA500', hcLight: '#FFA500', }, ( localizeWithPath(
- 'vs/editor/browser/widget/diffEditor/colors',
- 'diffEditor.moveActive.border',
- 'The active border color for text that got moved in the diff editor.'
-)));
-registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localizeWithPath(
- 'vs/editor/browser/widget/diffEditor/colors',
- 'diffEditor.unchangedRegionShadow',
- 'The color of the shadow around unchanged region widgets.'
-)));

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorDecorations.js

@@ -1,231 +0,0 @@
-import { h } from '../../../../base/browser/dom.js';
-import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { diffLineDeleteDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackground, diffLineAddDecorationBackgroundWithIndicator, diffLineAddDecorationBackground, diffWholeLineDeleteDecoration, diffWholeLineAddDecoration, diffDeleteDecorationEmpty, diffDeleteDecoration, diffAddDecorationEmpty, diffAddDecoration } from './decorations.js';
-import { MovedBlocksLinesPart } from './movedBlocksLines.js';
-import { applyObservableDecorations } from './utils.js';
-import { LineRangeSet, LineRange } from '../../../common/core/lineRange.js';
-import { Range } from '../../../common/core/range.js';
-import { GlyphMarginLane } from '../../../common/model.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-class DiffEditorDecorations extends Disposable {
-    constructor(_editors, _diffModel, _options, widget) {
-        super();
-        this._editors = _editors;
-        this._diffModel = _diffModel;
-        this._options = _options;
-        this._decorations = derived(this, (reader) => {
-            const diff = this._diffModel.read(reader)?.diff.read(reader);
-            if (!diff) {
-                return null;
-            }
-            const movedTextToCompare = this._diffModel.read(reader).movedTextToCompare.read(reader);
-            const renderIndicators = this._options.renderIndicators.read(reader);
-            const showEmptyDecorations = this._options.showEmptyDecorations.read(reader);
-            const originalDecorations = [];
-            const modifiedDecorations = [];
-            if (!movedTextToCompare) {
-                for (const m of diff.mappings) {
-                    if (!m.lineRangeMapping.original.isEmpty) {
-                        originalDecorations.push({ range: m.lineRangeMapping.original.toInclusiveRange(), options: renderIndicators ? diffLineDeleteDecorationBackgroundWithIndicator : diffLineDeleteDecorationBackground });
-                    }
-                    if (!m.lineRangeMapping.modified.isEmpty) {
-                        modifiedDecorations.push({ range: m.lineRangeMapping.modified.toInclusiveRange(), options: renderIndicators ? diffLineAddDecorationBackgroundWithIndicator : diffLineAddDecorationBackground });
-                    }
-                    if (m.lineRangeMapping.modified.isEmpty || m.lineRangeMapping.original.isEmpty) {
-                        if (!m.lineRangeMapping.original.isEmpty) {
-                            originalDecorations.push({ range: m.lineRangeMapping.original.toInclusiveRange(), options: diffWholeLineDeleteDecoration });
-                        }
-                        if (!m.lineRangeMapping.modified.isEmpty) {
-                            modifiedDecorations.push({ range: m.lineRangeMapping.modified.toInclusiveRange(), options: diffWholeLineAddDecoration });
-                        }
-                    }
-                    else {
-                        for (const i of m.lineRangeMapping.innerChanges || []) {
-                            if (m.lineRangeMapping.original.contains(i.originalRange.startLineNumber)) {
-                                originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });
-                            }
-                            if (m.lineRangeMapping.modified.contains(i.modifiedRange.startLineNumber)) {
-                                modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });
-                            }
-                        }
-                    }
-                }
-            }
-            if (movedTextToCompare) {
-                for (const m of movedTextToCompare.changes) {
-                    const fullRangeOriginal = m.original.toInclusiveRange();
-                    if (fullRangeOriginal) {
-                        originalDecorations.push({ range: fullRangeOriginal, options: renderIndicators ? diffLineDeleteDecorationBackgroundWithIndicator : diffLineDeleteDecorationBackground });
-                    }
-                    const fullRangeModified = m.modified.toInclusiveRange();
-                    if (fullRangeModified) {
-                        modifiedDecorations.push({ range: fullRangeModified, options: renderIndicators ? diffLineAddDecorationBackgroundWithIndicator : diffLineAddDecorationBackground });
-                    }
-                    for (const i of m.innerChanges || []) {
-                        originalDecorations.push({ range: i.originalRange, options: diffDeleteDecoration });
-                        modifiedDecorations.push({ range: i.modifiedRange, options: diffAddDecoration });
-                    }
-                }
-            }
-            const activeMovedText = this._diffModel.read(reader).activeMovedText.read(reader);
-            for (const m of diff.movedTexts) {
-                originalDecorations.push({
-                    range: m.lineRangeMapping.original.toInclusiveRange(), options: {
-                        description: 'moved',
-                        blockClassName: 'movedOriginal' + (m === activeMovedText ? ' currentMove' : ''),
-                        blockPadding: [MovedBlocksLinesPart.movedCodeBlockPadding, 0, MovedBlocksLinesPart.movedCodeBlockPadding, MovedBlocksLinesPart.movedCodeBlockPadding],
-                    }
-                });
-                modifiedDecorations.push({
-                    range: m.lineRangeMapping.modified.toInclusiveRange(), options: {
-                        description: 'moved',
-                        blockClassName: 'movedModified' + (m === activeMovedText ? ' currentMove' : ''),
-                        blockPadding: [4, 0, 4, 4],
-                    }
-                });
-            }
-            return { originalDecorations, modifiedDecorations };
-        });
-        this._register(( new RevertButtonsFeature(_editors, _diffModel, _options, widget)));
-        this._register(applyObservableDecorations(this._editors.original, ( this._decorations.map(d => d?.originalDecorations || []))));
-        this._register(applyObservableDecorations(this._editors.modified, ( this._decorations.map(d => d?.modifiedDecorations || []))));
-    }
-}
-class RevertButtonsFeature extends Disposable {
-    constructor(_editors, _diffModel, _options, _widget) {
-        super();
-        this._editors = _editors;
-        this._diffModel = _diffModel;
-        this._options = _options;
-        this._widget = _widget;
-        const emptyArr = [];
-        const selectedDiffs = derived(this, (reader) => {
-            const model = this._diffModel.read(reader);
-            const diff = model?.diff.read(reader);
-            if (!diff) {
-                return emptyArr;
-            }
-            const selections = this._editors.modifiedSelections.read(reader);
-            if (selections.every(s => s.isEmpty())) {
-                return emptyArr;
-            }
-            const lineRanges = ( new LineRangeSet(( selections.map(s => LineRange.fromRangeInclusive(s)))));
-            const mappings = diff.mappings.filter(m => m.lineRangeMapping.innerChanges && lineRanges.intersects(m.lineRangeMapping.modified));
-            const result = ( mappings.map(mapping => ({
-                mapping,
-                rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( selections.some(s => Range.areIntersecting(c.modifiedRange, s))))
-            })));
-            if (result.length === 0 || result.every(r => r.rangeMappings.length === 0)) {
-                return emptyArr;
-            }
-            return result;
-        });
-        this._register(autorunWithStore((reader, store) => {
-            const model = this._diffModel.read(reader);
-            const diff = model?.diff.read(reader);
-            if (!model || !diff) {
-                return;
-            }
-            const movedTextToCompare = this._diffModel.read(reader).movedTextToCompare.read(reader);
-            if (movedTextToCompare) {
-                return;
-            }
-            if (!this._options.shouldRenderRevertArrows.read(reader)) {
-                return;
-            }
-            const glyphWidgetsModified = [];
-            const selectedDiffs_ = selectedDiffs.read(reader);
-            const diffsSet = ( new Set(( selectedDiffs_.map(d => d.mapping))));
-            if (selectedDiffs_.length > 0) {
-                const selections = this._editors.modifiedSelections.read(reader);
-                const btn = ( new RevertButton(
-                    selections[selections.length - 1].positionLineNumber,
-                    this._widget,
-                    selectedDiffs_.flatMap(d => d.rangeMappings),
-                    true
-                ));
-                this._editors.modified.addGlyphMarginWidget(btn);
-                glyphWidgetsModified.push(btn);
-            }
-            for (const m of diff.mappings) {
-                if (( diffsSet.has(m))) {
-                    continue;
-                }
-                if (!m.lineRangeMapping.modified.isEmpty && m.lineRangeMapping.innerChanges) {
-                    const btn = ( new RevertButton(
-                        m.lineRangeMapping.modified.startLineNumber,
-                        this._widget,
-                        m.lineRangeMapping.innerChanges,
-                        false
-                    ));
-                    this._editors.modified.addGlyphMarginWidget(btn);
-                    glyphWidgetsModified.push(btn);
-                }
-            }
-            store.add(toDisposable(() => {
-                for (const w of glyphWidgetsModified) {
-                    this._editors.modified.removeGlyphMarginWidget(w);
-                }
-            }));
-        }));
-    }
-}
-class RevertButton {
-    static { this.counter = 0; }
-    getId() { return this._id; }
-    constructor(_lineNumber, _widget, _diffs, _selection) {
-        this._lineNumber = _lineNumber;
-        this._widget = _widget;
-        this._diffs = _diffs;
-        this._selection = _selection;
-        this._id = `revertButton${RevertButton.counter++}`;
-        this._domNode = h('div.revertButton', {
-            title: this._selection
-                ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/diffEditorDecorations',
-                'revertSelectedChanges',
-                'Revert Selected Changes'
-            ))
-                : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/diffEditorDecorations',
-                'revertChange',
-                'Revert Change'
-            ))
-        }, [renderIcon(Codicon.arrowRight)]).root;
-        this._domNode.onmousedown = e => {
-            if (e.button !== 2) {
-                e.stopPropagation();
-                e.preventDefault();
-            }
-        };
-        this._domNode.onmouseup = e => {
-            e.stopPropagation();
-            e.preventDefault();
-        };
-        this._domNode.onclick = (e) => {
-            this._widget.revertRangeMappings(this._diffs);
-            e.stopPropagation();
-            e.preventDefault();
-        };
-    }
-    getDomNode() {
-        return this._domNode;
-    }
-    getPosition() {
-        return {
-            lane: GlyphMarginLane.Right,
-            range: {
-                startColumn: 1,
-                startLineNumber: this._lineNumber,
-                endColumn: 1,
-                endLineNumber: this._lineNumber,
-            },
-            zIndex: 10001,
-        };
-    }
-}
-export { DiffEditorDecorations };