@codingame/monaco-vscode-api 16.1.1 → 17.1.0

package/vscode/src/vs/platform/actions/common/actions.d.ts

@@ -40,6 +40,7 @@ export declare class MenuId {
     static readonly DebugWatchContext: MenuId;
     static readonly DebugToolBar: MenuId;
     static readonly DebugToolBarStop: MenuId;
+    static readonly DebugDisassemblyContext: MenuId;
     static readonly DebugCallStackToolbar: MenuId;
     static readonly DebugCreateConfiguration: MenuId;
     static readonly EditorContext: MenuId;
@@ -107,6 +108,7 @@ export declare class MenuId {
     static readonly SCMHistoryItemContext: MenuId;
     static readonly SCMHistoryItemHover: MenuId;
     static readonly SCMHistoryItemRefContext: MenuId;
+    static readonly SCMQuickDiffDecorations: MenuId;
     static readonly SCMTitle: MenuId;
     static readonly SearchContext: MenuId;
     static readonly SearchActionMenu: MenuId;
@@ -317,7 +319,7 @@ interface IAction2CommonOptions extends ICommandAction {
 interface IBaseAction2Options extends IAction2CommonOptions {
     f1?: false;
 }
-interface ICommandPaletteOptions extends IAction2CommonOptions {
+export interface ICommandPaletteOptions extends IAction2CommonOptions {
     title: ICommandActionTitle;
     category?: keyof typeof Categories | ILocalizedString;
     f1: true;

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

@@ -30,6 +30,7 @@ class MenuId {
     static { this.DebugWatchContext = ( new MenuId('DebugWatchContext')); }
     static { this.DebugToolBar = ( new MenuId('DebugToolBar')); }
     static { this.DebugToolBarStop = ( new MenuId('DebugToolBarStop')); }
+    static { this.DebugDisassemblyContext = ( new MenuId('DebugDisassemblyContext')); }
     static { this.DebugCallStackToolbar = ( new MenuId('DebugCallStackToolbar')); }
     static { this.DebugCreateConfiguration = ( new MenuId('DebugCreateConfiguration')); }
     static { this.EditorContext = ( new MenuId('EditorContext')); }
@@ -97,6 +98,7 @@ class MenuId {
     static { this.SCMHistoryItemContext = ( new MenuId('SCMHistoryItemContext')); }
     static { this.SCMHistoryItemHover = ( new MenuId('SCMHistoryItemHover')); }
     static { this.SCMHistoryItemRefContext = ( new MenuId('SCMHistoryItemRefContext')); }
+    static { this.SCMQuickDiffDecorations = ( new MenuId('SCMQuickDiffDecorations')); }
     static { this.SCMTitle = ( new MenuId('SCMTitle')); }
     static { this.SearchContext = ( new MenuId('SearchContext')); }
     static { this.SearchActionMenu = ( new MenuId('SearchActionContext')); }

package/vscode/src/vs/platform/actions/common/menuResetAction.js

@@ -9,7 +9,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: 'menu.resetHiddenStates',
-            title: ( localize2(1706, "Reset All Menus")),
+            title: ( localize2(1705, "Reset All Menus")),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/platform/actions/common/menuService.js

@@ -408,7 +408,7 @@ function createMenuHide(menu, command, states) {
     const title = typeof command.title === 'string' ? command.title : command.title.value;
     const hide = toAction({
         id: `hide/${menu.id}/${id}`,
-        label: ( localize(1707, 'Hide \'{0}\'', title)),
+        label: ( localize(1706, 'Hide \'{0}\'', title)),
         run() { states.updateHidden(menu, id, true); }
     });
     const toggle = toAction({
@@ -426,7 +426,7 @@ function createMenuHide(menu, command, states) {
 function createConfigureKeybindingAction(commandService, keybindingService, commandId, when = undefined, enabled = true) {
     return toAction({
         id: `configureKeybinding/${commandId}`,
-        label: ( localize(1708, "Configure Keybinding")),
+        label: ( localize(1707, "Configure Keybinding")),
         enabled,
         run() {
             const hasKeybinding = !!keybindingService.lookupKeybinding(commandId);

package/vscode/src/vs/platform/clipboard/browser/clipboardService.d.ts

@@ -8,6 +8,7 @@ export declare class BrowserClipboardService extends Disposable implements IClip
     private readonly logService;
     readonly _serviceBrand: undefined;
     constructor(layoutService: ILayoutService, logService: ILogService);
+    triggerPaste(): Promise<void> | undefined;
     readImage(): Promise<Uint8Array>;
     private webKitPendingClipboardWritePromise;
     private installWebKitWriteTextWorkaround;

package/vscode/src/vs/platform/clipboard/browser/clipboardService.js

@@ -30,6 +30,9 @@ let BrowserClipboardService = class BrowserClipboardService extends Disposable {
             disposables.add(addDisposableListener(window.document, 'copy', () => this.clearResourcesState()));
         }, { window: mainWindow, disposables: this._store }));
     }
+    triggerPaste() {
+        return undefined;
+    }
     async readImage() {
         try {
             const clipboardItems = await navigator.clipboard.read();

package/vscode/src/vs/platform/clipboard/common/clipboardService.service.d.ts

@@ -2,6 +2,7 @@ import { URI } from "../../../base/common/uri.js";
 export declare const IClipboardService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IClipboardService>;
 export interface IClipboardService {
     readonly _serviceBrand: undefined;
+    triggerPaste(targetWindowId: number): Promise<void> | undefined;
     writeText(text: string, type?: string): Promise<void>;
     readText(type?: string): Promise<string>;
     readFindText(): Promise<string>;

package/vscode/src/vs/platform/configuration/common/configurationRegistry.js

@@ -6,6 +6,7 @@ import { localize } from '../../../nls.js';
 import { getLanguageTagSettingPlainKey } from './configuration.js';
 import { Extensions as Extensions$1 } from '../../jsonschemas/common/jsonContributionRegistry.js';
 import { Registry } from '../../registry/common/platform.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 var EditPresentationTypes;
 (function (EditPresentationTypes) {
@@ -35,18 +36,19 @@ const resourceSettings = { properties: {}, patternProperties: {} };
 const resourceLanguageSettingsSchemaId = 'vscode://schemas/settings/resourceLanguage';
 const configurationDefaultsSchemaId = 'vscode://schemas/settings/configurationDefaults';
 const contributionRegistry = ( Registry.as(Extensions$1.JSONContribution));
-class ConfigurationRegistry {
+class ConfigurationRegistry extends Disposable {
     constructor() {
+        super();
         this.registeredConfigurationDefaults = [];
         this.overrideIdentifiers = ( new Set());
-        this._onDidSchemaChange = ( new Emitter());
+        this._onDidSchemaChange = this._register(( new Emitter()));
         this.onDidSchemaChange = this._onDidSchemaChange.event;
-        this._onDidUpdateConfiguration = ( new Emitter());
+        this._onDidUpdateConfiguration = this._register(( new Emitter()));
         this.onDidUpdateConfiguration = this._onDidUpdateConfiguration.event;
         this.configurationDefaultsOverrides = ( new Map());
         this.defaultLanguageConfigurationOverridesNode = {
             id: 'defaultOverrides',
-            title: ( localize(1709, "Default Language Configuration Overrides")),
+            title: ( localize(1708, "Default Language Configuration Overrides")),
             properties: {}
         };
         this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
@@ -195,7 +197,7 @@ class ConfigurationRegistry {
             type: 'object',
             default: newDefaultOverride.value,
             description: ( localize(
-                1710,
+                1709,
                 "Configure settings to be overridden for the {0} language.",
                 getLanguageTagSettingPlainKey(key)
             )),
@@ -466,8 +468,8 @@ class ConfigurationRegistry {
             const overrideIdentifierProperty = `[${overrideIdentifier}]`;
             const resourceLanguagePropertiesSchema = {
                 type: 'object',
-                description: ( localize(1711, "Configure editor settings to be overridden for a language.")),
-                errorMessage: ( localize(1712, "This setting does not support per-language configuration.")),
+                description: ( localize(1710, "Configure editor settings to be overridden for a language.")),
+                errorMessage: ( localize(1711, "This setting does not support per-language configuration.")),
                 $ref: resourceLanguageSettingsSchemaId,
             };
             this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
@@ -483,8 +485,8 @@ class ConfigurationRegistry {
     registerOverridePropertyPatternKey() {
         const resourceLanguagePropertiesSchema = {
             type: 'object',
-            description: ( localize(1711, "Configure editor settings to be overridden for a language.")),
-            errorMessage: ( localize(1712, "This setting does not support per-language configuration.")),
+            description: ( localize(1710, "Configure editor settings to be overridden for a language.")),
+            errorMessage: ( localize(1711, "This setting does not support per-language configuration.")),
             $ref: resourceLanguageSettingsSchemaId,
         };
         allSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
@@ -560,25 +562,25 @@ const configurationRegistry = ( new ConfigurationRegistry());
 Registry.add(Extensions.Configuration, configurationRegistry);
 function validateProperty(property, schema) {
     if (!property.trim()) {
-        return localize(1713, "Cannot register an empty property");
+        return localize(1712, "Cannot register an empty property");
     }
     if (OVERRIDE_PROPERTY_REGEX.test(property)) {
         return localize(
-            1714,
+            1713,
             "Cannot register '{0}'. This matches property pattern '\\\\[.*\\\\]$' for describing language specific editor settings. Use 'configurationDefaults' contribution.",
             property
         );
     }
     if (configurationRegistry.getConfigurationProperties()[property] !== undefined) {
         return localize(
-            1715,
+            1714,
             "Cannot register '{0}'. This property is already registered.",
             property
         );
     }
     if (schema.policy?.name && configurationRegistry.getPolicyConfigurations().get(schema.policy?.name) !== undefined) {
         return localize(
-            1716,
+            1715,
             "Cannot register '{0}'. The associated policy {1} is already registered with {2}.",
             property,
             schema.policy?.name,

package/vscode/src/vs/platform/configuration/common/configurations.js

@@ -23,7 +23,7 @@ let DefaultConfiguration$1 = class DefaultConfiguration extends Disposable {
         this.logService = logService;
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
-        this._configurationModel = ConfigurationModel.createEmptyModel(this.logService);
+        this._configurationModel = ConfigurationModel.createEmptyModel(logService);
     }
     async initialize() {
         this.resetConfigurationModel();

package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js

@@ -487,7 +487,7 @@ CommandsRegistry.registerCommand({
         return [...RawContextKey.all()].sort((a, b) => a.key.localeCompare(b.key));
     },
     metadata: {
-        description: ( localize(1717, "A command that returns information about context keys")),
+        description: ( localize(1716, "A command that returns information about context keys")),
         args: []
     }
 });

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

@@ -47,17 +47,17 @@ var ContextKeyExprType;
 const defaultConfig = {
     regexParsingWithErrorRecovery: true
 };
-const errorEmptyString = ( localize(1718, "Empty context key expression"));
+const errorEmptyString = ( localize(1717, "Empty context key expression"));
 const hintEmptyString = ( localize(
-    1719,
+    1718,
     "Did you forget to write an expression? You can also put 'false' or 'true' to always evaluate to false or true, respectively."
 ));
-const errorNoInAfterNot = ( localize(1720, "'in' after 'not'."));
-const errorClosingParenthesis = ( localize(1721, "closing parenthesis ')'"));
-const errorUnexpectedToken = ( localize(1722, "Unexpected token"));
-const hintUnexpectedToken = ( localize(1723, "Did you forget to put && or || before the token?"));
-const errorUnexpectedEOF = ( localize(1724, "Unexpected end of expression"));
-const hintUnexpectedEOF = ( localize(1725, "Did you forget to put a context key?"));
+const errorNoInAfterNot = ( localize(1719, "'in' after 'not'."));
+const errorClosingParenthesis = ( localize(1720, "closing parenthesis ')'"));
+const errorUnexpectedToken = ( localize(1721, "Unexpected token"));
+const hintUnexpectedToken = ( localize(1722, "Did you forget to put && or || before the token?"));
+const errorUnexpectedEOF = ( localize(1723, "Unexpected end of expression"));
+const hintUnexpectedEOF = ( localize(1724, "Did you forget to put a context key?"));
 class Parser {
     static { this._parseError = ( new Error()); }
     get lexingErrors() {
@@ -369,7 +369,7 @@ class Parser {
         throw this._errExpectedButGot(message, this._peek());
     }
     _errExpectedButGot(expected, got, additionalInfo) {
-        const message = ( localize(1726, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
+        const message = ( localize(1725, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
         const offset = got.offset;
         const lexeme = Scanner.getLexeme(got);
         this._parsingErrors.push({ message, offset, lexeme, additionalInfo });
@@ -447,8 +447,8 @@ function validateWhenClauses(whenClauses) {
         if (parser.lexingErrors.length > 0) {
             return (parser.lexingErrors.map((se) => ({
                 errorMessage: se.additionalInfo ?
-                    ( localize(1727, "Unexpected token. Hint: {0}", se.additionalInfo)) :
-                    ( localize(1728, "Unexpected token.")),
+                    ( localize(1726, "Unexpected token. Hint: {0}", se.additionalInfo)) :
+                    ( localize(1727, "Unexpected token.")),
                 offset: se.offset,
                 length: se.lexeme.length,
             })));

package/vscode/src/vs/platform/contextkey/common/contextkeys.js

@@ -3,16 +3,16 @@ import { isMacintosh, isLinux, isWindows, isWeb, isIOS, isMobile } from '../../.
 import { localize } from '../../../nls.js';
 import { RawContextKey } from './contextkey.js';
 
-const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1729, "Whether the operating system is macOS"))));
-const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1730, "Whether the operating system is Linux"))));
-const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1731, "Whether the operating system is Windows"))));
-const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1732, "Whether the platform is a web browser"))));
-const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1733, "Whether the operating system is macOS on a non-browser platform"))));
-const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1734, "Whether the operating system is iOS"))));
-const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1735, "Whether the platform is a mobile web browser"))));
+const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1728, "Whether the operating system is macOS"))));
+const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1729, "Whether the operating system is Linux"))));
+const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1730, "Whether the operating system is Windows"))));
+const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1731, "Whether the platform is a web browser"))));
+const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1732, "Whether the operating system is macOS on a non-browser platform"))));
+const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1733, "Whether the operating system is iOS"))));
+const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1734, "Whether the platform is a mobile web browser"))));
 const IsDevelopmentContext = ( new RawContextKey('isDevelopment', false, true));
