@codingame/monaco-vscode-api 13.1.7 → 14.0.0

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.d.ts

@@ -0,0 +1,167 @@
+
+import './vscode-dts/vscode.proposed.d.ts'
+import './vscode-dts/vscode.d.ts'
+import { Event } from "../../../../base/common/event.js";
+import { ILocalExtension, IGalleryExtension, IExtensionIdentifier, IDeprecationInfo } from "../../../../platform/extensionManagement/common/extensionManagement.js";
+import { EnablementState, IExtensionManagementServer, IResourceExtension, IWorkbenchInstallOptions } from "../../../services/extensionManagement/common/extensionManagement.js";
+import { CancellationToken } from "../../../../base/common/cancellation.js";
+import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
+import { IExtensionManifest, ExtensionType } from "../../../../platform/extensions/common/extensions.js";
+import { URI } from "../../../../base/common/uri.js";
+import { IView, IViewPaneContainer } from "../../../common/views.js";
+import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
+import { MenuId } from "../../../../platform/actions/common/actions.js";
+import { Severity } from "../../../../platform/notification/common/notification.js";
+import { IExtensionsWorkbenchService } from "./extensions.service.js";
+export declare const VIEWLET_ID = "workbench.view.extensions";
+export declare const EXTENSIONS_CATEGORY: import("../../../../nls.js").ILocalizedString;
+export interface IExtensionsViewPaneContainer extends IViewPaneContainer {
+    readonly searchValue: string | undefined;
+    search(text: string): void;
+    refresh(): Promise<void>;
+}
+export interface IWorkspaceRecommendedExtensionsView extends IView {
+    installWorkspaceRecommendations(): Promise<void>;
+}
+export declare enum ExtensionState {
+    Installing = 0,
+    Installed = 1,
+    Uninstalling = 2,
+    Uninstalled = 3
+}
+export declare enum ExtensionRuntimeActionType {
+    ReloadWindow = "reloadWindow",
+    RestartExtensions = "restartExtensions",
+    DownloadUpdate = "downloadUpdate",
+    ApplyUpdate = "applyUpdate",
+    QuitAndInstall = "quitAndInstall"
+}
+export type ExtensionRuntimeState = {
+    action: ExtensionRuntimeActionType;
+    reason: string;
+};
+export interface IExtension {
+    readonly type: ExtensionType;
+    readonly isBuiltin: boolean;
+    readonly isWorkspaceScoped: boolean;
+    readonly state: ExtensionState;
+    readonly name: string;
+    readonly displayName: string;
+    readonly identifier: IExtensionIdentifier;
+    readonly publisher: string;
+    readonly publisherDisplayName: string;
+    readonly publisherUrl?: URI;
+    readonly publisherDomain?: {
+        link: string;
+        verified: boolean;
+    };
+    readonly publisherSponsorLink?: URI;
+    readonly pinned: boolean;
+    readonly version: string;
+    readonly latestVersion: string;
+    readonly preRelease: boolean;
+    readonly isPreReleaseVersion: boolean;
+    readonly hasPreReleaseVersion: boolean;
+    readonly hasReleaseVersion: boolean;
+    readonly description: string;
+    readonly url?: string;
+    readonly repository?: string;
+    readonly supportUrl?: string;
+    readonly iconUrl: string;
+    readonly iconUrlFallback: string;
+    readonly licenseUrl?: string;
+    readonly installCount?: number;
+    readonly rating?: number;
+    readonly ratingCount?: number;
+    readonly outdated: boolean;
+    readonly outdatedTargetPlatform: boolean;
+    readonly runtimeState: ExtensionRuntimeState | undefined;
+    readonly enablementState: EnablementState;
+    readonly tags: readonly string[];
+    readonly categories: readonly string[];
+    readonly dependencies: string[];
+    readonly extensionPack: string[];
+    readonly telemetryData: any;
+    readonly preview: boolean;
+    getManifest(token: CancellationToken): Promise<IExtensionManifest | null>;
+    hasReadme(): boolean;
+    getReadme(token: CancellationToken): Promise<string>;
+    hasChangelog(): boolean;
+    getChangelog(token: CancellationToken): Promise<string>;
+    readonly server?: IExtensionManagementServer;
+    readonly local?: ILocalExtension;
+    gallery?: IGalleryExtension;
+    readonly resourceExtension?: IResourceExtension;
+    readonly isMalicious: boolean;
+    readonly deprecationInfo?: IDeprecationInfo;
+}
+export interface InstallExtensionOptions extends IWorkbenchInstallOptions {
+    version?: string;
+    justification?: string | {
+        reason: string;
+        action: string;
+    };
+    enable?: boolean;
+    installEverywhere?: boolean;
+}
+export interface IExtensionsNotification {
+    readonly message: string;
+    readonly severity: Severity;
+    readonly extensions: IExtension[];
+    dismiss(): void;
+}
+export declare enum ExtensionEditorTab {
+    Readme = "readme",
+    Features = "features",
+    Changelog = "changelog",
+    Dependencies = "dependencies",
+    ExtensionPack = "extensionPack"
+}
+export declare const ConfigurationKey = "extensions";
+export declare const AutoUpdateConfigurationKey = "extensions.autoUpdate";
+export declare const AutoCheckUpdatesConfigurationKey = "extensions.autoCheckUpdates";
+export declare const CloseExtensionDetailsOnViewChangeKey = "extensions.closeExtensionDetailsOnViewChange";
+export declare const AutoRestartConfigurationKey = "extensions.autoRestart";
+export type AutoUpdateConfigurationValue = boolean | "onlyEnabledExtensions" | "onlySelectedExtensions";
+export interface IExtensionsConfiguration {
+    autoUpdate: boolean;
+    autoCheckUpdates: boolean;
+    ignoreRecommendations: boolean;
+    closeExtensionDetailsOnViewChange: boolean;
+}
+export interface IExtensionContainer extends IDisposable {
+    extension: IExtension | null;
+    updateWhenCounterExtensionChanges?: boolean;
+    update(): void;
+}
+export interface IExtensionsViewState {
+    onFocus: Event<IExtension>;
+    onBlur: Event<IExtension>;
+    filters: {
+        featureId?: string;
+    };
+}
+export declare class ExtensionContainers extends Disposable {
+    private readonly containers;
+    constructor(containers: IExtensionContainer[], extensionsWorkbenchService: IExtensionsWorkbenchService);
+    set extension(extension: IExtension);
+    private update;
+}
+export declare const WORKSPACE_RECOMMENDATIONS_VIEW_ID = "workbench.views.extensions.workspaceRecommendations";
+export declare const OUTDATED_EXTENSIONS_VIEW_ID = "workbench.views.extensions.searchOutdated";
+export declare const TOGGLE_IGNORE_EXTENSION_ACTION_ID = "workbench.extensions.action.toggleIgnoreExtension";
+export declare const SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID = "workbench.extensions.action.installVSIX";
+export declare const INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID = "workbench.extensions.command.installFromVSIX";
+export declare const LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID = "workbench.extensions.action.listWorkspaceUnsupportedExtensions";
+export declare const HasOutdatedExtensionsContext: RawContextKey<boolean>;
+export declare const CONTEXT_HAS_GALLERY: RawContextKey<boolean>;
+export declare const ExtensionResultsListFocused: RawContextKey<boolean>;
+export declare const THEME_ACTIONS_GROUP = "_theme_";
+export declare const INSTALL_ACTIONS_GROUP = "0_install";
+export declare const UPDATE_ACTIONS_GROUP = "0_update";
+export declare const extensionsSearchActionsMenu: MenuId;
+export interface IExtensionArg {
+    id: string;
+    version: string;
+    location: URI | undefined;
+}

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js

