@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/platform/userDataSync/common/userDataSyncStoreService.js

@@ -17,9 +17,8 @@ import { IProductService } from '../../product/common/productService.service.js'
 import { asJson, asTextOrError, isSuccess, hasNoContent, asText } from '../../request/common/request.js';
 import { IRequestService } from '../../request/common/request.service.js';
 import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
-import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
-import { UserDataSyncStoreError, UserDataSyncErrorCode, HEADER_OPERATION_ID, HEADER_EXECUTION_ID, SYNC_SERVICE_URL_TYPE } from './userDataSync.js';
+import { UserDataSyncStoreError, HEADER_OPERATION_ID, HEADER_EXECUTION_ID, SYNC_SERVICE_URL_TYPE } from './userDataSync.js';
 import { IUserDataSyncLogService, IUserDataSyncStoreManagementService } from './userDataSync.service.js';
 const CONFIGURATION_SYNC_STORE_KEY = 'configurationSync.store';
 const SYNC_PREVIOUS_STORE = 'sync.previous.store';
@@ -31,10 +30,10 @@ const REQUEST_SESSION_INTERVAL = 1000 * 60 * 5;
 let AbstractUserDataSyncStoreManagementService = class AbstractUserDataSyncStoreManagementService extends Disposable {
     get userDataSyncStore() { return this._userDataSyncStore; }
     get userDataSyncStoreType() {
-        return this.storageService.get(SYNC_SERVICE_URL_TYPE, StorageScope.APPLICATION);
+        return this.storageService.get(SYNC_SERVICE_URL_TYPE, -1 );
     }
     set userDataSyncStoreType(type) {
-        this.storageService.store(SYNC_SERVICE_URL_TYPE, type, StorageScope.APPLICATION, isWeb ? StorageTarget.USER  : StorageTarget.MACHINE);
+        this.storageService.store(SYNC_SERVICE_URL_TYPE, type, -1 , isWeb ? 0  : 1 );
     }
     constructor(productService, configurationService, storageService) {
         super();
@@ -45,7 +44,7 @@ let AbstractUserDataSyncStoreManagementService = class AbstractUserDataSyncStore
         this.onDidChangeUserDataSyncStore = this._onDidChangeUserDataSyncStore.event;
         this.updateUserDataSyncStore();
         const disposable = this._register(( new DisposableStore()));
-        this._register(Event.filter(storageService.onDidChangeValue(StorageScope.APPLICATION, SYNC_SERVICE_URL_TYPE, disposable), () => this.userDataSyncStoreType !== this.userDataSyncStore?.type, disposable)(() => this.updateUserDataSyncStore()));
+        this._register(Event.filter(storageService.onDidChangeValue(-1 , SYNC_SERVICE_URL_TYPE, disposable), () => this.userDataSyncStoreType !== this.userDataSyncStore?.type, disposable)(() => this.updateUserDataSyncStore()));
     }
     updateUserDataSyncStore() {
         this._userDataSyncStore = this.toUserDataSyncStore(this.productService[CONFIGURATION_SYNC_STORE_KEY]);
@@ -91,16 +90,16 @@ AbstractUserDataSyncStoreManagementService = ( __decorate([
 let UserDataSyncStoreManagementService = class UserDataSyncStoreManagementService extends AbstractUserDataSyncStoreManagementService {
     constructor(productService, configurationService, storageService) {
         super(productService, configurationService, storageService);
-        const previousConfigurationSyncStore = this.storageService.get(SYNC_PREVIOUS_STORE, StorageScope.APPLICATION);
+        const previousConfigurationSyncStore = this.storageService.get(SYNC_PREVIOUS_STORE, -1 );
         if (previousConfigurationSyncStore) {
             this.previousConfigurationSyncStore = JSON.parse(previousConfigurationSyncStore);
         }
         const syncStore = this.productService[CONFIGURATION_SYNC_STORE_KEY];
         if (syncStore) {
-            this.storageService.store(SYNC_PREVIOUS_STORE, JSON.stringify(syncStore), StorageScope.APPLICATION, StorageTarget.MACHINE);
+            this.storageService.store(SYNC_PREVIOUS_STORE, JSON.stringify(syncStore), -1 , 1 );
         }
         else {
-            this.storageService.remove(SYNC_PREVIOUS_STORE, StorageScope.APPLICATION);
+            this.storageService.remove(SYNC_PREVIOUS_STORE, -1 );
         }
     }
     async switch(type) {
@@ -166,7 +165,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
         this.userDataSyncStoreUrl = userDataSyncStoreUrl ? joinPath(userDataSyncStoreUrl, 'v1') : undefined;
     }
     initDonotMakeRequestsUntil() {
-        const donotMakeRequestsUntil = this.storageService.getNumber(DONOT_MAKE_REQUESTS_UNTIL_KEY, StorageScope.APPLICATION);
+        const donotMakeRequestsUntil = this.storageService.getNumber(DONOT_MAKE_REQUESTS_UNTIL_KEY, -1 );
         if (donotMakeRequestsUntil && Date.now() < donotMakeRequestsUntil) {
             this.setDonotMakeRequestsUntil(( new Date(donotMakeRequestsUntil)));
         }
@@ -179,12 +178,12 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 this.resetDonotMakeRequestsUntilPromise = undefined;
             }
             if (this._donotMakeRequestsUntil) {
-                this.storageService.store(DONOT_MAKE_REQUESTS_UNTIL_KEY, this._donotMakeRequestsUntil.getTime(), StorageScope.APPLICATION, StorageTarget.MACHINE);
+                this.storageService.store(DONOT_MAKE_REQUESTS_UNTIL_KEY, this._donotMakeRequestsUntil.getTime(), -1 , 1 );
                 this.resetDonotMakeRequestsUntilPromise = createCancelablePromise(token => timeout(this._donotMakeRequestsUntil.getTime() - Date.now(), token).then(() => this.setDonotMakeRequestsUntil(undefined)));
                 this.resetDonotMakeRequestsUntilPromise.then(null, e => null );
             }
             else {
-                this.storageService.remove(DONOT_MAKE_REQUESTS_UNTIL_KEY, StorageScope.APPLICATION);
+                this.storageService.remove(DONOT_MAKE_REQUESTS_UNTIL_KEY, -1 );
             }
             this._onDidChangeDonotMakeRequestsUntil.fire();
         }
@@ -212,7 +211,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 'Server did not return the collection id',
                 url,
-                UserDataSyncErrorCode.NoCollection,
+                "NoCollection" ,
                 context.res.statusCode,
                 context.res.headers[HEADER_OPERATION_ID]
             ));
@@ -287,7 +286,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 throw ( new UserDataSyncStoreError(
                     'Server did not return the ref',
                     url,
-                    UserDataSyncErrorCode.NoRef,
+                    "NoRef" ,
                     context.res.statusCode,
                     context.res.headers[HEADER_OPERATION_ID]
                 ));
@@ -297,7 +296,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 throw ( new UserDataSyncStoreError(
                     'Empty response',
                     url,
-                    UserDataSyncErrorCode.EmptyResponse,
+                    "EmptyResponse" ,
                     context.res.statusCode,
                     context.res.headers[HEADER_OPERATION_ID]
                 ));
@@ -322,7 +321,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 'Server did not return the ref',
                 url,
-                UserDataSyncErrorCode.NoRef,
+                "NoRef" ,
                 context.res.statusCode,
                 context.res.headers[HEADER_OPERATION_ID]
             ));
@@ -350,7 +349,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 throw ( new UserDataSyncStoreError(
                     'Server did not return the ref',
                     url,
-                    UserDataSyncErrorCode.NoRef,
+                    "NoRef" ,
                     context.res.statusCode,
                     context.res.headers[HEADER_OPERATION_ID]
                 ));
@@ -360,7 +359,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 throw ( new UserDataSyncStoreError(
                     'Empty response',
                     url,
-                    UserDataSyncErrorCode.EmptyResponse,
+                    "EmptyResponse" ,
                     context.res.statusCode,
                     context.res.headers[HEADER_OPERATION_ID]
                 ));
@@ -369,7 +368,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 manifest = { ...JSON.parse(content), ref };
             }
         }