-const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1736, "Quality type of VS Code"))));
+const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1735, "Quality type of VS Code"))));
 const InputFocusedContextKey = 'inputFocus';
-const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1737, "Whether keyboard focus is inside an input box"))));
+const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1736, "Whether keyboard focus is inside an input box"))));
 
 export { InputFocusedContext, InputFocusedContextKey, IsDevelopmentContext, IsIOSContext, IsLinuxContext, IsMacContext, IsMacNativeContext, IsMobileContext, IsWebContext, IsWindowsContext, ProductQualityContext };

package/vscode/src/vs/platform/contextkey/common/scanner.js

@@ -30,18 +30,18 @@ var TokenType;
 function hintDidYouMean(...meant) {
     switch (meant.length) {
         case 1:
-            return localize(1738, "Did you mean {0}?", meant[0]);
+            return localize(1737, "Did you mean {0}?", meant[0]);
         case 2:
-            return localize(1739, "Did you mean {0} or {1}?", meant[0], meant[1]);
+            return localize(1738, "Did you mean {0} or {1}?", meant[0], meant[1]);
         case 3:
-            return localize(1740, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
+            return localize(1739, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
         default:
             return undefined;
     }
 }
-const hintDidYouForgetToOpenOrCloseQuote = ( localize(1741, "Did you forget to open or close the quote?"));
+const hintDidYouForgetToOpenOrCloseQuote = ( localize(1740, "Did you forget to open or close the quote?"));
 const hintDidYouForgetToEscapeSlash = ( localize(
-    1742,
+    1741,
     "Did you forget to escape the '/' (slash) character? Put two backslashes before it to escape, e.g., '\\\\/\'."
 ));
 class Scanner {

package/vscode/src/vs/platform/dialogs/common/dialogs.service.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { URI } from "../../../base/common/uri.js";
-import { IConfirmation, IConfirmationResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptResult, IPrompt, IInput, IInputResult, type ConfirmResult, type IOpenDialogOptions, type IPickAndOpenOptions, type ISaveDialogOptions } from "@codingame/monaco-vscode-2bd6777a-3bff-5b83-ad25-0e029e81ffe9-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IConfirmation, IConfirmationResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptResult, IPrompt, IInput, IInputResult, type ConfirmResult, type IOpenDialogOptions, type IPickAndOpenOptions, type ISaveDialogOptions } from "@codingame/monaco-vscode-bed2b49f-41ae-5ed2-b61a-1105500a3f8a-common/vscode/vs/platform/dialogs/common/dialogs";
 export declare const IDialogService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IDialogService>;
 export interface IDialogService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/dnd/browser/dnd.d.ts

@@ -9,6 +9,7 @@ export declare const CodeDataTransfers: {
     FILES: string;
     SYMBOLS: string;
     MARKERS: string;
+    NOTEBOOK_CELL_OUTPUT: string;
 };
 export interface IDraggedResourceEditorInput extends IBaseTextResourceEditorInput {
     resource: URI | undefined;
@@ -64,6 +65,9 @@ export interface DocumentSymbolTransferData {
     };
     kind: number;
 }
+export interface NotebookCellOutputTransferData {
+    outputId: string;
+}
 export declare function extractSymbolDropData(e: DragEvent): DocumentSymbolTransferData[];
 export declare function fillInSymbolsDragData(symbolsData: readonly DocumentSymbolTransferData[], e: DragEvent): void;
 export type MarkerTransferData = IMarker | {
@@ -71,5 +75,6 @@ export type MarkerTransferData = IMarker | {
 };
 export declare function extractMarkerDropData(e: DragEvent): MarkerTransferData[] | undefined;
 export declare function fillInMarkersDragData(markerData: MarkerTransferData[], e: DragEvent): void;
+export declare function extractNotebookCellOutputDropData(e: DragEvent): NotebookCellOutputTransferData | undefined;
 export declare function getPathForFile(file: File): string | undefined;
 export {};

package/vscode/src/vs/platform/dnd/browser/dnd.js

@@ -24,6 +24,7 @@ const CodeDataTransfers = {
     FILES: 'CodeFiles',
     SYMBOLS: 'application/vnd.code.symbols',
     MARKERS: 'application/vnd.code.diagnostics',
+    NOTEBOOK_CELL_OUTPUT: 'notebook-cell-output',
 };
 function extractEditorsDropData(e) {
     const editors = [];
@@ -182,7 +183,7 @@ async function extractFileListData(accessor, files) {
         if (file) {
             if (file.size > 100 * ByteSize.MB) {
                 dialogService.warn(( localize(
-                    1748,
+                    1747,
                     "File is too large to open as untitled editor. Please upload it first into the file explorer and then try again."
                 )));
                 continue;
@@ -300,6 +301,9 @@ function extractMarkerDropData(e) {
 function fillInMarkersDragData(markerData, e) {
     setDataAsJSON(e, CodeDataTransfers.MARKERS, markerData);
 }
+function extractNotebookCellOutputDropData(e) {
+    return getDataAsJSON(e, CodeDataTransfers.NOTEBOOK_CELL_OUTPUT, undefined);
+}
 function getPathForFile(file) {
     if (isNative && typeof globalThis.vscode?.webUtils?.getPathForFile === 'function') {
         return globalThis.vscode.webUtils.getPathForFile(file);
@@ -307,4 +311,4 @@ function getPathForFile(file) {
     return undefined;
 }
 
-export { CodeDataTransfers, Extensions, LocalSelectionTransfer, containsDragType, createDraggedEditorInputFromRawResourcesData, extractEditorsAndFilesDropData, extractEditorsDropData, extractFileListData, extractMarkerDropData, extractSymbolDropData, fillInMarkersDragData, fillInSymbolsDragData, getPathForFile };
+export { CodeDataTransfers, Extensions, LocalSelectionTransfer, containsDragType, createDraggedEditorInputFromRawResourcesData, extractEditorsAndFilesDropData, extractEditorsDropData, extractFileListData, extractMarkerDropData, extractNotebookCellOutputDropData, extractSymbolDropData, fillInMarkersDragData, fillInSymbolsDragData, getPathForFile };

package/vscode/src/vs/platform/editor/common/editor.d.ts

@@ -59,6 +59,7 @@ export interface IEditorOptions {
     source?: EditorOpenSource;
     viewState?: object;
     transient?: boolean;
+    compact?: boolean;
 }
 export interface ITextEditorSelection {
     readonly startLineNumber: number;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts

@@ -4,6 +4,7 @@ import { Platform } from "../../../base/common/platform.js";
 import { URI } from "../../../base/common/uri.js";
 import { IExtension, TargetPlatform } from "../../extensions/common/extensions.js";
 import { IFileService } from "../../files/common/files.service.js";
+import { IExtensionGalleryManifest } from "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest";
 export declare const EXTENSION_IDENTIFIER_PATTERN = "^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$";
 export declare const EXTENSION_IDENTIFIER_REGEX: RegExp;
 export declare const WEB_EXTENSION_TAG = "__web_extension";
@@ -196,11 +197,14 @@ export interface ISearchPrefferedResults {
     readonly query?: string;
     readonly preferredResults?: string[];
 }
+export type MaliciousExtensionInfo = {
+    readonly extensionOrPublisher: IExtensionIdentifier | string;
+    readonly learnMoreLink?: string;
+};
 export interface IExtensionsControlManifest {
-    readonly malicious: ReadonlyArray<IExtensionIdentifier | string>;
+    readonly malicious: ReadonlyArray<MaliciousExtensionInfo>;
     readonly deprecated: IStringDictionary<IDeprecationInfo>;
     readonly search: ISearchPrefferedResults[];
-    readonly extensionsEnabledWithPreRelease?: string[];
 }
 export declare enum InstallOperation {
     None = 1,
@@ -416,3 +420,5 @@ export declare const ExtensionsLocalizedLabel: import("../../../nls.js").ILocali
 export declare const PreferencesLocalizedLabel: import("../../../nls.js").ILocalizedString;
 export declare const UseUnpkgResourceApiConfigKey = "extensions.gallery.useUnpkgResourceApi";
 export declare const AllowedExtensionsConfigKey = "extensions.allowed";
+export declare const VerifyExtensionSignatureConfigKey = "extensions.verifySignature";
+export declare function shouldRequireRepositorySignatureFor(isPrivate: boolean, galleryManifest: IExtensionGalleryManifest | null): boolean;

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

@@ -1,8 +1,10 @@
 
 import { Platform } from '../../../base/common/platform.js';
-import { localize2 } from '../../../nls.js';
+import { localize2, localize } from '../../../nls.js';
+import { Extensions, ConfigurationScope } from '../../configuration/common/configurationRegistry.js';
 import { TargetPlatform } from '../../extensions/common/extensions.js';
 import { FileOperationResult } from '../../files/common/files.js';
+import { Registry } from '../../registry/common/platform.js';
 
 const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 const EXTENSION_IDENTIFIER_REGEX = ( new RegExp(EXTENSION_IDENTIFIER_PATTERN));
@@ -264,9 +266,97 @@ async function computeSize(location, fileService) {
     }
     return stat.size ?? 0;
 }
-const ExtensionsLocalizedLabel = ( localize2(1769, "Extensions"));
-const PreferencesLocalizedLabel = ( localize2(1770, 'Preferences'));
+const ExtensionsLocalizedLabel = ( localize2(1768, "Extensions"));
+const PreferencesLocalizedLabel = ( localize2(1769, 'Preferences'));
 const UseUnpkgResourceApiConfigKey = 'extensions.gallery.useUnpkgResourceApi';
 const AllowedExtensionsConfigKey = 'extensions.allowed';
+const VerifyExtensionSignatureConfigKey = 'extensions.verifySignature';
+( Registry.as(Extensions.Configuration))
+    .registerConfiguration({
+    id: 'extensions',
+    order: 30,
+    title: ( localize(1770, "Extensions")),
+    type: 'object',
+    properties: {
+        [AllowedExtensionsConfigKey]: {
+            type: 'object',
+            markdownDescription: ( localize(
+                1771,
+                "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. For more information on how to configure this setting, please visit the [Configure Allowed Extensions](https://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions) section."
+            )),
+            default: '*',
+            defaultSnippets: [{
+                    body: {},
+                    description: ( localize(1772, "No extensions are allowed.")),
+                }, {
+                    body: {
+                        '*': true
+                    },
+                    description: ( localize(1773, "All extensions are allowed.")),
+                }],
+            scope: ConfigurationScope.APPLICATION,
+            policy: {
+                name: 'AllowedExtensions',
+                minimumVersion: '1.96',
+                description: ( localize(
+                    1774,
+                    "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. More information: https://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions"
+                )),
+            },
+            additionalProperties: false,
+            patternProperties: {
+                '([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$': {
+                    anyOf: [
+                        {
+                            type: ['boolean', 'string'],
+                            enum: [true, false, 'stable'],
+                            description: ( localize(1775, "Allow or disallow the extension.")),
+                            enumDescriptions: [
+                                ( localize(1776, "Extension is allowed.")),
+                                ( localize(1777, "Extension is not allowed.")),
+                                ( localize(1778, "Allow only stable versions of the extension.")),
+                            ],
+                        },
+                        {
+                            type: 'array',
+                            items: {
+                                type: 'string',
+                            },
+                            description: ( localize(
+                                1779,
+                                "Allow or disallow specific versions of the extension. To specifcy a platform specific version, use the format `platform@1.2.3`, e.g. `win32-x64@1.2.3`. Supported platforms are `win32-x64`, `win32-arm64`, `linux-x64`, `linux-arm64`, `linux-armhf`, `alpine-x64`, `alpine-arm64`, `darwin-x64`, `darwin-arm64`"
+                            )),
+                        },
+                    ]
+                },
+                '([a-z0-9A-Z][a-z0-9-A-Z]*)$': {
+                    type: ['boolean', 'string'],
+                    enum: [true, false, 'stable'],
+                    description: ( localize(1780, "Allow or disallow all extensions from the publisher.")),
+                    enumDescriptions: [
+                        ( localize(1781, "All extensions from the publisher are allowed.")),
+                        ( localize(1782, "All extensions from the publisher are not allowed.")),
+                        ( localize(1783, "Allow only stable versions of the extensions from the publisher.")),
+                    ],
+                },
+                '\\*': {
+                    type: 'boolean',
+                    enum: [true, false],
+                    description: ( localize(1784, "Allow or disallow all extensions.")),
+                    enumDescriptions: [
+                        ( localize(1785, "Allow all extensions.")),
+                        ( localize(1786, "Disallow all extensions."))
+                    ],
+                }
+            }
+        }
+    }
+});
+function shouldRequireRepositorySignatureFor(isPrivate, galleryManifest) {
+    if (isPrivate) {
+        return galleryManifest?.capabilities.signing?.allPrivateRepositorySigned === true;
+    }
+    return galleryManifest?.capabilities.signing?.allPublicRepositorySigned === true;
+}
 
-export { AllowedExtensionsConfigKey, DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionGalleryError, ExtensionGalleryErrorCode, ExtensionInstallSource, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionSignatureVerificationCode, ExtensionsLocalizedLabel, FilterType, InstallOperation, PreferencesLocalizedLabel, SortBy, SortOrder, StatisticType, TargetPlatformToString, UseUnpkgResourceApiConfigKey, WEB_EXTENSION_TAG, computeSize, getTargetPlatform, isIExtensionIdentifier, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };
+export { AllowedExtensionsConfigKey, DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionGalleryError, ExtensionGalleryErrorCode, ExtensionInstallSource, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionSignatureVerificationCode, ExtensionsLocalizedLabel, FilterType, InstallOperation, PreferencesLocalizedLabel, SortBy, SortOrder, StatisticType, TargetPlatformToString, UseUnpkgResourceApiConfigKey, VerifyExtensionSignatureConfigKey, WEB_EXTENSION_TAG, computeSize, getTargetPlatform, isIExtensionIdentifier, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, shouldRequireRepositorySignatureFor, toTargetPlatform };

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.service.d.ts

@@ -1,7 +1,7 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Event } from "../../../base/common/event.js";
 import { IMarkdownString } from "../../../base/common/htmlContent.js";
-import { IPager } from "@codingame/monaco-vscode-extension-gallery-service-override/vscode/vs/base/common/paging";
+import { IPager } from "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common/vscode/vs/base/common/paging";
 import { URI } from "../../../base/common/uri.js";
 import { TargetPlatform, IExtensionManifest, type ExtensionType, type IExtension } from "../../extensions/common/extensions.js";
 import { IQueryOptions, IGalleryExtension, IExtensionInfo, IExtensionQueryOptions, IProductVersion, IExtensionIdentifier, IGalleryExtensionVersion, InstallOperation, StatisticType, ITranslation, IExtensionsControlManifest, type DidUninstallExtensionEvent, type DidUpdateExtensionMetadata, type IExtensionManagementParticipant, type ILocalExtension, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, type InstallOptions, type Metadata, type UninstallExtensionEvent, type UninstallExtensionInfo, type UninstallOptions, type IConfigBasedExtensionTip, type IExecutableBasedExtensionTip, type AllowedExtensionsConfigValueType } from "./extensionManagement.js";
@@ -27,6 +27,7 @@ export interface IExtensionGalleryService {
 export declare const IExtensionManagementService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IExtensionManagementService>;
 export interface IExtensionManagementService {
     readonly _serviceBrand: undefined;
+    readonly preferPreReleases: boolean;
     onInstallExtension: Event<InstallExtensionEvent>;
     onDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
     onUninstallExtension: Event<UninstallExtensionEvent>;
@@ -42,7 +43,7 @@ export interface IExtensionManagementService {
     installExtensionsFromProfile(extensions: IExtensionIdentifier[], fromProfileLocation: URI, toProfileLocation: URI): Promise<ILocalExtension[]>;
     uninstall(extension: ILocalExtension, options?: UninstallOptions): Promise<void>;
     uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void>;
-    toggleAppliationScope(extension: ILocalExtension, fromProfileLocation: URI): Promise<ILocalExtension>;
+    toggleApplicationScope(extension: ILocalExtension, fromProfileLocation: URI): Promise<ILocalExtension>;
     getInstalled(type?: ExtensionType, profileLocation?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]>;
     getExtensionsControlManifest(): Promise<IExtensionsControlManifest>;
     copyExtensions(fromProfileLocation: URI, toProfileLocation: URI): Promise<void>;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementUtil.d.ts

@@ -1,4 +1,4 @@
-import { IExtensionIdentifier, IGalleryExtension, ILocalExtension } from "./extensionManagement.js";
+import { IExtensionIdentifier, IGalleryExtension, ILocalExtension, MaliciousExtensionInfo } from "./extensionManagement.js";
 import { ExtensionIdentifier, IExtension, TargetPlatform } from "../../extensions/common/extensions.js";
 import { IFileService } from "../../files/common/files.service.js";
 import { ILogService } from "../../log/common/log.service.js";
@@ -35,4 +35,5 @@ export declare function getGalleryExtensionTelemetryData(extension: IGalleryExte
 export declare const BetterMergeId: ExtensionIdentifier;
 export declare function getExtensionDependencies(installedExtensions: ReadonlyArray<IExtension>, extension: IExtension): IExtension[];
 export declare function computeTargetPlatform(fileService: IFileService, logService: ILogService): Promise<TargetPlatform>;
-export declare function isMalicious(identifier: IExtensionIdentifier, malicious: ReadonlyArray<IExtensionIdentifier | string>): boolean;
+export declare function isMalicious(identifier: IExtensionIdentifier, malicious: ReadonlyArray<MaliciousExtensionInfo>): boolean;
+export declare function findMatchingMaliciousEntry(identifier: IExtensionIdentifier, malicious: ReadonlyArray<MaliciousExtensionInfo>): MaliciousExtensionInfo | undefined;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementUtil.js

@@ -150,16 +150,19 @@ async function isAlpineLinux(fileService, logService) {
 async function computeTargetPlatform(fileService, logService) {
     const alpineLinux = await isAlpineLinux(fileService, logService);
     const targetPlatform = getTargetPlatform(alpineLinux ? 'alpine' : platform, arch);
-    logService.debug('ComputeTargetPlatform:', targetPlatform);
+    logService.info('ComputeTargetPlatform:', targetPlatform);
     return targetPlatform;
 }
 function isMalicious(identifier, malicious) {
-    return ( malicious.some(publisherOrIdentifier => {
-        if (isString(publisherOrIdentifier)) {
-            return compareIgnoreCase(identifier.id.split('.')[0], publisherOrIdentifier) === 0;
+    return findMatchingMaliciousEntry(identifier, malicious) !== undefined;
+}
+function findMatchingMaliciousEntry(identifier, malicious) {
+    return malicious.find(({ extensionOrPublisher }) => {
+        if (isString(extensionOrPublisher)) {
+            return compareIgnoreCase(identifier.id.split('.')[0], extensionOrPublisher) === 0;
         }
-        return areSameExtensions(identifier, publisherOrIdentifier);
-    }));
+        return areSameExtensions(identifier, extensionOrPublisher);
+    });
 }
 
-export { BetterMergeId, ExtensionKey, adoptToGalleryExtensionId, areSameExtensions, computeTargetPlatform, getExtensionDependencies, getExtensionId, getGalleryExtensionId, getGalleryExtensionTelemetryData, getIdAndVersion, getLocalExtensionTelemetryData, groupByExtension, isMalicious };
+export { BetterMergeId, ExtensionKey, adoptToGalleryExtensionId, areSameExtensions, computeTargetPlatform, findMatchingMaliciousEntry, getExtensionDependencies, getExtensionId, getGalleryExtensionId, getGalleryExtensionTelemetryData, getIdAndVersion, getLocalExtensionTelemetryData, groupByExtension, isMalicious };

package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js

@@ -28,7 +28,7 @@ function replaceNLStrings(logger, extensionManifest, messages, originalMessages)
                 const originalMessage = typeof original === 'string' ? original : original?.message;
                 if (!message) {
                     if (!originalMessage) {
-                        logger.warn(`[${extensionManifest.name}]: ${( localize(1802, "Couldn't find message for key {0}.", messageKey))}`);
+                        logger.warn(`[${extensionManifest.name}]: ${( localize(1818, "Couldn't find message for key {0}.", messageKey))}`);
                     }
                     return;
                 }