@codingame/monaco-vscode-api 9.0.3 → 10.0.0

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

@@ -2,11 +2,9 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localize } from '../../../../nls.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { ETAG_DISABLED, FileOperationResult, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
+import { ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
-import { SaveReason } from '../../../common/editor.js';
 import { IWorkingCopyService } from './workingCopyService.service.js';
-import { WorkingCopyCapabilities } from './workingCopy.js';
 import { TaskSequentializer, raceCancellation, timeout } from '../../../../base/common/async.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
@@ -23,20 +21,9 @@ import { IWorkingCopyEditorService } from './workingCopyEditorService.service.js
 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;
-var StoredFileWorkingCopyState;
-( ((function(StoredFileWorkingCopyState) {
-    StoredFileWorkingCopyState[StoredFileWorkingCopyState["SAVED"] = 0] = "SAVED";
-    StoredFileWorkingCopyState[StoredFileWorkingCopyState["DIRTY"] = 1] = "DIRTY";
-    StoredFileWorkingCopyState[StoredFileWorkingCopyState["PENDING_SAVE"] = 2] = "PENDING_SAVE";
-    StoredFileWorkingCopyState[StoredFileWorkingCopyState["CONFLICT"] = 3] = "CONFLICT";
-    StoredFileWorkingCopyState[StoredFileWorkingCopyState["ORPHAN"] = 4] = "ORPHAN";
-    StoredFileWorkingCopyState[StoredFileWorkingCopyState["ERROR"] = 5] = "ERROR";
-})(StoredFileWorkingCopyState || (StoredFileWorkingCopyState = {}))));
 function isStoredFileWorkingCopySaveEvent(e) {
     const candidate = e;
     return !!candidate.stat;
@@ -59,7 +46,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         this.editorService = editorService;
         this.elevatedFileService = elevatedFileService;
         this.progressService = progressService;
-        this.capabilities = WorkingCopyCapabilities.None;
+        this.capabilities = 0 ;
         this._model = undefined;
         this._onDidChangeContent = this._register(( (new Emitter())));
         this.onDidChangeContent = this._onDidChangeContent.event;
@@ -175,7 +162,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             ctime = Date.now();
             size = 0;
             etag = ETAG_DISABLED;
-            this.setOrphaned(error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND);
+            this.setOrphaned(error.fileOperationResult === 1 );
         }
         return this.resolveFromContent({
             resource: this.resource,
@@ -244,14 +231,14 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         catch (error) {
             const result = error.fileOperationResult;
-            this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
-            if (this.isResolved() && result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
+            this.setOrphaned(result === 1 );
+            if (this.isResolved() && result === 2 ) {
                 if (error instanceof NotModifiedSinceFileOperationError) {
                     this.updateLastResolvedFileStat(error.stat);
                 }
                 return;
             }
-            if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND && !forceReadFromFile) {
+            if (this.isResolved() && result === 1  && !forceReadFromFile) {
                 return;
             }
             throw error;
@@ -352,7 +339,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         let content = undefined;
         if (this.isResolved()) {
-            content = await raceCancellation(this.model.snapshot(SnapshotContext.Backup, token), token);
+            content = await raceCancellation(this.model.snapshot(2 , token), token);
         }
         return { meta, content };
     }
@@ -365,19 +352,19 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             this.trace('save() - ignoring request for readonly resource');
             return false;
         }
-        if ((this.hasState(StoredFileWorkingCopyState.CONFLICT) || this.hasState(StoredFileWorkingCopyState.ERROR)) &&
-            (options.reason === SaveReason.AUTO || options.reason === SaveReason.FOCUS_CHANGE || options.reason === SaveReason.WINDOW_CHANGE)) {
+        if ((this.hasState(3 ) || this.hasState(5 )) &&
+            ((options.reason === 2  || options.reason === 3  || options.reason === 4) )) {
             this.trace('save() - ignoring auto save request for file working copy that is in conflict or error');
             return false;
         }
         this.trace('save() - enter');
         await this.doSave(options);
         this.trace('save() - exit');
-        return this.hasState(StoredFileWorkingCopyState.SAVED);
+        return this.hasState(0 );
     }
     async doSave(options) {
         if (typeof options.reason !== 'number') {
-            options.reason = SaveReason.EXPLICIT;
+            options.reason = 1 ;
         }
         const versionId = this.versionId;
         this.trace(`doSave(${versionId}) - enter with versionId ${versionId}`);
@@ -403,8 +390,8 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         const saveCancellation = ( (new CancellationTokenSource()));
         return this.progressService.withProgress({
-            title: ( localize(10707, "Saving '{0}'", this.name)),
-            location: ProgressLocation.Window,
+            title: ( localize(11589, "Saving '{0}'", this.name)),
+            location: 10 ,
             cancellable: true,
             delay: this.isDirty() ? 3000 : 5000
         }, progress => {
@@ -419,7 +406,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         return this.saveSequentializer.run(versionId, (async () => {
             if (this.isResolved() && !options.skipSaveParticipants && this.workingCopyFileService.hasSaveParticipants) {
                 try {
-                    if (options.reason === SaveReason.AUTO && typeof this.lastContentChangeFromUndoRedo === 'number') {
+                    if (options.reason === 2  && typeof this.lastContentChangeFromUndoRedo === 'number') {
                         const timeFromUndoRedoToSave = Date.now() - this.lastContentChangeFromUndoRedo;
                         if (timeFromUndoRedoToSave < StoredFileWorkingCopy_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD) {
                             await timeout(StoredFileWorkingCopy_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD - timeFromUndoRedoToSave);
@@ -428,7 +415,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 }, progress, saveCancellation.token);
+                            await this.workingCopyFileService.runSaveParticipants(this, { reason: options.reason ?? 1 , savedFrom: options.from }, progress, saveCancellation.token);
                         }
                         finally {
                             this.ignoreSaveFromSaveParticipants = false;
@@ -450,7 +437,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }
             versionId = this.versionId;
             this.inErrorMode = false;
-            progress.report({ message: ( localize(10708, "Writing into file...")) });
+            progress.report({ message: ( localize(11590, "Writing into file...")) });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
             const resolvedFileWorkingCopy = this;
@@ -474,7 +461,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                         }
                     }
                     else {
-                        const snapshot = await raceCancellation(resolvedFileWorkingCopy.model.snapshot(SnapshotContext.Save, saveCancellation.token), saveCancellation.token);
+                        const snapshot = await raceCancellation(resolvedFileWorkingCopy.model.snapshot(1 , saveCancellation.token), saveCancellation.token);
                         if (saveCancellation.token.isCancellationRequested) {
                             return;
                         }
@@ -515,7 +502,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         this.setDirty(true);
         this.inErrorMode = true;
-        if (error.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
+        if (error.fileOperationResult === 3 ) {
             this.inConflictMode = true;
         }
         this.doHandleSaveError(error, options);
@@ -525,19 +512,19 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         const fileOperationError = error;
         const primaryActions = [];
         let message;
-        if (fileOperationError.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
+        if (fileOperationError.fileOperationResult === 3 ) {
             message = ( localize(
-                10709,
+                11591,
                 "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: ( localize(10710, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localize(10711, "Revert")), run: () => this.revert() }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: ( localize(11592, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: 1  }) }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localize(11593, "Revert")), run: () => this.revert() }));
         }
         else {
-            const isWriteLocked = fileOperationError.fileOperationResult === FileOperationResult.FILE_WRITE_LOCKED;
+            const isWriteLocked = fileOperationError.fileOperationResult === 5 ;
             const triedToUnlock = isWriteLocked && fileOperationError.options?.unlock;
-            const isPermissionDenied = fileOperationError.fileOperationResult === FileOperationResult.FILE_PERMISSION_DENIED;
+            const isPermissionDenied = fileOperationError.fileOperationResult === 6 ;
             const canSaveElevated = this.elevatedFileService.isSupported(this.resource);
             if (isErrorWithActions(error)) {
                 primaryActions.push(...error.actions);
@@ -546,50 +533,50 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 primaryActions.push(toAction({
                     id: 'fileWorkingCopy.saveElevated',
                     label: triedToUnlock ?
-                        isWindows ? ( localize(10712, "Overwrite as Admin...")) : ( localize(10713, "Overwrite as Sudo...")) :
-                        isWindows ? ( localize(10714, "Retry as Admin...")) : ( localize(10715, "Retry as Sudo...")),
+                        isWindows ? ( localize(11594, "Overwrite as Admin...")) : ( localize(11595, "Overwrite as Sudo...")) :
+                        isWindows ? ( localize(11596, "Retry as Admin...")) : ( localize(11597, "Retry as Sudo...")),
                     run: () => {
-                        this.save({ ...options, writeElevated: true, writeUnlock: triedToUnlock, reason: SaveReason.EXPLICIT });
+                        this.save({ ...options, writeElevated: true, writeUnlock: triedToUnlock, reason: 1  });
                     }
                 }));
             }
             else if (isWriteLocked) {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localize(10710, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: SaveReason.EXPLICIT }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localize(11592, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: 1  }) }));
             }
             else {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localize(10716, "Retry")), run: () => this.save({ ...options, reason: SaveReason.EXPLICIT }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localize(11598, "Retry")), run: () => this.save({ ...options, reason: 1  }) }));
             }
             primaryActions.push(toAction({
                 id: 'fileWorkingCopy.saveAs',
-                label: ( localize(10717, "Save As...")),
+                label: ( localize(11599, "Save As...")),
                 run: async () => {
                     const editor = this.workingCopyEditorService.findEditor(this);
                     if (editor) {
-                        const result = await this.editorService.save(editor, { saveAs: true, reason: SaveReason.EXPLICIT });
+                        const result = await this.editorService.save(editor, { saveAs: true, reason: 1  });
                         if (!result.success) {
                             this.doHandleSaveError(error, options);
                         }
                     }
                 }
             }));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localize(10711, "Revert")), run: () => this.revert() }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localize(11593, "Revert")), run: () => this.revert() }));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
                     message = isWindows ?
                         ( localize(
-                            10718,
+                            11600,
                             "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                             this.name
                         )) :
                         ( localize(
-                            10719,
+                            11601,
                             "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                             this.name
                         ));
                 }
                 else {
                     message = ( localize(
-                        10720,
+                        11602,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         this.name
                     ));
@@ -598,19 +585,19 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             else if (canSaveElevated && isPermissionDenied) {
                 message = isWindows ?
                     ( localize(
-                        10721,
+                        11603,
                         "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                         this.name
                     )) :
                     ( localize(
-                        10722,
+                        11604,
                         "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                         this.name
                     ));
             }
             else {
                 message = ( localize(
-                    10723,
+                    11605,
                     "Failed to save '{0}': {1}",
                     this.name,
                     toErrorMessage(error, false)
@@ -649,7 +636,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 await this.forceResolveFromFile();
             }
             catch (error) {
-                if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
+                if (error.fileOperationResult !== 1 ) {
                     undoSetDirty();
                     throw error;
                 }
@@ -662,17 +649,17 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
     }
     hasState(state) {
         switch (state) {
-            case StoredFileWorkingCopyState.CONFLICT:
+            case 3 :
                 return this.inConflictMode;
-            case StoredFileWorkingCopyState.DIRTY:
+            case 1 :
                 return this.dirty;
-            case StoredFileWorkingCopyState.ERROR:
+            case 5 :
                 return this.inErrorMode;
-            case StoredFileWorkingCopyState.ORPHAN:
+            case 4 :
                 return this.isOrphaned();
-            case StoredFileWorkingCopyState.PENDING_SAVE:
+            case 2 :
                 return this.saveSequentializer.isRunning();
-            case StoredFileWorkingCopyState.SAVED:
+            case 0 :
                 return !this.dirty;
         }
     }
@@ -706,4 +693,4 @@ StoredFileWorkingCopy = StoredFileWorkingCopy_1 = ( (__decorate([
     ( (__param(14, IElevatedFileService))),
     ( (__param(15, IProgressService)))
 ], StoredFileWorkingCopy)));
-export { StoredFileWorkingCopy, StoredFileWorkingCopyState, isStoredFileWorkingCopySaveEvent };
+export { StoredFileWorkingCopy, isStoredFileWorkingCopySaveEvent };

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

@@ -1,8 +1,2 @@
-var WorkingCopyCapabilities;
-( (function(WorkingCopyCapabilities) {
-    WorkingCopyCapabilities[WorkingCopyCapabilities["None"] = 0] = "None";
-    WorkingCopyCapabilities[WorkingCopyCapabilities["Untitled"] = 2] = "Untitled";
-    WorkingCopyCapabilities[WorkingCopyCapabilities["Scratchpad"] = 4] = "Scratchpad";
-})(WorkingCopyCapabilities || (WorkingCopyCapabilities = {})));
 const NO_TYPE_ID = '';
-export { NO_TYPE_ID, WorkingCopyCapabilities };
+export { NO_TYPE_ID };

package/vscode/src/vs/workbench/services/workspaces/common/workspaceTrust.js

@@ -5,15 +5,12 @@ import { LinkedList } from '../../../../base/common/linkedList.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import '../../../../platform/instantiation/common/extensions.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.service.js';
 import { getRemoteAuthority } from '../../../../platform/remote/common/remoteHosts.js';
 import { isVirtualResource } from '../../../../platform/workspace/common/virtualWorkspace.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
-import { isSavedWorkspace, WorkbenchState, isTemporaryWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { isSavedWorkspace, isTemporaryWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
-import { WorkspaceTrustUriResponse } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.service.js';
 import { Memento } from '../../../common/memento.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.service.js';
@@ -133,7 +130,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
     }
     registerListeners() {
         this._register(this.workspaceService.onDidChangeWorkspaceFolders(async () => await this.updateWorkspaceTrust()));
-        this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, this.storageKey, this._register(( new DisposableStore())))(async () => {
+        this._register(this.storageService.onDidChangeValue(-1 , this.storageKey, this._register(( new DisposableStore())))(async () => {
             if (JSON.stringify(this._trustStateInfo) !== JSON.stringify(this.loadTrustInfo())) {
                 this._trustStateInfo = this.loadTrustInfo();
                 this._onDidChangeTrustedFolders.fire();
@@ -183,7 +180,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
         ));
     }
     loadTrustInfo() {
-        const infoAsString = this.storageService.get(this.storageKey, StorageScope.APPLICATION);
+        const infoAsString = this.storageService.get(this.storageKey, -1 );
         let result;
         try {
             if (infoAsString) {
@@ -204,7 +201,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
         return result;
     }
     async saveTrustInfo() {
-        this.storageService.store(this.storageKey, JSON.stringify(this._trustStateInfo), StorageScope.APPLICATION, StorageTarget.MACHINE);
+        this.storageService.store(this.storageKey, JSON.stringify(this._trustStateInfo), -1 , 1 );
         this._onDidChangeTrustedFolders.fire();
         await this.updateWorkspaceTrust();
     }
@@ -317,7 +314,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
         }
     }
     isEmptyWorkspace() {
-        if (this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY) {
+        if (this.workspaceService.getWorkbenchState() === 1 ) {
             return true;
         }
         const workspace = this.workspaceService.getWorkspace();
@@ -508,14 +505,14 @@ let WorkspaceTrustRequestService = class WorkspaceTrustRequestService extends Di
         if (!this._openFilesTrustRequestResolver) {
             return;
         }
-        if (result === WorkspaceTrustUriResponse.Open) {
+        if (result === 1 ) {
             this.workspaceTrustManagementService.acceptsOutOfWorkspaceFiles = true;
         }
         if (saveResponse) {
-            if (result === WorkspaceTrustUriResponse.Open) {
+            if (result === 1 ) {
                 this.untrustedFilesSetting = 'open';
             }
-            if (result === WorkspaceTrustUriResponse.OpenInNewWindow) {
+            if (result === 2 ) {
                 this.untrustedFilesSetting = 'newWindow';
             }
         }
@@ -525,22 +522,22 @@ let WorkspaceTrustRequestService = class WorkspaceTrustRequestService extends Di
     }
     async requestOpenFilesTrust(uris) {
         if (!this.workspaceTrustManagementService.isWorkspaceTrusted()) {
-            return WorkspaceTrustUriResponse.Open;
+            return 1 ;
         }
         const openFilesTrustInfo = await Promise.all(( uris.map(uri => this.workspaceTrustManagementService.getUriTrustInfo(uri))));
         if (( openFilesTrustInfo.map(info => info.trusted)).every(trusted => trusted)) {
-            return WorkspaceTrustUriResponse.Open;
+            return 1 ;
         }
         if (this.untrustedFilesSetting !== 'prompt') {
             if (this.untrustedFilesSetting === 'newWindow') {
-                return WorkspaceTrustUriResponse.OpenInNewWindow;
+                return 2 ;
             }
             if (this.untrustedFilesSetting === 'open') {
-                return WorkspaceTrustUriResponse.Open;
+                return 1 ;
             }
         }
         if (this.workspaceTrustManagementService.acceptsOutOfWorkspaceFiles) {
-            return WorkspaceTrustUriResponse.Open;
+            return 1 ;
         }
         if (!this._openFilesTrustRequestPromise) {
             this._openFilesTrustRequestPromise = ( new Promise(resolve => {
@@ -628,7 +625,7 @@ class WorkspaceTrustMemento {
         this._isEmptyWorkspaceTrustedKey = 'isEmptyWorkspaceTrusted';
         if (storageService) {
             this._memento = ( new Memento('workspaceTrust', storageService));
-            this._mementoObject = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this._mementoObject = this._memento.getMemento(1 , 1 );
         }
         else {
             this._mementoObject = {};

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

@@ -40,6 +40,11 @@ declare module 'vscode' {
 	 * An AITextSearchProvider provides additional AI text search results in the workspace.
 	 */
 	export interface AITextSearchProvider {
+		/**
+		 * The name of the AI searcher. Will be displayed as `{name} Results` in the Search View.
+		 */
+		readonly name?: string;
+
 		/**
 		 * Provide results that match the given text pattern.
 		 * @param query The parameter for this query.
@@ -48,6 +53,7 @@ declare module 'vscode' {
 		 * @param token A cancellation token.
 		 */
 		provideAITextSearchResults(query: string, options: AITextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
+
 	}
 
 	export namespace workspace {

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

@@ -8,6 +8,11 @@ declare module 'vscode' {
 	 * An AITextSearchProvider provides additional AI text search results in the workspace.
 	 */
 	export interface AITextSearchProviderNew {
+		/**
+		 * The name of the AI searcher. Will be displayed as `{name} Results` in the Search View.
+		 */
+		readonly name?: string;
+
 		/**
 		 * WARNING: VERY EXPERIMENTAL.
 		 *

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

@@ -36,6 +36,11 @@ declare module 'vscode' {
 		constructor(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]);
 	}
 
+	export class ChatResponseCodeblockUriPart {
+		value: Uri;
+		constructor(value: Uri);
+	}
+
 	/**
 	 * Displays a {@link Command command} as a button in the chat response.
 	 */
@@ -129,6 +134,18 @@ declare module 'vscode' {
 		constructor(uri: Uri, range: Range);
 	}
 
+	// Extended to add `SymbolInformation`. Would also be added to `constructor`.
+	export interface ChatResponseAnchorPart {
+		/**
+		 * The target of this anchor.
+		 *
+		 * If this is a {@linkcode Uri} or {@linkcode Location}, this is rendered as a normal link.
+		 *
+		 * If this is a {@linkcode SymbolInformation}, this is rendered as a symbol link.
+		 */
+		value2: Uri | Location | SymbolInformation;
+	}
+
 	export interface ChatResponseStream {
 
 		/**
@@ -143,6 +160,7 @@ declare module 'vscode' {
 
 		textEdit(target: Uri, edits: TextEdit | TextEdit[]): void;
 		markdownWithVulnerabilities(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]): void;
+		codeblockUri(uri: Uri): void;
 		detectedParticipant(participant: string, command?: ChatCommand): void;
 		push(part: ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseWarningPart | ChatResponseProgressPart2): void;
 
@@ -196,6 +214,8 @@ declare module 'vscode' {
 		 * The `data` for any confirmations that were rejected
 		 */
 		rejectedConfirmationData?: any[];
+
+		userSelectedModel?: LanguageModelChat;
 	}
 
 	// TODO@API fit this into the stream
@@ -250,7 +270,7 @@ declare module 'vscode' {
 	export interface ChatParticipantMetadata {
 		participant: string;
 		command?: string;
-		disambiguation: { categoryName: string; description: string; examples: string[] }[];
+		disambiguation: { category: string; description: string; examples: string[] }[];
 	}
 
 	export interface ChatParticipantDetectionResult {
@@ -288,7 +308,14 @@ declare module 'vscode' {
 		codeBlockIndex: number;
 		totalCharacters: number;
 		newFile?: boolean;
-		userAction?: string;
+	}
+
+	export interface ChatApplyAction {
+		// eslint-disable-next-line local/vscode-dts-string-type-literals
+		kind: 'apply';
+		codeBlockIndex: number;
+		totalCharacters: number;
+		newFile?: boolean;
 		codeMapper?: string;
 	}
 
@@ -323,7 +350,7 @@ declare module 'vscode' {
 
 	export interface ChatUserActionEvent {
 		readonly result: ChatResult;
-		readonly action: ChatCopyAction | ChatInsertAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction;
+		readonly action: ChatCopyAction | ChatInsertAction | ChatApplyAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction;
 	}
 
 	export interface ChatPromptReference {

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

@@ -63,6 +63,10 @@ declare module 'vscode' {
 		 * Additionally, the extension can provide a label that will be shown in the UI.
 		 */
 		auth?: true | { label: string };
+
+		// TODO@API maybe an enum, LanguageModelChatProviderPickerAvailability?
+		readonly isDefault?: boolean;
+		readonly isUserSelectable?: boolean;
 	}
 
 	export interface ChatResponseProviderMetadata {

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

@@ -4,3 +4,4 @@
  *--------------------------------------------------------------------------------------------*/
 
 // empty placeholder declaration for the `chatParticipantDetection`-contribution point
+// https://github.com/microsoft/vscode/issues/227699

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

@@ -3,6 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// empty placeholder declaration for the `scm/incomingChanges/historyItem/context`-menu contribution point
-// empty placeholder declaration for the `scm/outgoingChanges/historyItem/context`-menu contribution point
+// empty placeholder declaration for the `scm/historyItem/context`-menu contribution point
 // https://github.com/microsoft/vscode/issues/201997

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

@@ -3,12 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 2
+
 declare module 'vscode' {
 
-	export type ChatWelcomeMessageContent = string | MarkdownString;
+	export interface ChatWelcomeMessageContent {
+		icon: ThemeIcon;
+		title: string;
+		message: MarkdownString;
+	}
 
 	export interface ChatWelcomeMessageProvider {
-		provideWelcomeMessage(location: ChatLocation, token: CancellationToken): ProviderResult<ChatWelcomeMessageContent[]>;
+		provideWelcomeMessage?(token: CancellationToken): ProviderResult<ChatWelcomeMessageContent>;
 		provideSampleQuestions?(location: ChatLocation, token: CancellationToken): ProviderResult<ChatFollowup[]>;
 	}
 

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

@@ -61,7 +61,7 @@ declare module 'vscode' {
 		// eslint-disable-next-line local/vscode-dts-provider-naming
 		handleDidPartiallyAcceptCompletionItem?(completionItem: InlineCompletionItem, info: PartialAcceptInfo): void;
 
-		provideInlineEdits?(document: TextDocument, range: Range, context: InlineCompletionContext, token: CancellationToken): ProviderResult<InlineCompletionItem[] | InlineCompletionList>;
+		provideInlineEditsForRange?(document: TextDocument, range: Range, context: InlineCompletionContext, token: CancellationToken): ProviderResult<InlineCompletionItem[] | InlineCompletionList>;
 	}
 
 	export interface InlineCompletionContext {