@codingame/monaco-vscode-api 6.0.2 → 7.0.0

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js

@@ -24,6 +24,8 @@ import { IEditorService } from '../../editor/common/editorService.service.js';
 import { IElevatedFileService } from '../../files/common/elevatedFileService.service.js';
 import { ResourceWorkingCopy } from './resourceWorkingCopy.js';
 import { SnapshotContext } from './fileWorkingCopy.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var StoredFileWorkingCopy_1;
 const _moduleId = "vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
@@ -43,7 +45,7 @@ function isStoredFileWorkingCopySaveEvent(e) {
 let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingCopy {
     static { StoredFileWorkingCopy_1 = this; }
     get model() { return this._model; }
-    constructor(typeId, resource, name, modelFactory, externalResolver, fileService, logService, workingCopyFileService, filesConfigurationService, workingCopyBackupService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService) {
+    constructor(typeId, resource, name, modelFactory, externalResolver, fileService, logService, workingCopyFileService, filesConfigurationService, workingCopyBackupService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService, progressService) {
         super(resource, fileService);
         this.typeId = typeId;
         this.name = name;
@@ -57,6 +59,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         this.workingCopyEditorService = workingCopyEditorService;
         this.editorService = editorService;
         this.elevatedFileService = elevatedFileService;
+        this.progressService = progressService;
         this.capabilities = WorkingCopyCapabilities.None;
         this._model = undefined;
         this._onDidChangeContent = this._register(( (new Emitter())));
@@ -377,7 +380,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         if (typeof options.reason !== 'number') {
             options.reason = SaveReason.EXPLICIT;
         }
-        let versionId = this.versionId;
+        const versionId = this.versionId;
         this.trace(`doSave(${versionId}) - enter with versionId ${versionId}`);
         if (this.ignoreSaveFromSaveParticipants) {
             this.trace(`doSave(${versionId}) - exit - refusing to save() recursively from save participant`);
@@ -400,6 +403,20 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             this.model.pushStackElement();
         }
         const saveCancellation = ( (new CancellationTokenSource()));
+        return this.progressService.withProgress({
+            title: ( localizeWithPath(_moduleId, 0, "Saving '{0}'", this.name)),
+            location: ProgressLocation.Window,
+            cancellable: true,
+            delay: this.isDirty() ? 3000 : 5000
+        }, progress => {
+            return this.doSaveSequential(versionId, options, progress, saveCancellation);
+        }, () => {
+            saveCancellation.cancel();
+        }).finally(() => {
+            saveCancellation.dispose();
+        });
+    }
+    doSaveSequential(versionId, options, progress, saveCancellation) {
         return this.saveSequentializer.run(versionId, (async () => {
             if (this.isResolved() && !options.skipSaveParticipants && this.workingCopyFileService.hasSaveParticipants) {
                 try {
@@ -412,7 +429,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                     if (!saveCancellation.token.isCancellationRequested) {
                         this.ignoreSaveFromSaveParticipants = true;
                         try {
-                            await this.workingCopyFileService.runSaveParticipants(this, { reason: options.reason ?? SaveReason.EXPLICIT, savedFrom: options.from }, saveCancellation.token);
+                            await this.workingCopyFileService.runSaveParticipants(this, { reason: options.reason ?? SaveReason.EXPLICIT, savedFrom: options.from }, progress, saveCancellation.token);
                         }
                         finally {
                             this.ignoreSaveFromSaveParticipants = false;
@@ -434,6 +451,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }
             versionId = this.versionId;
             this.inErrorMode = false;
+            progress.report({ message: ( localizeWithPath(_moduleId, 1, "Writing into file...")) });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
             const resolvedFileWorkingCopy = this;
@@ -511,12 +529,12 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         if (fileOperationError.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
             message = ( localizeWithPath(
                 _moduleId,
-                0,
+                2,
                 "Failed to save '{0}': The content of the file is newer. Do you want to overwrite the file with your changes?",
                 this.name
             ));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: ( localizeWithPath(_moduleId, 1, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localizeWithPath(_moduleId, 2, "Discard")), run: () => this.revert() }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: ( localizeWithPath(_moduleId, 3, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localizeWithPath(_moduleId, 4, "Discard")), run: () => this.revert() }));
         }
         else {
             const isWriteLocked = fileOperationError.fileOperationResult === FileOperationResult.FILE_WRITE_LOCKED;
@@ -530,22 +548,22 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 primaryActions.push(toAction({
                     id: 'fileWorkingCopy.saveElevated',
                     label: triedToUnlock ?
-                        isWindows ? ( localizeWithPath(_moduleId, 3, "Overwrite as Admin...")) : ( localizeWithPath(_moduleId, 4, "Overwrite as Sudo...")) :
-                        isWindows ? ( localizeWithPath(_moduleId, 5, "Retry as Admin...")) : ( localizeWithPath(_moduleId, 6, "Retry as Sudo...")),
+                        isWindows ? ( localizeWithPath(_moduleId, 5, "Overwrite as Admin...")) : ( localizeWithPath(_moduleId, 6, "Overwrite as Sudo...")) :
+                        isWindows ? ( localizeWithPath(_moduleId, 7, "Retry as Admin...")) : ( localizeWithPath(_moduleId, 8, "Retry as Sudo...")),
                     run: () => {
                         this.save({ ...options, writeElevated: true, writeUnlock: triedToUnlock, reason: SaveReason.EXPLICIT });
                     }
                 }));
             }
             else if (isWriteLocked) {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localizeWithPath(_moduleId, 1, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: SaveReason.EXPLICIT }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localizeWithPath(_moduleId, 3, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: SaveReason.EXPLICIT }) }));
             }
             else {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localizeWithPath(_moduleId, 7, "Retry")), run: () => this.save({ ...options, reason: SaveReason.EXPLICIT }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localizeWithPath(_moduleId, 9, "Retry")), run: () => this.save({ ...options, reason: SaveReason.EXPLICIT }) }));
             }
             primaryActions.push(toAction({
                 id: 'fileWorkingCopy.saveAs',
-                label: ( localizeWithPath(_moduleId, 8, "Save As...")),
+                label: ( localizeWithPath(_moduleId, 10, "Save As...")),
                 run: async () => {
                     const editor = this.workingCopyEditorService.findEditor(this);
                     if (editor) {
@@ -556,19 +574,19 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                     }
                 }
             }));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localizeWithPath(_moduleId, 2, "Discard")), run: () => this.revert() }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localizeWithPath(_moduleId, 4, "Discard")), run: () => this.revert() }));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
                     message = isWindows ?
                         ( localizeWithPath(
                             _moduleId,
-                            9,
+                            11,
                             "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                             this.name
                         )) :
                         ( localizeWithPath(
                             _moduleId,
-                            10,
+                            12,
                             "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                             this.name
                         ));