@@ -0,0 +1,85 @@
+
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { localize2 } from '../../../../nls.js';
+import { IExtensionsWorkbenchService } from './extensions.service.js';
+
+const VIEWLET_ID = 'workbench.view.extensions';
+const EXTENSIONS_CATEGORY = ( localize2(6469, "Extensions"));
+var ExtensionState;
+(function (ExtensionState) {
+    ExtensionState[ExtensionState["Installing"] = 0] = "Installing";
+    ExtensionState[ExtensionState["Installed"] = 1] = "Installed";
+    ExtensionState[ExtensionState["Uninstalling"] = 2] = "Uninstalling";
+    ExtensionState[ExtensionState["Uninstalled"] = 3] = "Uninstalled";
+})(ExtensionState || (ExtensionState = {}));
+var ExtensionRuntimeActionType;
+(function (ExtensionRuntimeActionType) {
+    ExtensionRuntimeActionType["ReloadWindow"] = "reloadWindow";
+    ExtensionRuntimeActionType["RestartExtensions"] = "restartExtensions";
+    ExtensionRuntimeActionType["DownloadUpdate"] = "downloadUpdate";
+    ExtensionRuntimeActionType["ApplyUpdate"] = "applyUpdate";
+    ExtensionRuntimeActionType["QuitAndInstall"] = "quitAndInstall";
+})(ExtensionRuntimeActionType || (ExtensionRuntimeActionType = {}));
+var ExtensionEditorTab;
+(function (ExtensionEditorTab) {
+    ExtensionEditorTab["Readme"] = "readme";
+    ExtensionEditorTab["Features"] = "features";
+    ExtensionEditorTab["Changelog"] = "changelog";
+    ExtensionEditorTab["Dependencies"] = "dependencies";
+    ExtensionEditorTab["ExtensionPack"] = "extensionPack";
+})(ExtensionEditorTab || (ExtensionEditorTab = {}));
+const AutoUpdateConfigurationKey = 'extensions.autoUpdate';
+const AutoCheckUpdatesConfigurationKey = 'extensions.autoCheckUpdates';
+const CloseExtensionDetailsOnViewChangeKey = 'extensions.closeExtensionDetailsOnViewChange';
+const AutoRestartConfigurationKey = 'extensions.autoRestart';
+let ExtensionContainers = class ExtensionContainers extends Disposable {
+    constructor(containers, extensionsWorkbenchService) {
+        super();
+        this.containers = containers;
+        this._register(extensionsWorkbenchService.onChange(this.update, this));
+    }
+    set extension(extension) {
+        this.containers.forEach(c => c.extension = extension);
+    }
+    update(extension) {
+        for (const container of this.containers) {
+            if (extension && container.extension) {
+                if (areSameExtensions(container.extension.identifier, extension.identifier)) {
+                    if (container.extension.server && extension.server && container.extension.server !== extension.server) {
+                        if (container.updateWhenCounterExtensionChanges) {
+                            container.update();
+                        }
+                    }
+                    else {
+                        container.extension = extension;
+                    }
+                }
+            }
+            else {
+                container.update();
+            }
+        }
+    }
+};
+ExtensionContainers = ( __decorate([
+    ( __param(1, IExtensionsWorkbenchService))
+], ExtensionContainers));
+const WORKSPACE_RECOMMENDATIONS_VIEW_ID = 'workbench.views.extensions.workspaceRecommendations';
+const OUTDATED_EXTENSIONS_VIEW_ID = 'workbench.views.extensions.searchOutdated';
+const TOGGLE_IGNORE_EXTENSION_ACTION_ID = 'workbench.extensions.action.toggleIgnoreExtension';
+const SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID = 'workbench.extensions.action.installVSIX';
+const INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID = 'workbench.extensions.command.installFromVSIX';
+const LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID = 'workbench.extensions.action.listWorkspaceUnsupportedExtensions';
+const HasOutdatedExtensionsContext = ( new RawContextKey('hasOutdatedExtensions', false));
+const CONTEXT_HAS_GALLERY = ( new RawContextKey('hasGallery', false));
+const ExtensionResultsListFocused = ( new RawContextKey('extensionResultListFocused ', true));
+const THEME_ACTIONS_GROUP = '_theme_';
+const INSTALL_ACTIONS_GROUP = '0_install';
+const UPDATE_ACTIONS_GROUP = '0_update';
+const extensionsSearchActionsMenu = ( new MenuId('extensionsSearchActionsMenu'));
+
+export { AutoCheckUpdatesConfigurationKey, AutoRestartConfigurationKey, AutoUpdateConfigurationKey, CONTEXT_HAS_GALLERY, CloseExtensionDetailsOnViewChangeKey, EXTENSIONS_CATEGORY, ExtensionContainers, ExtensionEditorTab, ExtensionResultsListFocused, ExtensionRuntimeActionType, ExtensionState, HasOutdatedExtensionsContext, INSTALL_ACTIONS_GROUP, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, OUTDATED_EXTENSIONS_VIEW_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, THEME_ACTIONS_GROUP, TOGGLE_IGNORE_EXTENSION_ACTION_ID, UPDATE_ACTIONS_GROUP, VIEWLET_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, extensionsSearchActionsMenu };

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.service.d.ts