-        const currentSessionId = this.storageService.get(USER_SESSION_ID_KEY, StorageScope.APPLICATION);
+        const currentSessionId = this.storageService.get(USER_SESSION_ID_KEY, -1 );
         if (currentSessionId && manifest && currentSessionId !== manifest.session) {
             this.clearSession();
         }
@@ -377,7 +376,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             this.clearSession();
         }
         if (manifest) {
-            this.storageService.store(USER_SESSION_ID_KEY, manifest.session, StorageScope.APPLICATION, StorageTarget.MACHINE);
+            this.storageService.store(USER_SESSION_ID_KEY, manifest.session, -1 , 1 );
         }
         return manifest;
     }
@@ -400,7 +399,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 'Server returned ' + context.res.statusCode,
                 url,
-                UserDataSyncErrorCode.EmptyResponse,
+                "EmptyResponse" ,
                 context.res.statusCode,
                 context.res.headers[HEADER_OPERATION_ID]
             ));
@@ -409,7 +408,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 'Empty response',
                 url,
-                UserDataSyncErrorCode.EmptyResponse,
+                "EmptyResponse" ,
                 context.res.statusCode,
                 context.res.headers[HEADER_OPERATION_ID]
             ));
@@ -420,15 +419,15 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
         return collection ? joinPath(userDataSyncStoreUrl, 'collection', collection, 'resource', resource) : joinPath(userDataSyncStoreUrl, 'resource', resource);
     }
     clearSession() {
-        this.storageService.remove(USER_SESSION_ID_KEY, StorageScope.APPLICATION);
-        this.storageService.remove(MACHINE_SESSION_ID_KEY, StorageScope.APPLICATION);
+        this.storageService.remove(USER_SESSION_ID_KEY, -1 );
+        this.storageService.remove(MACHINE_SESSION_ID_KEY, -1 );
     }
     async request(url, options, successCodes, token) {
         if (!this.authToken) {
             throw ( new UserDataSyncStoreError(
                 'No Auth Token Available',
                 url,
-                UserDataSyncErrorCode.Unauthorized,
+                "Unauthorized" ,
                 undefined,
                 undefined
             ));
@@ -437,7 +436,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed because of too many requests (429).`,
                 url,
-                UserDataSyncErrorCode.TooManyRequestsAndRetryAfter,
+                "TooManyRequestsAndRetryAfter" ,
                 undefined,
                 undefined
             ));
@@ -458,22 +457,22 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
         }
         catch (e) {
             if (!(e instanceof UserDataSyncStoreError)) {
-                let code = UserDataSyncErrorCode.RequestFailed;
+                let code = "RequestFailed" ;
                 const errorMessage = getErrorMessage(e).toLowerCase();
                 if (errorMessage.includes('xhr timeout')) {
-                    code = UserDataSyncErrorCode.RequestTimeout;
+                    code = "RequestTimeout" ;
                 }
                 else if (errorMessage.includes('protocol') && errorMessage.includes('not supported')) {
-                    code = UserDataSyncErrorCode.RequestProtocolNotSupported;
+                    code = "RequestProtocolNotSupported" ;
                 }
                 else if (errorMessage.includes('request path contains unescaped characters')) {
-                    code = UserDataSyncErrorCode.RequestPathNotEscaped;
+                    code = "RequestPathNotEscaped" ;
                 }
                 else if (errorMessage.includes('headers must be an object')) {
-                    code = UserDataSyncErrorCode.RequestHeadersNotObject;
+                    code = "RequestHeadersNotObject" ;
                 }
                 else if (isCancellationError(e)) {
-                    code = UserDataSyncErrorCode.RequestCanceled;
+                    code = "RequestCanceled" ;
                 }
                 e = ( new UserDataSyncStoreError(
                     `Connection refused for the request '${url}'.`,
@@ -500,21 +499,21 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
         if (context.res.statusCode === 401 || context.res.statusCode === 403) {
             this.authToken = undefined;
             if (context.res.statusCode === 401) {
-                this._onTokenFailed.fire(UserDataSyncErrorCode.Unauthorized);
+                this._onTokenFailed.fire("Unauthorized" );
                 throw ( new UserDataSyncStoreError(
                     `${options.type} request '${url}' failed because of Unauthorized (401).`,
                     url,
-                    UserDataSyncErrorCode.Unauthorized,
+                    "Unauthorized" ,
                     context.res.statusCode,
                     operationId
                 ));
             }
             if (context.res.statusCode === 403) {
-                this._onTokenFailed.fire(UserDataSyncErrorCode.Forbidden);
+                this._onTokenFailed.fire("Forbidden" );
                 throw ( new UserDataSyncStoreError(
                     `${options.type} request '${url}' failed because the access is forbidden (403).`,
                     url,
-                    UserDataSyncErrorCode.Forbidden,
+                    "Forbidden" ,
                     context.res.statusCode,
                     operationId
                 ));
@@ -525,7 +524,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed because the requested resource is not found (404).`,
                 url,
-                UserDataSyncErrorCode.NotFound,
+                "NotFound" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -534,7 +533,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed because the requested endpoint is not found (405). ${failureMessage}`,
                 url,
-                UserDataSyncErrorCode.MethodNotFound,
+                "MethodNotFound" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -543,7 +542,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed because of Conflict (409). There is new data for this resource. Make the request again with latest data.`,
                 url,
-                UserDataSyncErrorCode.Conflict,
+                "Conflict" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -552,7 +551,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed because the requested resource is not longer available (410).`,
                 url,
-                UserDataSyncErrorCode.Gone,
+                "Gone" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -561,7 +560,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed because of Precondition Failed (412). There is new data for this resource. Make the request again with latest data.`,
                 url,
-                UserDataSyncErrorCode.PreconditionFailed,
+                "PreconditionFailed" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -570,7 +569,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed because of too large payload (413).`,
                 url,
-                UserDataSyncErrorCode.TooLarge,
+                "TooLarge" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -579,7 +578,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 `${options.type} request '${url}' failed with status Upgrade Required (426). Please upgrade the client and try again.`,
                 url,
-                UserDataSyncErrorCode.UpgradeRequired,
+                "UpgradeRequired" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -591,7 +590,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 throw ( new UserDataSyncStoreError(
                     `${options.type} request '${url}' failed because of too many requests (429).`,
                     url,
-                    UserDataSyncErrorCode.TooManyRequestsAndRetryAfter,
+                    "TooManyRequestsAndRetryAfter" ,
                     context.res.statusCode,
                     operationId
                 ));
@@ -600,7 +599,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
                 throw ( new UserDataSyncStoreError(
                     `${options.type} request '${url}' failed because of too many requests (429).`,
                     url,
-                    UserDataSyncErrorCode.TooManyRequests,
+                    "RemoteTooManyRequests" ,
                     context.res.statusCode,
                     operationId
                 ));
@@ -610,7 +609,7 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
             throw ( new UserDataSyncStoreError(
                 'Server returned ' + context.res.statusCode,
                 url,
-                UserDataSyncErrorCode.Unknown,
+                "Unknown" ,
                 context.res.statusCode,
                 operationId
             ));
@@ -618,13 +617,13 @@ let UserDataSyncStoreClient = class UserDataSyncStoreClient extends Disposable {
         return context;
     }
     addSessionHeaders(headers) {
-        let machineSessionId = this.storageService.get(MACHINE_SESSION_ID_KEY, StorageScope.APPLICATION);
+        let machineSessionId = this.storageService.get(MACHINE_SESSION_ID_KEY, -1 );
         if (machineSessionId === undefined) {
             machineSessionId = generateUuid();
-            this.storageService.store(MACHINE_SESSION_ID_KEY, machineSessionId, StorageScope.APPLICATION, StorageTarget.MACHINE);
+            this.storageService.store(MACHINE_SESSION_ID_KEY, machineSessionId, -1 , 1 );
         }
         headers['X-Machine-Session-Id'] = machineSessionId;
-        const userSessionId = this.storageService.get(USER_SESSION_ID_KEY, StorageScope.APPLICATION);
+        const userSessionId = this.storageService.get(USER_SESSION_ID_KEY, -1 );
         if (userSessionId !== undefined) {
             headers['X-User-Session-Id'] = userSessionId;
         }
@@ -672,7 +671,7 @@ class RequestsSession {
             throw ( new UserDataSyncStoreError(
                 `Too many requests. Only ${this.limit} requests allowed in ${this.interval / (1000 * 60)} minutes.`,
                 url,
-                UserDataSyncErrorCode.LocalTooManyRequests,
+                "LocalTooManyRequests" ,
                 undefined,
                 undefined
             ));

package/vscode/src/vs/platform/window/common/window.js

@@ -23,22 +23,6 @@ function getMenuBarVisibility(configurationService) {
         return menuBarVisibility;
     }
 }
-var TitleBarSetting;
-( (function(TitleBarSetting) {
-    TitleBarSetting["TITLE_BAR_STYLE"] = "window.titleBarStyle";
-    TitleBarSetting["CUSTOM_TITLE_BAR_VISIBILITY"] = "window.customTitleBarVisibility";
-})(TitleBarSetting || (TitleBarSetting = {})));
-var TitlebarStyle;
-( (function(TitlebarStyle) {
-    TitlebarStyle["NATIVE"] = "native";
-    TitlebarStyle["CUSTOM"] = "custom";
-})(TitlebarStyle || (TitlebarStyle = {})));
-var CustomTitleBarVisibility;
-( (function(CustomTitleBarVisibility) {
-    CustomTitleBarVisibility["AUTO"] = "auto";
-    CustomTitleBarVisibility["WINDOWED"] = "windowed";
-    CustomTitleBarVisibility["NEVER"] = "never";
-})(CustomTitleBarVisibility || (CustomTitleBarVisibility = {})));
 function hasCustomTitlebar(configurationService, titleBarStyle) {
     return true;
 }
@@ -46,28 +30,28 @@ function hasNativeTitlebar(configurationService, titleBarStyle) {
     if (!titleBarStyle) {
         titleBarStyle = getTitleBarStyle(configurationService);
     }
-    return titleBarStyle === TitlebarStyle.NATIVE;
+    return titleBarStyle === "native" ;
 }
 function getTitleBarStyle(configurationService) {
     if (isWeb) {
-        return TitlebarStyle.CUSTOM;
+        return "custom" ;
     }
     const configuration = configurationService.getValue('window');
     if (configuration) {
         const useNativeTabs = isMacintosh && configuration.nativeTabs === true;
         if (useNativeTabs) {
-            return TitlebarStyle.NATIVE;
+            return "native" ;
         }
         const useSimpleFullScreen = isMacintosh && configuration.nativeFullScreen === false;
         if (useSimpleFullScreen) {
-            return TitlebarStyle.NATIVE;
+            return "native" ;
         }
         const style = configuration.titleBarStyle;
-        if (style === TitlebarStyle.NATIVE || style === TitlebarStyle.CUSTOM) {
+        if (style === "native"  || style === "custom" ) {
             return style;
         }
     }
-    return isLinux ? TitlebarStyle.NATIVE : TitlebarStyle.CUSTOM;
+    return isLinux ? "native"  : "custom" ;
 }
 const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35;
 function useWindowControlsOverlay(configurationService) {
@@ -85,4 +69,4 @@ function useWindowControlsOverlay(configurationService) {
     }
     return true;
 }
-export { CustomTitleBarVisibility, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, TitleBarSetting, TitlebarStyle, WindowMinimumSize, getMenuBarVisibility, getTitleBarStyle, hasCustomTitlebar, hasNativeTitlebar, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, useWindowControlsOverlay };
+export { DEFAULT_CUSTOM_TITLEBAR_HEIGHT, WindowMinimumSize, getMenuBarVisibility, getTitleBarStyle, hasCustomTitlebar, hasNativeTitlebar, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, useWindowControlsOverlay };

package/vscode/src/vs/platform/workspace/common/workspace.js

@@ -45,12 +45,6 @@ function isWorkspaceIdentifier(obj) {
     const workspaceIdentifier = obj;
     return typeof workspaceIdentifier?.id === 'string' && URI.isUri(workspaceIdentifier.configPath);
 }
-var WorkbenchState;
-( ((function(WorkbenchState) {
-    WorkbenchState[WorkbenchState["EMPTY"] = 1] = "EMPTY";
-    WorkbenchState[WorkbenchState["FOLDER"] = 2] = "FOLDER";
-    WorkbenchState[WorkbenchState["WORKSPACE"] = 3] = "WORKSPACE";
-})(WorkbenchState || (WorkbenchState = {}))));
 function isWorkspace(thing) {
     const candidate = thing;
     return !!(candidate && typeof candidate === 'object'
@@ -140,7 +134,7 @@ function toWorkspaceFolder(resource) {
 }
 const WORKSPACE_EXTENSION = 'code-workspace';
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
-const WORKSPACE_FILTER = [{ name: ( localize(792, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
+const WORKSPACE_FILTER = [{ name: ( localize(804, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
 const UNTITLED_WORKSPACE_NAME = 'workspace.json';
 function isUntitledWorkspace(path, environmentService) {
     return extUriBiasedIgnorePathCase.isEqualOrParent(path, environmentService.untitledWorkspacesHome);
@@ -166,4 +160,4 @@ function hasWorkspaceFileExtension(path) {
     const ext = (typeof path === 'string') ? extname(path) : extname$1(path);
     return ext === WORKSPACE_SUFFIX;
 }
-export { STANDALONE_EDITOR_WORKSPACE_ID, UNKNOWN_EMPTY_WINDOW_WORKSPACE, UNTITLED_WORKSPACE_NAME, WORKSPACE_EXTENSION, WORKSPACE_FILTER, WORKSPACE_SUFFIX, WorkbenchState, Workspace$1 as Workspace, WorkspaceFolder, hasWorkspaceFileExtension, isEmptyWorkspaceIdentifier, isSavedWorkspace, isSingleFolderWorkspaceIdentifier, isStandaloneEditorWorkspace, isTemporaryWorkspace, isUntitledWorkspace, isWorkspace, isWorkspaceFolder, isWorkspaceIdentifier, toWorkspaceFolder, toWorkspaceIdentifier };
+export { STANDALONE_EDITOR_WORKSPACE_ID, UNKNOWN_EMPTY_WINDOW_WORKSPACE, UNTITLED_WORKSPACE_NAME, WORKSPACE_EXTENSION, WORKSPACE_FILTER, WORKSPACE_SUFFIX, Workspace$1 as Workspace, WorkspaceFolder, hasWorkspaceFileExtension, isEmptyWorkspaceIdentifier, isSavedWorkspace, isSingleFolderWorkspaceIdentifier, isStandaloneEditorWorkspace, isTemporaryWorkspace, isUntitledWorkspace, isWorkspace, isWorkspaceFolder, isWorkspaceIdentifier, toWorkspaceFolder, toWorkspaceIdentifier };

package/vscode/src/vs/workbench/api/browser/statusBarService.js

@@ -1,19 +1,13 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from '../../../base/common/event.js';
-import { hash } from '../../../base/common/hash.js';
-import { getCodiconAriaLabel } from '../../../base/common/iconLabels.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
-import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { STATUS_BAR_WARNING_ITEM_BACKGROUND, STATUS_BAR_ERROR_ITEM_BACKGROUND } from '../../common/theme.js';
-import { StatusbarAlignment } from '../../services/statusbar/browser/statusbar.js';
 import { IStatusbarService } from '../../services/statusbar/browser/statusbar.service.js';
+import { getCodiconAriaLabel } from '../../../base/common/iconLabels.js';
+import { hash } from '../../../base/common/hash.js';
+import { Emitter } from '../../../base/common/event.js';
+import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { STATUS_BAR_WARNING_ITEM_BACKGROUND, STATUS_BAR_ERROR_ITEM_BACKGROUND } from '../../common/theme.js';
 const IExtensionStatusBarItemService = ( createDecorator('IExtensionStatusBarItemService'));
-var StatusBarUpdateKind;
-( (function(StatusBarUpdateKind) {
-    StatusBarUpdateKind[StatusBarUpdateKind["DidDefine"] = 0] = "DidDefine";
-    StatusBarUpdateKind[StatusBarUpdateKind["DidUpdate"] = 1] = "DidUpdate";
-})(StatusBarUpdateKind || (StatusBarUpdateKind = {})));
 let ExtensionStatusBarItemService = class ExtensionStatusBarItemService {
     constructor(_statusbarService) {
         this._statusbarService = _statusbarService;
@@ -52,7 +46,7 @@ let ExtensionStatusBarItemService = class ExtensionStatusBarItemService {
         if (typeof priority === 'undefined') {
             priority = 0;
         }
-        let alignment = alignLeft ? StatusbarAlignment.LEFT : StatusbarAlignment.RIGHT;
+        let alignment = alignLeft ? 0  : 1 ;
         const existingEntry = this._entries.get(entryId);
         if (existingEntry) {
             alignment = existingEntry.alignment;
@@ -79,12 +73,12 @@ let ExtensionStatusBarItemService = class ExtensionStatusBarItemService {
                 })
             });
             this._onDidChange.fire({ added: [entryId, { entry, alignment, priority }] });
-            return StatusBarUpdateKind.DidDefine;
+            return 0 ;
         }
         else {
             existingEntry.accessor.update(entry);
             existingEntry.entry = entry;
-            return StatusBarUpdateKind.DidUpdate;
+            return 1 ;
         }
     }
     unsetEntry(entryId) {
@@ -98,5 +92,5 @@ let ExtensionStatusBarItemService = class ExtensionStatusBarItemService {
 ExtensionStatusBarItemService = ( __decorate([
     ( __param(0, IStatusbarService))
 ], ExtensionStatusBarItemService));
-registerSingleton(IExtensionStatusBarItemService, ExtensionStatusBarItemService, InstantiationType.Delayed);
-export { ExtensionStatusBarItemService, IExtensionStatusBarItemService, StatusBarUpdateKind };
+registerSingleton(IExtensionStatusBarItemService, ExtensionStatusBarItemService, 1 );
+export { ExtensionStatusBarItemService, IExtensionStatusBarItemService };

package/vscode/src/vs/workbench/api/common/extHost.api.impl.js

@@ -87,7 +87,7 @@ import { ExtHostTimeline } from './extHostTimeline.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
 import { LanguageSelector } from './extHostTypeConverters.js';
-import { Breakpoint, TerminalOutputAnchor, ChatResultFeedbackKind, ChatVariableLevel, ChatCompletionItem, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CommentThreadApplicability, CommentThreadFocus, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomExecution, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugVisualization, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentHighlight, DocumentHighlightKind, MultiDocumentHighlight, DocumentLink, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineCompletionTriggerKind, ExtensionKind, ExtensionMode, ExternalUriOpenerPriority, FileChangeType, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, InlineSuggestion, InlineSuggestionList, Hover, VerboseHover, HoverVerbosityAction, Location, MarkdownString, ParameterInformation, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, Range, RelativePattern, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SourceBreakpoint, StandardTokenType, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalLink, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalLocation, TerminalProfile, TerminalExitReason, TerminalShellExecutionCommandLineConfidence, TextDocumentSaveReason, TextEdit, SnippetTextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, SyntaxTokenType, TextDocumentChangeReason, ThemeColor, ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewColumn, WorkspaceEdit, DocumentPasteTriggerKind, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentPasteEdit, InlayHint, InlayHintLabelPart, InlayHintKind, RemoteAuthorityResolverError, ResolvedAuthority, ManagedResolvedAuthority, SourceControlInputBoxValidationType, ExtensionRuntime, TimelineItem, NotebookRange, NotebookCellKind, NotebookCellExecutionState, NotebookCellData, NotebookData, NotebookRendererScript, NotebookCellStatusBarAlignment, NotebookEditorRevealType, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookEdit, NotebookKernelSourceAction, NotebookVariablesRequestKind, PortAttributes, LinkedEditingRanges, TestResultState, TestRunRequest, TestMessage, TestMessageStackFrame, TestTag, TestRunProfileKind, DataTransfer, DataTransferItem, TestCoverageCount, FileCoverage, StatementCoverage, BranchCoverage, DeclarationCoverage, WorkspaceTrustState, LanguageStatusSeverity, QuickPickItemKind, InputBoxValidationSeverity, TextTabInput, TextDiffTabInput, TextMergeTabInput, CustomEditorTabInput, NotebookEditorTabInput, NotebookDiffEditorTabInput, WebviewEditorTabInput, TerminalEditorTabInput, InteractiveWindowInput, ChatEditorTabInput, TextMultiDiffTabInput, InteractiveSessionVoteDirection, ChatCopyKind, InteractiveEditorResponseFeedbackKind, DebugStackFrame, DebugThread, RelatedInformationType, SpeechToTextStatus, TextToSpeechStatus, PartialAcceptTriggerKind, KeywordRecognitionStatus, ChatResponseMarkdownPart, ChatResponseFileTreePart, ChatResponseAnchorPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseCodeCitationPart, ChatResponseWarningPart, ChatResponseTextEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseCommandButtonPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatResponseMovePart, ChatResponseReferencePartStatusKind, ChatRequestTurn, ChatResponseTurn, ChatLocation, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelChatMessageRole, LanguageModelChatMessage, LanguageModelToolResultPart, LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelError, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, InlineEdit, InlineEditTriggerKind } from './extHostTypes.js';
+import { Breakpoint, TerminalOutputAnchor, ChatResultFeedbackKind, ChatVariableLevel, ChatCompletionItem, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CommentThreadApplicability, CommentThreadFocus, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomExecution, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugVisualization, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentHighlight, DocumentHighlightKind, MultiDocumentHighlight, DocumentLink, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineCompletionTriggerKind, ExtensionKind, ExtensionMode, ExternalUriOpenerPriority, FileChangeType, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, InlineSuggestion, InlineSuggestionList, Hover, VerboseHover, HoverVerbosityAction, Location, MarkdownString, ParameterInformation, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, Range, RelativePattern, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SourceBreakpoint, StandardTokenType, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalLink, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalLocation, TerminalProfile, TerminalExitReason, TerminalShellExecutionCommandLineConfidence, TextDocumentSaveReason, TextEdit, SnippetTextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, SyntaxTokenType, TextDocumentChangeReason, ThemeColor, ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewColumn, WorkspaceEdit, DocumentPasteTriggerKind, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentPasteEdit, InlayHint, InlayHintLabelPart, InlayHintKind, RemoteAuthorityResolverError, ResolvedAuthority, ManagedResolvedAuthority, SourceControlInputBoxValidationType, ExtensionRuntime, TimelineItem, NotebookRange, NotebookCellKind, NotebookCellExecutionState, NotebookCellData, NotebookData, NotebookRendererScript, NotebookCellStatusBarAlignment, NotebookEditorRevealType, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookEdit, NotebookKernelSourceAction, NotebookVariablesRequestKind, PortAttributes, LinkedEditingRanges, TestResultState, TestRunRequest, TestMessage, TestMessageStackFrame, TestTag, TestRunProfileKind, DataTransfer, DataTransferItem, TestCoverageCount, FileCoverage, StatementCoverage, BranchCoverage, DeclarationCoverage, WorkspaceTrustState, LanguageStatusSeverity, QuickPickItemKind, InputBoxValidationSeverity, TextTabInput, TextDiffTabInput, TextMergeTabInput, CustomEditorTabInput, NotebookEditorTabInput, NotebookDiffEditorTabInput, WebviewEditorTabInput, TerminalEditorTabInput, InteractiveWindowInput, ChatEditorTabInput, TextMultiDiffTabInput, InteractiveSessionVoteDirection, ChatCopyKind, InteractiveEditorResponseFeedbackKind, DebugStackFrame, DebugThread, RelatedInformationType, SpeechToTextStatus, TextToSpeechStatus, PartialAcceptTriggerKind, KeywordRecognitionStatus, ChatResponseMarkdownPart, ChatResponseFileTreePart, ChatResponseAnchorPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseWarningPart, ChatResponseTextEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseCommandButtonPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatResponseMovePart, ChatResponseReferencePartStatusKind, ChatRequestTurn, ChatResponseTurn, ChatLocation, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelChatMessageRole, LanguageModelChatMessage, LanguageModelToolResultPart, LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelError, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, InlineEdit, InlineEditTriggerKind } from './extHostTypes.js';
 import { ExtHostUriOpeners } from './extHostUriOpener.js';
 import { IURITransformerService } from './extHostUriTransformerService.js';
 import { ExtHostUrls } from './extHostUrls.js';
@@ -100,6 +100,7 @@ import { DebugConfigurationProviderTriggerKind } from '../../contrib/debug/commo
 import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { TextSearchCompleteMessageType, ExcludeSettingOptions, TextSearchContextNew, TextSearchMatchNew } from '../../services/search/common/searchExtTypes.js';
+import { ExtHostCodeMapper } from './extHostCodeMapper.js';
 function createApiFactoryAndRegisterActors(accessor) {
     const initData = accessor.get(IExtHostInitDataService);
     const extHostFileSystemInfo = accessor.get(IExtHostFileSystemInfo);
@@ -184,6 +185,7 @@ function createApiFactoryAndRegisterActors(accessor) {
         extHostApiDeprecation,
         extHostTelemetry
     )));
+    const extHostCodeMapper = rpcProtocol.set(ExtHostContext.ExtHostCodeMapper, ( new ExtHostCodeMapper(rpcProtocol)));
     const extHostFileSystem = rpcProtocol.set(ExtHostContext.ExtHostFileSystem, ( new ExtHostFileSystem(rpcProtocol, extHostLanguageFeatures)));
     const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, ( new ExtHostFileSystemEventService(rpcProtocol, extHostLogService, extHostDocumentsAndEditors)));
     const extHostQuickOpen = rpcProtocol.set(ExtHostContext.ExtHostQuickOpen, createExtHostQuickOpen(rpcProtocol, extHostWorkspace, extHostCommands));
@@ -221,7 +223,13 @@ function createApiFactoryAndRegisterActors(accessor) {
         extHostCommands,
         extHostLogService
     )));
-    const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, ( new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments)));
+    const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, ( new ExtHostChatAgents2(
+        rpcProtocol,
+        extHostLogService,
+        extHostCommands,
+        extHostDocuments,
+        extHostLanguageModels
+    )));
     const extHostChatVariables = rpcProtocol.set(ExtHostContext.ExtHostChatVariables, ( new ExtHostChatVariables(rpcProtocol)));
     const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, ( new ExtHostLanguageModelTools(rpcProtocol)));
     const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, ( new ExtHostRelatedInformation(rpcProtocol)));
@@ -297,7 +305,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return !!(await extHostAuthentication.getSession(extension, providerId, scopes, { silent: true }));
             },
             get onDidChangeSessions() {
-                return _asExtensionEvent(extHostAuthentication.onDidChangeSessions);
+                return _asExtensionEvent(extHostAuthentication.getExtensionScopedSessionsEvent(extension.identifier.value));
             },
             registerAuthenticationProvider(id, label, provider, options) {
                 return extHostAuthentication.registerAuthenticationProvider(id, label, provider, options);
@@ -959,7 +967,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             findTextInFilesNew: (query, options, token) => {
                 checkProposedApiEnabled(extension, 'findTextInFilesNew');
                 checkProposedApiEnabled(extension, 'textSearchProviderNew');
-                return extHostWorkspace.findTextInFilesNew(query, extension.identifier, options || {}, token);
+                return extHostWorkspace.findTextInFilesNew(query, options, extension.identifier, token);
             },
             save: (uri) => {
                 return extHostWorkspace.save(uri);
@@ -975,7 +983,14 @@ function createApiFactoryAndRegisterActors(accessor) {
             },
             createFileSystemWatcher: (pattern, optionsOrIgnoreCreate, ignoreChange, ignoreDelete) => {
                 let options = undefined;
-                if (typeof optionsOrIgnoreCreate === 'boolean') {
+                if (optionsOrIgnoreCreate && typeof optionsOrIgnoreCreate !== 'boolean') {
+                    checkProposedApiEnabled(extension, 'createFileSystemWatcher');
+                    options = {
+                        ...optionsOrIgnoreCreate,
+                        correlate: true
+                    };
+                }
+                else {
                     options = {
                         ignoreCreateEvents: Boolean(optionsOrIgnoreCreate),
                         ignoreChangeEvents: Boolean(ignoreChange),
@@ -983,14 +998,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                         correlate: false
                     };
                 }
-                else if (optionsOrIgnoreCreate) {
-                    checkProposedApiEnabled(extension, 'createFileSystemWatcher');
-                    options = {
-                        ...optionsOrIgnoreCreate,
-                        correlate: true
-                    };
-                }
-                return extHostFileSystemEvent.createFileSystemWatcher(extHostWorkspace, extension, pattern, options);
+                return extHostFileSystemEvent.createFileSystemWatcher(extHostWorkspace, configProvider, extension, pattern, options);
             },
             get textDocuments() {
                 return ( extHostDocuments.getAllDocumentData().map(data => data.document));
@@ -1384,6 +1392,10 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'mappedEditsProvider');
                 return extHostLanguageFeatures.registerMappedEditsProvider(extension, selector, provider);
             },
+            registerMappedEditsProvider2(provider) {
+                checkProposedApiEnabled(extension, 'mappedEditsProvider');
+                return extHostCodeMapper.registerMappedEditsProvider(extension, provider);
+            },
             createChatParticipant(id, handler) {
                 return extHostChatAgents2.createChatAgent(extension, id, handler);
             },
@@ -1393,7 +1405,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             },
             registerChatParticipantDetectionProvider(provider) {
                 checkProposedApiEnabled(extension, 'chatParticipantAdditions');
-                return extHostChatAgents2.registerChatParticipantDetectionProvider(provider);
+                return extHostChatAgents2.registerChatParticipantDetectionProvider(extension, provider);
             },
         };
         const lm = {
@@ -1688,6 +1700,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatResponseReferencePart: ChatResponseReferencePart,
             ChatResponseReferencePart2: ChatResponseReferencePart,
             ChatResponseCodeCitationPart: ChatResponseCodeCitationPart,
+            ChatResponseCodeblockUriPart: ChatResponseCodeblockUriPart,
             ChatResponseWarningPart: ChatResponseWarningPart,
             ChatResponseTextEditPart: ChatResponseTextEditPart,
             ChatResponseMarkdownWithVulnerabilitiesPart: ChatResponseMarkdownWithVulnerabilitiesPart,