@@ -576,7 +594,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 else {
                     message = ( localizeWithPath(
                         _moduleId,
-                        11,
+                        13,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         this.name
                     ));
@@ -586,13 +604,13 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 message = isWindows ?
                     ( localizeWithPath(
                         _moduleId,
-                        12,
+                        14,
                         "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                         this.name
                     )) :
                     ( localizeWithPath(
                         _moduleId,
-                        13,
+                        15,
                         "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                         this.name
                     ));
@@ -600,7 +618,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             else {
                 message = ( localizeWithPath(
                     _moduleId,
-                    14,
+                    16,
                     "Failed to save '{0}': {1}",
                     this.name,
                     toErrorMessage(error, false)
@@ -690,6 +708,7 @@ StoredFileWorkingCopy = StoredFileWorkingCopy_1 = ( (__decorate([
     ( (__param(11, INotificationService))),
     ( (__param(12, IWorkingCopyEditorService))),
     ( (__param(13, IEditorService))),
-    ( (__param(14, IElevatedFileService)))
+    ( (__param(14, IElevatedFileService))),
+    ( (__param(15, IProgressService)))
 ], StoredFileWorkingCopy)));
 export { StoredFileWorkingCopy, StoredFileWorkingCopyState, isStoredFileWorkingCopySaveEvent };

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.service.d.ts

@@ -5,6 +5,7 @@ import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IFileStatWithMetadata } from '../../../../platform/files/common/files.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IWorkingCopy } from './workingCopy.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
 import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from './storedFileWorkingCopy.js';
 import { WorkingCopyFileEvent, IWorkingCopyFileOperationParticipant, IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext, ICreateFileOperation, IFileOperationUndoRedoInfo, ICreateOperation, IMoveOperation, ICopyOperation, IDeleteOperation, WorkingCopyProvider } from './workingCopyFileService.js';
 
@@ -55,7 +56,7 @@ interface IWorkingCopyFileService {
     /**
     * Runs all available save participants for stored file working copies.
     */
-    runSaveParticipants(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, token: CancellationToken): Promise<void>;
+    runSaveParticipants(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
     /**
     * Will create a resource with the provided optional contents, optionally overwriting any target.
     *

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

@@ -5,99 +5,6 @@
 
 declare module 'vscode' {
 
-	// https://github.com/microsoft/vscode/issues/205317
-
-	/**
-	 * The parameters of a query for text search.
-	 */
-	export interface TextSearchQuery {
-		/**
-		 * The text pattern to search for.
-		 */
-		pattern: string;
-
-		/**
-		 * Whether or not `pattern` should match multiple lines of text.
-		 */
-		isMultiline?: boolean;
-
-		/**
-		 * Whether or not `pattern` should be interpreted as a regular expression.
-		 */
-		isRegExp?: boolean;
-
-		/**
-		 * Whether or not the search should be case-sensitive.
-		 */
-		isCaseSensitive?: boolean;
-
-		/**
-		 * Whether or not to search for whole word matches only.
-		 */
-		isWordMatch?: boolean;
-	}
-
-	/**
-	 * Options common to file and text search
-	 */
-	export interface SearchOptions {
-		/**
-		 * The root folder to search within.
-		 */
-		folder: Uri;
-
-		/**
-		 * Files that match an `includes` glob pattern should be included in the search.
-		 */
-		includes: GlobString[];
-
-		/**
-		 * Files that match an `excludes` glob pattern should be excluded from the search.
-		 */
-		excludes: GlobString[];
-
-		/**
-		 * Whether external files that exclude files, like .gitignore, should be respected.
-		 * See the vscode setting `"search.useIgnoreFiles"`.
-		 */
-		useIgnoreFiles: boolean;
-
-		/**
-		 * Whether symlinks should be followed while searching.
-		 * See the vscode setting `"search.followSymlinks"`.
-		 */
-		followSymlinks: boolean;
-
-		/**
-		 * Whether global files that exclude files, like .gitignore, should be respected.
-		 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
-		 */
-		useGlobalIgnoreFiles: boolean;
-
-		/**
-		 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
-		 * See the vscode setting `"search.useParentIgnoreFiles"`.
-		 */
-		useParentIgnoreFiles: boolean;
-	}
-
-	/**
-	 * Options to specify the size of the result text preview.
-	 * These options don't affect the size of the match itself, just the amount of preview text.
-	 */
-	export interface TextSearchPreviewOptions {
-		/**
-		 * The maximum number of lines in the preview.
-		 * Only search providers that support multiline search will ever return more than one line in the match.
-		 */
-		matchLines: number;
-
-		/**
-		 * The maximum number of characters included per line.
-		 */
-		charsPerLine: number;
-	}
-
 	/**
 	 * Options that apply to AI text search.
 	 */
@@ -129,109 +36,6 @@ declare module 'vscode' {
 	}
 
 
-
-	/**
-	 * A message regarding a completed search.
-	 */
-	export interface TextSearchCompleteMessage {
-		/**
-		 * Markdown text of the message.
-		 */
-		text: string;
-		/**
-		 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
-		 * Messaged are untrusted by default.
-		 */
-		trusted?: boolean;
-		/**
-		 * The message type, this affects how the message will be rendered.
-		 */
-		type: TextSearchCompleteMessageType;
-	}
-
-	/**
-	 * Information collected when text search is complete.
-	 */
-	export interface TextSearchComplete {
-		/**
-		 * Whether the search hit the limit on the maximum number of search results.
-		 * `maxResults` on {@linkcode AITextSearchOptions} specifies the max number of results.
-		 * - If exactly that number of matches exist, this should be false.
-		 * - If `maxResults` matches are returned and more exist, this should be true.
-		 * - If search hits an internal limit which is less than `maxResults`, this should be true.
-		 */
-		limitHit?: boolean;
-
-		/**
-		 * Additional information regarding the state of the completed search.
-		 *
-		 * Messages with "Information" style support links in markdown syntax:
-		 * - Click to [run a command](command:workbench.action.OpenQuickPick)
-		 * - Click to [open a website](https://aka.ms)
-		 *
-		 * Commands may optionally return { triggerSearch: true } to signal to the editor that the original search should run be again.
-		 */
-		message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
-	}
-
-	/**
-	 * A preview of the text result.
-	 */
-	export interface TextSearchMatchPreview {
-		/**
-		 * The matching lines of text, or a portion of the matching line that contains the match.
-		 */
-		text: string;
-
-		/**
-		 * The Range within `text` corresponding to the text of the match.
-		 * The number of matches must match the TextSearchMatch's range property.
-		 */
-		matches: Range | Range[];
-	}
-
-	/**
-	 * A match from a text search
-	 */
-	export interface TextSearchMatch {
-		/**
-		 * The uri for the matching document.
-		 */
-		uri: Uri;
-
-		/**
-		 * The range of the match within the document, or multiple ranges for multiple matches.
-		 */
-		ranges: Range | Range[];
-
-		/**
-		 * A preview of the text match.
-		 */
-		preview: TextSearchMatchPreview;
-	}
-
-	/**
-	 * A line of context surrounding a TextSearchMatch.
-	 */
-	export interface TextSearchContext {
-		/**
-		 * The uri for the matching document.
-		 */
-		uri: Uri;
-
-		/**
-		 * One line of text.
-		 * previewOptions.charsPerLine applies to this
-		 */
-		text: string;
-
-		/**
-		 * The line number of this line of context.
-		 */
-		lineNumber: number;
-	}
-
-
 	/**
 	 * An AITextSearchProvider provides additional AI text search results in the workspace.
 	 */

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

@@ -6,23 +6,41 @@
 declare module 'vscode' {
 	export class FileCoverage2 extends FileCoverage {
 		/**
-		 * Test {@link TestItem} this file coverage is generated from. If undefined,
-		 * the editor will assume the coverage is the overall summary coverage for
-		 * the entire file.
-		 *
-		 * If per-test coverage is available, an extension should append multiple
-		 * `FileCoverage` instances with this property set for each test item. It
-		 * must also append a `FileCoverage` instance without this property set to
-		 * represent the overall coverage of the file.
+		 * A list of {@link TestItem test cases} that generated coverage in this
+		 * file. If set, then {@link TestRunProfile.loadDetailedCoverageForTest}
+		 * should also be defined in order to retrieve detailed coverage information.
 		 */
-		testItem?: TestItem;
+		fromTests: TestItem[];
 
 		constructor(
 			uri: Uri,
 			statementCoverage: TestCoverageCount,
 			branchCoverage?: TestCoverageCount,
 			declarationCoverage?: TestCoverageCount,
-			testItem?: TestItem,
+			fromTests?: TestItem[],
 		);
 	}
+
+	export interface TestRunProfile {
+		/**
+		 * An extension-provided function that provides detailed statement and
+		 * function-level coverage for a single test in a file. This is the per-test
+		 * sibling of {@link TestRunProfile.loadDetailedCoverage}, called only if
+		 * a test item is provided in {@link FileCoverage.fromTests} and only for
+		 * files where such data is reported.
+		 *
+		 * The editor will call this when user asks to view coverage for a test in
+		 * a file, and the returned coverage information is used to display exactly
+		 * what code was run by that test.
+		 *
+		 * The {@link FileCoverage} object passed to this function is the same
+		 * instance emitted on {@link TestRun.addCoverage} calls associated with this profile.
+		 *
+		 * @param testRun The test run that generated the coverage data.
+		 * @param fileCoverage The file coverage object to load detailed coverage for.
+		 * @param fromTestItem The test item to request coverage information for.
+		 * @param token A cancellation token that indicates the operation should be cancelled.
+		 */
+		loadDetailedCoverageForTest?: (testRun: TestRun, fileCoverage: FileCoverage, fromTestItem: TestItem, token: CancellationToken) => Thenable<FileCoverageDetail[]>;
+	}
 }

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

@@ -7,42 +7,50 @@ declare module 'vscode' {
 
 	// https://github.com/microsoft/vscode/issues/152399
 
-	export interface AuthenticationForceNewSessionOptions {
-		/**
-		 * The session that you are asking to be recreated. The Auth Provider can use this to
-		 * help guide the user to log in to the correct account.
-		 */
-		sessionToRecreate?: AuthenticationSession;
-	}
+	// FOR THE CONSUMER
 
 	export namespace authentication {
 		/**
-		 * Get all authentication sessions matching the desired scopes that this extension has access to. In order to request access,
-		 * use {@link getSession}. To request an additional account, specify {@link AuthenticationGetSessionOptions.clearSessionPreference}
-		 * and {@link AuthenticationGetSessionOptions.createIfNone} together.
+		 * Get all accounts that the user is logged in to for the specified provider.
+		 * Use this paired with {@link getSession} in order to get an authentication session for a specific account.
 		 *
 		 * Currently, there are only two authentication providers that are contributed from built in extensions
 		 * to the editor that implement GitHub and Microsoft authentication: their providerId's are 'github' and 'microsoft'.
 		 *
-		 * @param providerId The id of the provider to use
-		 * @param scopes A list of scopes representing the permissions requested. These are dependent on the authentication provider
-		 * @returns A thenable that resolves to a readonly array of authentication sessions.
+		 * Note: Getting accounts does not imply that your extension has access to that account or its authentication sessions. You can verify access to the account by calling {@link getSession}.
+		 *
+			 * @param providerId The id of the provider to use
+			 * @returns A thenable that resolves to a readonly array of authentication accounts.
+			 */
+		export function getAccounts(providerId: string): Thenable<readonly AuthenticationSessionAccountInformation[]>;
+	}
+
+	export interface AuthenticationGetSessionOptions {
+		/**
+		 * The account that you would like to get a session for. This is passed down to the Authentication Provider to be used for creating the correct session.
 		 */
-		export function getSessions(providerId: string, scopes: readonly string[]): Thenable<readonly AuthenticationSession[]>;
+		account?: AuthenticationSessionAccountInformation;
 	}
 
-	/**
-	 * The options passed in to the provider when creating a session.
-	 */
-	export interface AuthenticationProviderCreateSessionOptions {
+	// FOR THE AUTH PROVIDER
+
+	export interface AuthenticationProviderSessionOptions {
 		/**
-		 * The session that is being asked to be recreated. If this is passed in, the provider should
-		 * attempt to recreate the session based on the information in this session.
+		 * The account that is being asked about. If this is passed in, the provider should
+		 * attempt to return the sessions that are only related to this account.
 		 */
-		sessionToRecreate?: AuthenticationSession;
+		account?: AuthenticationSessionAccountInformation;
 	}
 
 	export interface AuthenticationProvider {
+		/**
+		 * Get a list of sessions.
+		 * @param scopes An optional list of scopes. If provided, the sessions returned should match
+		 * these permissions, otherwise all sessions should be returned.
+		 * @param options Additional options for getting sessions.
+		 * @returns A promise that resolves to an array of authentication sessions.
+		 */
+		getSessions(scopes: readonly string[] | undefined, options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession[]>;
 		/**
 		 * Prompts a user to login.
 		 *
@@ -57,6 +65,6 @@ declare module 'vscode' {
 		 * @param options Additional options for creating a session.
 		 * @returns A promise that resolves to an authentication session.
 		 */
-		createSession(scopes: readonly string[], options: AuthenticationProviderCreateSessionOptions): Thenable<AuthenticationSession>;
+		createSession(scopes: readonly string[], options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession>;
 	}
 }

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

@@ -10,20 +10,29 @@ declare module 'vscode' {
 		part: string;
 	}
 
+	export interface ChatResponseFragment2 {
+		index: number;
+		part: LanguageModelChatResponseTextPart | LanguageModelChatResponseFunctionUsePart;
+	}
+
 	// @API extension ship a d.ts files for their options
 
 	/**
 	 * Represents a large language model that accepts ChatML messages and produces a streaming response
 	 */
-	export interface ChatResponseProvider {
+	export interface LanguageModelChatProvider {
 
 		onDidReceiveLanguageModelResponse2?: Event<{ readonly extensionId: string; readonly participant?: string; readonly tokenCount?: number }>;
 
 		provideLanguageModelResponse(messages: LanguageModelChatMessage[], options: { [name: string]: any }, extensionId: string, progress: Progress<ChatResponseFragment>, token: CancellationToken): Thenable<any>;
 
+		provideLanguageModelResponse2?(messages: LanguageModelChatMessage[], options: LanguageModelChatRequestOptions, extensionId: string, progress: Progress<ChatResponseFragment2>, token: CancellationToken): Thenable<any>;
+
 		provideTokenCount(text: string | LanguageModelChatMessage, token: CancellationToken): Thenable<number>;
 	}
 
+	export type ChatResponseProvider = LanguageModelChatProvider;
+
 	export interface ChatResponseProviderMetadata {
 
 		readonly vendor: string;
@@ -64,14 +73,14 @@ declare module 'vscode' {
 	export namespace chat {
 
 		/**
-		 * Register a LLM as chat response provider to the editor.
-		 *
-		 *
-		 * @param id
-		 * @param provider
-		 * @param metadata
-		 */
+		 * @deprecated use `lm.registerChatResponseProvider` instead
+		*/
 		export function registerChatResponseProvider(id: string, provider: ChatResponseProvider, metadata: ChatResponseProviderMetadata): Disposable;
 	}
 
+	export namespace lm {
+
+		export function registerChatModelProvider(id: string, provider: LanguageModelChatProvider, metadata: ChatResponseProviderMetadata): Disposable;
+	}
+
 }

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

@@ -19,15 +19,6 @@ declare module 'vscode' {
 		 * @param icon An icon to display when selecting context in the picker UI.
 		 */
 		export function registerChatVariableResolver(id: string, name: string, userDescription: string, modelDescription: string | undefined, isSlow: boolean | undefined, resolver: ChatVariableResolver, fullName?: string, icon?: ThemeIcon): Disposable;
-
-		/**
-		 * Attaches a chat context with the specified name, value, and location.
-		 *
-		 * @param name - The name of the chat context.
-		 * @param value - The value of the chat context.
-		 * @param location - The location of the chat context.
-		 */
-		export function attachContext(name: string, value: string | Uri | Location | unknown, location: ChatLocation.Panel): void;
 	}
 
 	export interface ChatVariableValue {

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

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  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' {
+
+	// @alexr00 https://github.com/microsoft/vscode/issues/167253
+
+	/**
+	 * Options to reveal a comment thread in an editor.
+	 */
+	export interface CommentThreadRevealOptions {
+		/**
+		 * By default, the comment thread will be focused. Set `preserveFocus` to `true` to maintain the original focus.
+		 */
+		preserveFocus?: boolean;
+
+		/**
+		 * Focus the comment thread reply editor, if the thread supports replying.
+		 */
+		focusReply?: boolean;
+	}
+
+	export interface CommentThread {
+		/**
+		 * Reveal the comment thread in an editor.
+		 */
+		reveal(options?: CommentThreadRevealOptions): Thenable<void>;
+	}
+
+}

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

@@ -28,5 +28,15 @@ declare module 'vscode' {
 		 * Worth noting that we already have this problem for the `comments` property.
 		*/
 		state?: CommentThreadState | { resolved?: CommentThreadState; applicability?: CommentThreadApplicability };
+		readonly uri: Uri;
+		range: Range | undefined;
+		comments: readonly Comment[];
+		collapsibleState: CommentThreadCollapsibleState;
+		canReply: boolean;
+		contextValue?: string;
+		label?: string;
+		dispose(): void;
+		// Part of the comment reveal proposal
+		reveal(options?: CommentThreadRevealOptions): Thenable<void>;
 	}
 }

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

@@ -28,7 +28,7 @@ declare module 'vscode' {
 		 * An optional set of glob patterns to exclude from watching.
 		 * Glob patterns are always matched relative to the watched folder.
 		 */
-		readonly excludes?: string[];
+		readonly excludes: string[];
 	}
 
 	export namespace workspace {