@@ -7,7 +7,7 @@ import { IQueryOptions, IExtensionInfo, IExtensionQueryOptions, InstallExtension
 import { ProgressLocation } from "../../../../platform/progress/common/progress.js";
 import { IExtensionManagementServer, EnablementState } from "../../../services/extensionManagement/common/extensionManagement.js";
 import { IExtensionsStatus as IExtensionRuntimeStatus } from "../../../services/extensions/common/extensions.js";
-import { IExtension, InstallExtensionOptions, AutoUpdateConfigurationValue, IExtensionsNotification } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/extensions/common/extensions";
+import { IExtension, InstallExtensionOptions, AutoUpdateConfigurationValue, IExtensionsNotification } from "./extensions.js";
 import { IExtensionEditorOptions } from "@codingame/monaco-vscode-5e324391-11e3-5ceb-93ee-938e4098e4ad-common/vscode/vs/workbench/contrib/extensions/common/extensionsInput";
 export declare const IExtensionsWorkbenchService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtensionsWorkbenchService>;
 export interface IExtensionsWorkbenchService {
@@ -32,7 +32,6 @@ export interface IExtensionsWorkbenchService {
     installInServer(extension: IExtension, server: IExtensionManagementServer): Promise<void>;
     downloadVSIX(extension: string, prerelease: boolean): Promise<void>;
     uninstall(extension: IExtension): Promise<void>;
-    reinstall(extension: IExtension): Promise<IExtension>;
     togglePreRelease(extension: IExtension): Promise<void>;
     canSetLanguage(extension: IExtension): boolean;
     setLanguage(extension: IExtension): Promise<void>;

package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js

@@ -13,13 +13,13 @@ const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved';
 const COPY_PATH_COMMAND_ID = 'copyFilePath';
 const COPY_RELATIVE_PATH_COMMAND_ID = 'copyRelativeFilePath';
 const SAVE_FILE_AS_COMMAND_ID = 'workbench.action.files.saveAs';
-const SAVE_FILE_AS_LABEL = ( localize2(6527, "Save As..."));
+const SAVE_FILE_AS_LABEL = ( localize2(6672, "Save As..."));
 const SAVE_FILE_COMMAND_ID = 'workbench.action.files.save';
-const SAVE_FILE_LABEL = ( localize2(6528, "Save"));
+const SAVE_FILE_LABEL = ( localize2(6673, "Save"));
 const SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID = 'workbench.action.files.saveWithoutFormatting';
-const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2(6529, "Save without Formatting"));
+const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2(6674, "Save without Formatting"));
 const SAVE_ALL_COMMAND_ID = 'saveAll';
-const SAVE_ALL_LABEL = ( localize2(6530, "Save All"));
+const SAVE_ALL_LABEL = ( localize2(6675, "Save All"));
 const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup';
 const SAVE_FILES_COMMAND_ID = 'workbench.action.files.saveFiles';
 const OpenEditorsGroupContext = ( new RawContextKey('groupFocusedInOpenEditors', false));
@@ -28,13 +28,13 @@ const OpenEditorsReadonlyEditorContext = ( new RawContextKey('readonlyEditorFocu
 const OpenEditorsSelectedFileOrUntitledContext = ( new RawContextKey('openEditorsSelectedFileOrUntitled', true));
 const ResourceSelectedForCompareContext = ( new RawContextKey('resourceSelectedForCompare', false));
 const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder';
-const REMOVE_ROOT_FOLDER_LABEL = ( localize(6531, "Remove Folder from Workspace"));
+const REMOVE_ROOT_FOLDER_LABEL = ( localize(6676, "Remove Folder from Workspace"));
 const PREVIOUS_COMPRESSED_FOLDER = 'previousCompressedFolder';
 const NEXT_COMPRESSED_FOLDER = 'nextCompressedFolder';
 const FIRST_COMPRESSED_FOLDER = 'firstCompressedFolder';
 const LAST_COMPRESSED_FOLDER = 'lastCompressedFolder';
 const NEW_UNTITLED_FILE_COMMAND_ID = 'workbench.action.files.newUntitledFile';
-const NEW_UNTITLED_FILE_LABEL = ( localize2(6532, "New Untitled Text File"));
+const NEW_UNTITLED_FILE_LABEL = ( localize2(6677, "New Untitled Text File"));
 const NEW_FILE_COMMAND_ID = 'workbench.action.files.newFile';
 
 export { COMPARE_RESOURCE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_FILE_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEXT_COMPRESSED_FOLDER, OPEN_TO_SIDE_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, OpenEditorsSelectedFileOrUntitledContext, PREVIOUS_COMPRESSED_FOLDER, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, REVEAL_IN_EXPLORER_COMMAND_ID, REVERT_FILE_COMMAND_ID, ResourceSelectedForCompareContext, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_ALL_LABEL, SAVE_FILES_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SELECT_FOR_COMPARE_COMMAND_ID };

package/vscode/src/vs/workbench/contrib/files/browser/files.service.d.ts

@@ -2,8 +2,8 @@ import { URI } from "../../../../base/common/uri.js";
 import { ResourceFileEdit } from "../../../../editor/browser/services/bulkEditService.js";
 import { ProgressLocation } from "../../../../platform/progress/common/progress.js";
 import { IEditableData } from "../../../common/views.js";
-import { ExplorerItem } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/contrib/files/common/explorerModel";
-import { ISortOrderConfiguration } from "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common/vscode/vs/workbench/contrib/files/common/files";
+import { ExplorerItem } from "@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common/vscode/vs/workbench/contrib/files/common/explorerModel";
+import { ISortOrderConfiguration } from "@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common/vscode/vs/workbench/contrib/files/common/files";
 import { IExplorerView } from "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/contrib/files/browser/files";
 export interface IExplorerService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js

@@ -32,8 +32,8 @@ let DefaultFoldingRangeProvider = class DefaultFoldingRangeProvider extends Disp
         DefaultFoldingRangeProvider_1.extensionItemLabels.length = 0;
         DefaultFoldingRangeProvider_1.extensionDescriptions.length = 0;
         DefaultFoldingRangeProvider_1.extensionIds.push(null);
-        DefaultFoldingRangeProvider_1.extensionItemLabels.push(( localize(6727, 'All')));
-        DefaultFoldingRangeProvider_1.extensionDescriptions.push(( localize(6728, "All active folding range providers")));
+        DefaultFoldingRangeProvider_1.extensionItemLabels.push(( localize(6873, 'All')));
+        DefaultFoldingRangeProvider_1.extensionDescriptions.push(( localize(6874, "All active folding range providers")));
         const languageExtensions = [];
         const otherExtensions = [];
         for (const extension of this._extensionService.extensions) {
@@ -75,7 +75,7 @@ DefaultFoldingRangeProvider = DefaultFoldingRangeProvider_1 = ( __decorate([
     properties: {
         [DefaultFoldingRangeProvider.configName]: {
             description: ( localize(
-                6729,
+                6875,
                 "Defines a default folding range provider that takes precedence over all other folding range providers. Must be the identifier of an extension contributing a folding range provider."
             )),
             type: ['string', 'null'],

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js

@@ -81,8 +81,8 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         DefaultFormatter_1.extensionItemLabels.length = 0;
         DefaultFormatter_1.extensionDescriptions.length = 0;
         DefaultFormatter_1.extensionIds.push(null);
-        DefaultFormatter_1.extensionItemLabels.push(( localize(6730, 'None')));
-        DefaultFormatter_1.extensionDescriptions.push(( localize(6731, "None")));
+        DefaultFormatter_1.extensionItemLabels.push(( localize(6876, 'None')));
+        DefaultFormatter_1.extensionDescriptions.push(( localize(6877, "None")));
         for (const extension of extensions) {
             if (extension.main || extension.browser) {
                 DefaultFormatter_1.extensionIds.push(extension.identifier.value);
@@ -109,13 +109,13 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
                 const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
                 const detail = kind === FormattingKind.File
                     ? ( localize(
-                    6732,
+                    6878,
                     "Extension '{0}' is configured as formatter but it cannot format '{1}'-files",
                     extension.displayName || extension.name,
                     langName
                 ))
                     : ( localize(
-                    6733,
+                    6879,
                     "Extension '{0}' is configured as formatter but it can only format '{1}'-files as a whole, not selections or parts of it.",
                     extension.displayName || extension.name,
                     langName
@@ -129,12 +129,12 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
         const message = !defaultFormatterId
             ? ( localize(
-            6734,
+            6880,
             "There are multiple formatters for '{0}' files. One of them should be configured as default formatter.",
             DefaultFormatter_1._maybeQuotes(langName)
         ))
             : ( localize(
-            6735,
+            6881,
             "Extension '{0}' is configured as formatter but not available. Select a different default formatter to continue.",
             defaultFormatterId
         ));
@@ -147,16 +147,16 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         }
         if (mode !== FormattingMode.Silent) {
             const { confirmed } = await this._dialogService.confirm({
-                message: ( localize(6736, "Configure Default Formatter")),
+                message: ( localize(6882, "Configure Default Formatter")),
                 detail: formatterOrMessage,
-                primaryButton: ( localize(6737, "&&Configure..."))
+                primaryButton: ( localize(6883, "&&Configure..."))
             });
             if (confirmed) {
                 return this._pickAndPersistDefaultFormatter(formatter, document);
             }
         }
         else {
-            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(6738, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
+            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(6884, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
         }
         return undefined;
     }
@@ -170,7 +170,7 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         }));
         const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
         const pick = await this._quickInputService.pick(picks, { placeHolder: ( localize(
-            6739,
+            6885,
             "Select a default formatter for '{0}' files",
             DefaultFormatter_1._maybeQuotes(langName)
         )) });
@@ -203,14 +203,14 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
             if (typeof result !== 'string') {
                 return;
             }
-            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(6740, "Configure...")) };
+            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(6886, "Configure...")) };
             this._languageStatusStore.add(CommandsRegistry.registerCommand(command.id, () => this._pickAndPersistDefaultFormatter(formatter, document)));
             this._languageStatusStore.add(this._languageStatusService.addStatus({
                 id: 'formatter.conflict',
-                name: ( localize(6741, "Formatter Conflicts")),
+                name: ( localize(6887, "Formatter Conflicts")),
                 selector: { language: document.getLanguageId(), pattern: document.uri.fsPath },
                 severity: Severity$1.Error,
-                label: ( localize(6742, "Formatting")),
+                label: ( localize(6888, "Formatting")),
                 detail: result,
                 busy: false,
                 source: '',
@@ -238,7 +238,7 @@ DefaultFormatter = DefaultFormatter_1 = ( __decorate([
     properties: {
         [DefaultFormatter.configName]: {
             description: ( localize(
-                6743,
+                6889,
                 "Defines a default formatter which takes precedence over all other formatter settings. Must be the identifier of an extension contributing a formatter."
             )),
             type: ['string', 'null'],
@@ -271,7 +271,7 @@ async function showFormatterPick(accessor, model, formatters) {
         const pick = {
             index,
             label: provider.displayName || '',
-            description: isDefault ? ( localize(6744, "(default)")) : undefined,
+            description: isDefault ? ( localize(6890, "(default)")) : undefined,
         };
         if (isDefault) {
             defaultFormatterPick = pick;
@@ -279,10 +279,10 @@ async function showFormatterPick(accessor, model, formatters) {
         return pick;
     }));
     const configurePick = {
-        label: ( localize(6745, "Configure Default Formatter..."))
+        label: ( localize(6891, "Configure Default Formatter..."))
     };
     const pick = await quickPickService.pick([...picks, { type: 'separator' }, configurePick], {
-        placeHolder: ( localize(6746, "Select a formatter")),
+        placeHolder: ( localize(6892, "Select a formatter")),
         activeItem: defaultFormatterPick
     });
     if (!pick) {
@@ -291,7 +291,7 @@ async function showFormatterPick(accessor, model, formatters) {
     else if (pick === configurePick) {
         const langName = languageService.getLanguageName(model.getLanguageId()) || model.getLanguageId();
         const pick = await quickPickService.pick(picks, { placeHolder: ( localize(
-            6739,
+            6885,
             "Select a default formatter for '{0}' files",
             DefaultFormatter._maybeQuotes(langName)
         )) });
@@ -308,7 +308,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument.multiple',
-            label: ( localize(6747, "Format Document With...")),
+            label: ( localize(6893, "Format Document With...")),
             alias: 'Format Document...',
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -340,7 +340,7 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatSelection.multiple',
-            label: ( localize(6748, "Format Selection With...")),
+            label: ( localize(6894, "Format Selection With...")),
             alias: 'Format Code...',
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(EditorContextKeys.writable)), EditorContextKeys.hasMultipleDocumentSelectionFormattingProvider)),
             contextMenuOpts: {

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js

@@ -15,7 +15,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument.none',
-            label: ( localize2(6749, "Format Document")),
+            label: ( localize2(6895, "Format Document")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, ( EditorContextKeys.hasDocumentFormattingProvider.toNegated()))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -43,14 +43,14 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
             return commandService.executeCommand('editor.action.formatDocument');
         }
         else if (model.isTooLargeForSyncing()) {
-            notificationService.warn(( localize(6750, "This file cannot be formatted because it is too large")));
+            notificationService.warn(( localize(6896, "This file cannot be formatted because it is too large")));
         }
         else {
             const langName = model.getLanguageId();
-            const message = ( localize(6751, "There is no formatter for '{0}' files installed.", langName));
+            const message = ( localize(6897, "There is no formatter for '{0}' files installed.", langName));
             const { confirmed } = await dialogService.confirm({
                 message,
-                primaryButton: ( localize(6752, "&&Install Formatter..."))
+                primaryButton: ( localize(6898, "&&Install Formatter..."))
             });
             if (confirmed) {
                 extensionsWorkbenchService.openSearch(`category:formatters ${langName}`);

package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js

@@ -12,14 +12,14 @@ import { localize2 } from '../../../../nls.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
-import { getOriginalResource } from '../../scm/browser/dirtydiffDecorator.js';
 import { IQuickDiffService } from '../../scm/common/quickDiff.service.js';
+import { getOriginalResource } from '../../scm/common/quickDiffService.js';
 
 registerEditorAction(class FormatModifiedAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatChanges',
-            label: ( localize2(6753, "Format Modified Lines")),
+            label: ( localize2(6899, "Format Modified Lines")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasDocumentSelectionFormattingProvider

package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js

@@ -24,7 +24,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
     static { this.IsReading = ( new RawContextKey(
         'isReadingLineWithInlayHints',
         false,
-        { type: 'boolean', description: ( localize(6754, "Whether the current line and its inlay hints are currently focused")) }
+        { type: 'boolean', description: ( localize(6900, "Whether the current line and its inlay hints are currently focused")) }
     )); }
     static { this.ID = 'editor.contrib.InlayHintsAccessibility'; }
     static get(editor) {
@@ -39,7 +39,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
         this._ariaElement.style.position = 'fixed';
         this._ariaElement.className = 'inlayhint-accessibility-element';
         this._ariaElement.tabIndex = 0;
-        this._ariaElement.setAttribute('aria-description', ( localize(6755, "Code with Inlay Hint Information")));
+        this._ariaElement.setAttribute('aria-description', ( localize(6901, "Code with Inlay Hint Information")));
         this._ctxIsReading = InlayHintsAccessibility_1.IsReading.bindTo(contextKeyService);
     }
     dispose() {
@@ -139,7 +139,7 @@ registerAction2(class StartReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.startReadingLineWithHint',
-            title: ( localize2(6756, "Read Line With Inline Hints")),
+            title: ( localize2(6902, "Read Line With Inline Hints")),
             precondition: EditorContextKeys.hasInlayHintsProvider,
             f1: true
         });
@@ -153,7 +153,7 @@ registerAction2(class StopReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.stopReadingLineWithHint',
-            title: ( localize2(6757, "Stop Inlay Hints Reading")),
+            title: ( localize2(6903, "Stop Inlay Hints Reading")),
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.d.ts

@@ -1,5 +1,8 @@
 import { URI } from "../../../../base/common/uri.js";
 import { ICodeEditor } from "../../../../editor/browser/editorBrowser.js";
+import { Position } from "../../../../editor/common/core/position.js";
+import { IChatEditingSession } from "../../chat/common/chatEditingService.js";
+import { IChatModel } from "../../chat/common/chatModel.js";
 import { Session } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
 export interface ISessionKeyComputer {
     getComparisonKey(editor: ICodeEditor, uri: URI): string;
@@ -11,3 +14,10 @@ export interface IInlineChatSessionEvent {
 export interface IInlineChatSessionEndEvent extends IInlineChatSessionEvent {
     readonly endedByExternalCause: boolean;
 }
+export interface IInlineChatSession2 {
+    readonly initialPosition: Position;
+    readonly uri: URI;
+    readonly chatModel: IChatModel;
+    readonly editingSession: IChatEditingSession;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service.d.ts

@@ -5,9 +5,8 @@ import { URI } from "../../../../base/common/uri.js";
 import { IActiveCodeEditor, ICodeEditor } from "../../../../editor/browser/editorBrowser.js";
 import { IRange } from "../../../../editor/common/core/range.js";
 import { IValidEditOperation } from "../../../../editor/common/model.js";
-import { EditMode } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat";
 import { Session, StashedSession } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
-import { IInlineChatSessionEvent, IInlineChatSessionEndEvent, ISessionKeyComputer } from "./inlineChatSessionService.js";
+import { IInlineChatSessionEvent, IInlineChatSessionEndEvent, ISessionKeyComputer, IInlineChatSession2 } from "./inlineChatSessionService.js";
 export declare const IInlineChatSessionService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IInlineChatSessionService>;
 export interface IInlineChatSessionService {
     _serviceBrand: undefined;
@@ -16,7 +15,6 @@ export interface IInlineChatSessionService {
     onDidStashSession: Event<IInlineChatSessionEvent>;
     onDidEndSession: Event<IInlineChatSessionEndEvent>;
     createSession(editor: IActiveCodeEditor, options: {
-        editMode: EditMode;
         wholeRange?: IRange;
         session?: Session;
         headless?: boolean;
@@ -28,4 +26,7 @@ export interface IInlineChatSessionService {
     stashSession(session: Session, editor: ICodeEditor, undoCancelEdits: IValidEditOperation[]): StashedSession;
     registerSessionKeyComputer(scheme: string, value: ISessionKeyComputer): IDisposable;
     dispose(): void;
+    createSession2(editor: ICodeEditor, uri: URI, token: CancellationToken): Promise<IInlineChatSession2>;
+    getSession2(uri: URI): IInlineChatSession2 | undefined;
+    onDidChangeSessions: Event<this>;
 }

package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js

@@ -11,8 +11,8 @@ class ListResizeColumnAction extends Action2 {
     constructor() {
         super({
             id: 'list.resizeColumn',
-            title: { value: ( localize(6971, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(6972, "List")), original: 'List' },
+            title: { value: ( localize(7114, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(7115, "List")), original: 'List' },
             precondition: WorkbenchListFocusContextKey,
             f1: true
         });