@codingame/monaco-vscode-api 1.83.13 → 1.83.15-next.0

package/monaco.js

@@ -9,22 +9,18 @@ export { errorHandler } from 'monaco-editor/esm/vs/base/common/errors.js';
 export { FoldingModel, setCollapseStateForMatchingLines } from 'monaco-editor/esm/vs/editor/contrib/folding/browser/foldingModel.js';
 export { FoldingController } from 'monaco-editor/esm/vs/editor/contrib/folding/browser/folding.js';
 export { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 export { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jsonContributionRegistry.js';
+import { Extensions as Extensions$1 } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jsonContributionRegistry.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 export { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 export { MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 export { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
-import { Extensions as Extensions$3 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
+import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
 import { EditorOptionsUtil } from './vscode/src/vs/editor/browser/config/editorConfiguration.js';
 export { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { JSONValidationExtensionPoint } from './vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js';
-import { Extensions as Extensions$1 } from './vscode/src/vs/workbench/common/contributions.js';
-import { ColorExtensionPoint } from './vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js';
 import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import { StandaloneQuickInputService } from 'monaco-editor/esm/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js';
@@ -38,34 +34,6 @@ import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 import { Emitter } from 'monaco-editor';
 import { createInjectedClass } from './tools/injection.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/menuPreventer.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.js';
-import './vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js';
-import './vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js';
-import './vscode/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.js';
-import './vscode/src/vs/workbench/contrib/list/browser/list.contribution.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.js';
-let ExtensionPoints = class ExtensionPoints {
-    constructor(instantiationService) {
-        this.instantiationService = instantiationService;
-        this.instantiationService.createInstance(JSONValidationExtensionPoint);
-        this.instantiationService.createInstance(ColorExtensionPoint);
-    }
-};
-ExtensionPoints = __decorate([
-    ( __param(0, IInstantiationService))
-], ExtensionPoints);
-( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(ExtensionPoints, 1 );
 function computeConfiguration(configuration, overrides) {
     const editorConfiguration = isObject(configuration.editor) ? deepClone(configuration.editor) : Object.create(null);
     Object.assign(editorConfiguration, deepClone(overrides));
@@ -261,7 +229,7 @@ const createConfiguredDiffEditor = (domElement, options, override) => {
     return getStandaloneEditorInstantiationService().createInstance(ConfiguredStandaloneDiffEditor, domElement, options);
 };
 const Extensions = {
-    ...Extensions$2,
-    ...Extensions$3
+    ...Extensions$1,
+    ...Extensions$2
 };
 export { Extensions, createConfiguredDiffEditor, createConfiguredEditor, createModelReference, deleteFile, writeFile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.83.13",
+  "version": "1.83.15-next.0",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -25,6 +25,10 @@
       "types": "./services.d.ts",
       "default": "./services.js"
     },
+    "./localExtensionHost": {
+      "types": "./localExtensionHost.d.ts",
+      "default": "./localExtensionHost.js"
+    },
     "./extensions": {
       "types": "./extensions.d.ts",
       "default": "./extensions.js"
@@ -96,10 +100,10 @@
   "dependencies": {
     "monaco-editor": "0.44.0",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.83.13",
-    "@codingame/monaco-vscode-environment-service-override": "1.83.13",
-    "@codingame/monaco-vscode-extensions-service-override": "1.83.13",
-    "@codingame/monaco-vscode-files-service-override": "1.83.13",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.83.13"
+    "@codingame/monaco-vscode-extensions-service-override": "1.83.15-next.0",
+    "@codingame/monaco-vscode-files-service-override": "1.83.15-next.0",
+    "@codingame/monaco-vscode-layout-service-override": "1.83.15-next.0",
+    "@codingame/monaco-vscode-environment-service-override": "1.83.15-next.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.83.15-next.0"
   }
 }

package/service-override/tools/editor.d.ts

@@ -1,17 +1,17 @@
 import { IEditorPane, IUntypedEditorInput, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, ITextDiffEditorPane } from '../../vscode/src/vs/workbench/common/editor.js';
-import { IConfigurationService } from '../../vscode/src/vs/platform/configuration/common/configuration.js';
-import { IResolvedTextEditorModel, ITextModelService } from '../../vscode/src/vs/editor/common/services/resolverService.js';
+import { ICodeEditor, IDiffEditor } from '../../vscode/src/vs/editor/browser/editorBrowser.js';
 import { IInstantiationService } from '../../vscode/src/vs/platform/instantiation/common/instantiation.js';
 import { IReference } from '../../vscode/src/vs/base/common/lifecycle.js';
+import { IConfigurationService } from '../../vscode/src/vs/platform/configuration/common/configuration.js';
+import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput } from '../../vscode/src/vs/platform/editor/common/editor.js';
 import { IFileService } from '../../vscode/src/vs/platform/files/common/files.js';
 import { IWorkspaceContextService } from '../../vscode/src/vs/platform/workspace/common/workspace.js';
 import { IUriIdentityService } from '../../vscode/src/vs/platform/uriIdentity/common/uriIdentity.js';
-import { ICodeEditor, IDiffEditor } from '../../vscode/src/vs/editor/browser/editorBrowser.js';
-import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput } from '../../vscode/src/vs/platform/editor/common/editor.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../vscode/src/vs/editor/common/services/resolverService.js';
+import { PreferredGroup } from '../../vscode/src/vs/workbench/services/editor/common/editorService.js';
+import { EditorInput } from '../../vscode/src/vs/workbench/common/editor/editorInput.js';
 import { IHostService } from '../../vscode/src/vs/workbench/services/host/browser/host.js';
 import { IEditorGroupsService } from '../../vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
-import { EditorInput } from '../../vscode/src/vs/workbench/common/editor/editorInput.js';
-import { PreferredGroup } from '../../vscode/src/vs/workbench/services/editor/common/editorService.js';
 import { IEditorResolverService } from '../../vscode/src/vs/workbench/services/editor/common/editorResolverService.js';
 import { ITextEditorService } from '../../vscode/src/vs/workbench/services/textfile/common/textEditorService.js';
 import { IWorkspaceTrustRequestService } from '../../vscode/src/vs/platform/workspace/common/workspaceTrust.js';

package/service-override/tools/editor.js

@@ -214,10 +214,10 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.closeEditors = unsupported;
         this.closeAllEditors = unsupported;
         this.replaceEditors = unsupported;
-        this.pinEditor = unsupported;
-        this.stickEditor = unsupported;
-        this.unstickEditor = unsupported;
-        this.lock = unsupported;
+        this.pinEditor = () => { };
+        this.stickEditor = () => { };
+        this.unstickEditor = () => { };
+        this.lock = () => { };
         this.isFirst = unsupported;
         this.isLast = unsupported;
         const onNewModel = (uri) => {

package/services.d.ts

@@ -1,38 +1,42 @@
+import { IDisposable } from './vscode/src/vs/base/common/lifecycle.js';
+export { IMarkdownString, MarkdownStringTrustedOptions } from './vscode/src/vs/base/common/htmlContent.js';
+import { ServiceIdentifier, GetLeadingNonServiceArgs, ServicesAccessor } from './vscode/src/vs/platform/instantiation/common/instantiation.js';
+export { IInstantiationService } from './vscode/src/vs/platform/instantiation/common/instantiation.js';
+export { IContextKeyService } from './vscode/src/vs/platform/contextkey/common/contextkey.js';
+export { IDimension } from './vscode/src/vs/editor/common/core/dimension.js';
 export { default as Severity } from './vscode/src/vs/base/common/severity.js';
-export { IConfigurationChangeEvent, IConfigurationService } from './vscode/src/vs/platform/configuration/common/configuration.js';
-export { ITextModelContentProvider, ITextModelService } from './vscode/src/vs/editor/common/services/resolverService.js';
+export { IMarkerService } from './vscode/src/vs/platform/markers/common/markers.js';
+export { ILanguageService } from './vscode/src/vs/editor/common/languages/language.js';
+export { ILanguageConfigurationService } from './vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js';
 export { IColorTheme, IThemeService } from './vscode/src/vs/platform/theme/common/themeService.js';
+export { ICodeEditorService } from './vscode/src/vs/editor/browser/services/codeEditorService.js';
+export { IConfigurationChangeEvent, IConfigurationService } from './vscode/src/vs/platform/configuration/common/configuration.js';
+export { INeverShowAgainOptions, INotification, INotificationActions, INotificationHandle, INotificationProgress, INotificationProgressProperties, INotificationProperties, INotificationService, IPromptChoice, IPromptChoiceWithMenu, IPromptOptions, IStatusMessageOptions, NeverShowAgainScope, NoOpNotification, NoOpProgress, NotificationMessage, NotificationPriority, NotificationsFilter } from './vscode/src/vs/platform/notification/common/notification.js';
 export { IStorageService, StorageScope, StorageTarget } from './vscode/src/vs/platform/storage/common/storage.js';
+export { ITextModelContentProvider, ITextModelService } from './vscode/src/vs/editor/common/services/resolverService.js';
+export { CloseDirection, EditorInputWithOptions, EditorsOrder, GroupIdentifier, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorControl, IEditorPane, IEditorPartOptions, IEditorPartOptionsChangeEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IFindEditorOptions, IMatchEditorOptions, IUntypedEditorInput, IVisibleEditorPane } from './vscode/src/vs/workbench/common/editor.js';
+export { ITextFileService } from './vscode/src/vs/workbench/services/textfile/common/textfiles.js';
+export { IAction } from './vscode/src/vs/base/common/actions.js';
+export { ICommandService } from './vscode/src/vs/platform/commands/common/commands.js';
+export { IAudioCueService } from './vscode/src/vs/platform/audioCues/browser/audioCueService.js';
 import { IEditorOverrideServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 export { StandaloneServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';
-import { ServiceIdentifier, GetLeadingNonServiceArgs, ServicesAccessor } from './vscode/src/vs/platform/instantiation/common/instantiation.js';
-export { IInstantiationService } from './vscode/src/vs/platform/instantiation/common/instantiation.js';
-export { IAction } from './vscode/src/vs/base/common/actions.js';
 export { IProductService } from './vscode/src/vs/platform/product/common/productService.js';
-import { IDisposable } from './vscode/src/vs/base/common/lifecycle.js';
 import { IWorkbenchConstructionOptions } from './vscode/src/vs/workbench/browser/web.api.js';
 export { SyncDescriptor } from './vscode/src/vs/platform/instantiation/common/descriptors.js';
-export { ICommandService } from './vscode/src/vs/platform/commands/common/commands.js';
-export { INeverShowAgainOptions, INotification, INotificationActions, INotificationHandle, INotificationProgress, INotificationProgressProperties, INotificationProperties, INotificationService, IPromptChoice, IPromptChoiceWithMenu, IPromptOptions, IStatusMessageOptions, NeverShowAgainScope, NoOpNotification, NoOpProgress, NotificationMessage, NotificationPriority, NotificationsFilter } from './vscode/src/vs/platform/notification/common/notification.js';
 export { IBulkEditService } from './vscode/src/vs/editor/browser/services/bulkEditService.js';
-export { ICodeEditorService } from './vscode/src/vs/editor/browser/services/codeEditorService.js';
-export { ILanguageService } from './vscode/src/vs/editor/common/languages/language.js';
-export { ILanguageConfigurationService } from './vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js';
 export { IEditorWorkerService } from './vscode/src/vs/editor/common/services/editorWorker.js';
 export { ILanguageFeaturesService } from './vscode/src/vs/editor/common/services/languageFeatures.js';
 export { IModelService } from './vscode/src/vs/editor/common/services/model.js';
 export { IClipboardService } from './vscode/src/vs/platform/clipboard/common/clipboardService.js';
 export { DialogType, IBaseDialogOptions, ICheckbox, ICheckboxResult, IConfirmDialogArgs, IConfirmation, IConfirmationResult, ICustomDialogMarkdown, ICustomDialogOptions, IDialogArgs, IDialogHandler, IDialogResult, IDialogService, IFileDialogService, IInput, IInputDialogArgs, IInputElement, IInputResult, IPrompt, IPromptBaseButton, IPromptButton, IPromptCancelButton, IPromptDialogArgs, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from './vscode/src/vs/platform/dialogs/common/dialogs.js';
 export { IFileService } from './vscode/src/vs/platform/files/common/files.js';
-export { IMarkerService } from './vscode/src/vs/platform/markers/common/markers.js';
 export { IOpenerService } from './vscode/src/vs/platform/opener/common/opener.js';
 export { IQuickInputService } from './vscode/src/vs/platform/quickinput/common/quickInput.js';
 export { ITelemetryService } from './vscode/src/vs/platform/telemetry/common/telemetry.js';
 export { IUriIdentityService } from './vscode/src/vs/platform/uriIdentity/common/uriIdentity.js';
 export { IBreadcrumbsService } from './vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js';
 export { EditorGroupLayout, GroupDirection, GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, ICloseAllEditorsOptions, ICloseEditorOptions, ICloseEditorsFilter, IEditorGroup, IEditorGroupsService, IEditorReplacement, IEditorSideGroup, IFindGroupScope, IMergeGroupOptions, MergeGroupMode } from './vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
-export { CloseDirection, EditorInputWithOptions, EditorsOrder, GroupIdentifier, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorControl, IEditorPane, IEditorPartOptions, IEditorPartOptionsChangeEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IFindEditorOptions, IMatchEditorOptions, IUntypedEditorInput, IVisibleEditorPane } from './vscode/src/vs/workbench/common/editor.js';
-export { IDimension } from './vscode/src/vs/editor/common/core/dimension.js';
 export { IEditorOptions, IResourceEditorInput, ITextEditorOptions } from './vscode/src/vs/platform/editor/common/editor.js';
 export { EditorInput } from './vscode/src/vs/workbench/common/editor/editorInput.js';
 export { IGroupModelChangeEvent } from './vscode/src/vs/workbench/common/editor/editorGroupModel.js';
@@ -44,12 +48,9 @@ export { IHostService } from './vscode/src/vs/workbench/services/host/browser/ho
 export { ILanguageStatusService } from './vscode/src/vs/workbench/services/languageStatus/common/languageStatusService.js';
 export { IPaneCompositePartService } from './vscode/src/vs/workbench/services/panecomposite/browser/panecomposite.js';
 export { IPathService } from './vscode/src/vs/workbench/services/path/common/pathService.js';
-export { ITextFileService } from './vscode/src/vs/workbench/services/textfile/common/textfiles.js';
 export { IWorkingCopyFileService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js';
-export { IContextKeyService } from './vscode/src/vs/platform/contextkey/common/contextkey.js';
 export { ISnippetsService } from './vscode/src/vs/workbench/contrib/snippets/browser/snippets.js';
 export { IWorkspaceContextService } from './vscode/src/vs/platform/workspace/common/workspace.js';
-export { IAudioCueService } from './vscode/src/vs/platform/audioCues/browser/audioCueService.js';
 export { IDebugService } from './vscode/src/vs/workbench/contrib/debug/common/debug.js';
 export { ILogService, ILoggerService, LogLevel } from './vscode/src/vs/platform/log/common/log.js';
 export { IViewDescriptorService, IViewsService } from './vscode/src/vs/workbench/common/views.js';
@@ -65,7 +66,6 @@ export { IRemoteSocketFactoryService } from './vscode/src/vs/platform/remote/com
 export { ITerminalInstanceService, ITerminalService } from './vscode/src/vs/workbench/contrib/terminal/browser/terminal.js';
 export { IFilesConfigurationService } from './vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js';
 export { ILabelService } from './vscode/src/vs/platform/label/common/label.js';
-export { IMarkdownString, MarkdownStringTrustedOptions } from './vscode/src/vs/base/common/htmlContent.js';
 export { IActivityService, IBadge } from './vscode/src/vs/workbench/services/activity/common/activity.js';
 export { IHoverService } from './vscode/src/vs/workbench/services/hover/browser/hover.js';
 export { IExplorerService } from './vscode/src/vs/workbench/contrib/files/browser/files.js';

package/services.js

@@ -1,4 +1,5 @@
 import './missing-services.js';
+import './contributions.js';
 export { default as Severity } from 'monaco-editor/esm/vs/base/common/severity.js';
 export { StorageScope, StorageTarget } from './vscode/src/vs/platform/storage/common/storage.js';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';

package/vscode/src/vs/base/common/errors.d.ts

@@ -17,12 +17,5 @@ declare class ErrorHandler {
     onUnexpectedExternalError(e: any): void;
 }
 declare const errorHandler: ErrorHandler;
-interface SerializedError {
-    readonly $isError: true;
-    readonly name: string;
-    readonly message: string;
-    readonly stack: string;
-    readonly noTelemetry: boolean;
-}
 
-export { ErrorHandler, type ErrorListenerCallback, type ErrorListenerUnbind, type SerializedError, errorHandler };
+export { ErrorHandler, type ErrorListenerCallback, type ErrorListenerUnbind, errorHandler };

package/vscode/src/vs/base/common/uri.d.ts

@@ -158,11 +158,5 @@ interface UriComponents {
     query?: string;
     fragment?: string;
 }
-/**
- * Mapped-type that replaces all occurrences of URI with UriComponents
- */
-type UriDto<T> = {
-    [K in keyof T]: T[K] extends URI ? UriComponents : UriDto<T[K]>;
-};
 
-export { URI, type UriComponents, type UriDto };
+export { URI, type UriComponents };

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

@@ -1,7 +1,7 @@
 import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { Event } from '../../../base/common/event.js';
 import { OperatingSystem, IProcessEnvironment } from '../../../base/common/platform.js';
-import { URI, UriComponents } from '../../../base/common/uri.js';
+import { URI } from '../../../base/common/uri.js';
 import { ISerializedCommandDetectionCapability, ITerminalCapabilityStore } from './capabilities/capabilities.js';
 import { IProcessDetails } from './terminalProcess.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
@@ -259,19 +259,6 @@ interface IShellLaunchConfig {
     ignoreShellIntegration?: boolean;
 }
 type WaitOnExitValue = boolean | string | ((exitCode: number) => string);
-interface ICreateContributedTerminalProfileOptions {
-    icon?: URI | string | {
-        light: URI;
-        dark: URI;
-    };
-    color?: string;
-    location?: TerminalLocation | {
-        viewColumn: number;
-        preserveState?: boolean;
-    } | {
-        splitActiveTerminal: boolean;
-    };
-}
 declare enum TerminalLocation {
     Panel = 1,
     Editor = 2
@@ -284,18 +271,6 @@ type TerminalIcon = ThemeIcon | URI | {
     light: URI;
     dark: URI;
 };
-interface IShellLaunchConfigDto {
-    name?: string;
-    executable?: string;
-    args?: string[] | string;
-    cwd?: string | UriComponents;
-    env?: ITerminalEnvironment;
-    useShellEnvironment?: boolean;
-    hideFromUser?: boolean;
-    reconnectionProperties?: IReconnectionProperties;
-    type?: 'Task' | 'Local';
-    isFeatureTerminal?: boolean;
-}
 /**
  * A set of options for the terminal process. These differ from the shell launch config in that they
  * are set internally to the terminal component, not from the outside.
@@ -612,4 +587,4 @@ interface ITerminalLogService extends ILogService {
     readonly _logBrand: undefined;
 }
 
-export { type IBaseUnresolvedTerminalProfile, type ICreateContributedTerminalProfileOptions, type IExtensionTerminalProfile, type IFixedTerminalDimensions, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type IProcessReadyWindowsPty, type IPtyHostAttachTarget, type IPtyHostLatencyMeasurement, type IRawTerminalInstanceLayoutInfo, type IRawTerminalTabLayoutInfo, type IRawTerminalsLayoutInfo, type IReconnectionProperties, type IShellIntegration, type IShellLaunchConfig, type IShellLaunchConfigDto, type ITerminalBackend, type ITerminalChildProcess, type ITerminalDimensions, type ITerminalDimensionsOverride, type ITerminalEnvironment, type ITerminalExecutable, type ITerminalLaunchError, ITerminalLogService, type ITerminalOutputMatch, type ITerminalOutputMatcher, type ITerminalProcessOptions, type ITerminalProfile, type ITerminalProfileContribution, type ITerminalProfileObject, type ITerminalProfileSource, type ITerminalTabLayoutInfoById, type ITerminalUnsafePath, type ITerminalsLayoutInfo, type ITerminalsLayoutInfoById, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationStatus, TerminalExitReason, type TerminalIcon, TerminalLocation, TerminalLocationString, type TerminalShellType, type TerminalType, TitleEventSource, type WaitOnExitValue, WindowsShellType };
+export { type IBaseUnresolvedTerminalProfile, type IExtensionTerminalProfile, type IFixedTerminalDimensions, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type IProcessReadyWindowsPty, type IPtyHostAttachTarget, type IPtyHostLatencyMeasurement, type IRawTerminalInstanceLayoutInfo, type IRawTerminalTabLayoutInfo, type IRawTerminalsLayoutInfo, type IReconnectionProperties, type IShellIntegration, type IShellLaunchConfig, type ITerminalBackend, type ITerminalChildProcess, type ITerminalDimensions, type ITerminalDimensionsOverride, type ITerminalEnvironment, type ITerminalExecutable, type ITerminalLaunchError, ITerminalLogService, type ITerminalOutputMatch, type ITerminalOutputMatcher, type ITerminalProcessOptions, type ITerminalProfile, type ITerminalProfileContribution, type ITerminalProfileObject, type ITerminalProfileSource, type ITerminalTabLayoutInfoById, type ITerminalUnsafePath, type ITerminalsLayoutInfo, type ITerminalsLayoutInfoById, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationStatus, TerminalExitReason, type TerminalIcon, TerminalLocation, TerminalLocationString, type TerminalShellType, type TerminalType, TitleEventSource, type WaitOnExitValue, WindowsShellType };

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

@@ -1,4 +1,7 @@
+import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
+import { Event } from '../../../base/common/event.js';
 import { URI } from '../../../base/common/uri.js';
+import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 declare const enum ProfileResourceType {
     Settings = "settings",
@@ -31,5 +34,40 @@ interface IUserDataProfile {
     readonly useDefaultFlags?: UseDefaultProfileFlags;
     readonly isTransient?: boolean;
 }
+type DidChangeProfilesEvent = {
+    readonly added: readonly IUserDataProfile[];
+    readonly removed: readonly IUserDataProfile[];
+    readonly updated: readonly IUserDataProfile[];
+    readonly all: readonly IUserDataProfile[];
+};
+interface IUserDataProfileOptions {
+    readonly shortName?: string;
+    readonly icon?: string;
+    readonly useDefaultFlags?: UseDefaultProfileFlags;
+    readonly transient?: boolean;
+}
+interface IUserDataProfileUpdateOptions extends Omit<IUserDataProfileOptions, 'icon'> {
+    readonly name?: string;
+    readonly icon?: string | null;
+}
+declare const IUserDataProfilesService: ServiceIdentifier<IUserDataProfilesService>;
+interface IUserDataProfilesService {
+    readonly _serviceBrand: undefined;
+    readonly profilesHome: URI;
+    readonly defaultProfile: IUserDataProfile;
+    readonly onDidChangeProfiles: Event<DidChangeProfilesEvent>;
+    readonly profiles: readonly IUserDataProfile[];
+    readonly onDidResetWorkspaces: Event<void>;
+    isEnabled(): boolean;
+    createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
+    createTransientProfile(workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
+    createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
+    updateProfile(profile: IUserDataProfile, options?: IUserDataProfileUpdateOptions): Promise<IUserDataProfile>;
+    removeProfile(profile: IUserDataProfile): Promise<void>;
+    setProfileForWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, profile: IUserDataProfile): Promise<void>;
+    resetWorkspaces(): Promise<void>;
+    cleanUp(): Promise<void>;
+    cleanUpTransientProfiles(): Promise<void>;
+}
 
-export { type IUserDataProfile, ProfileResourceType, type UseDefaultProfileFlags };
+export { type DidChangeProfilesEvent, type IUserDataProfile, type IUserDataProfileOptions, type IUserDataProfileUpdateOptions, IUserDataProfilesService, ProfileResourceType, type UseDefaultProfileFlags };

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

@@ -152,25 +152,6 @@ interface IWorkspaceFolder extends IWorkspaceFolderData {
      */
     toResource: (relativePath: string) => URI;
 }
-declare class Workspace implements IWorkspace {
-    private _id;
-    private _transient;
-    private _configuration;
-    private _ignorePathCasing;
-    private _foldersMap;
-    private _folders;
-    constructor(_id: string, folders: WorkspaceFolder[], _transient: boolean, _configuration: URI | null, _ignorePathCasing: (key: URI) => boolean);
-    update(workspace: Workspace): void;
-    get folders(): WorkspaceFolder[];
-    set folders(folders: WorkspaceFolder[]);
-    get id(): string;
-    get transient(): boolean;
-    get configuration(): URI | null;
-    set configuration(configuration: URI | null);
-    getFolder(resource: URI): IWorkspaceFolder | null;
-    private updateFoldersMap;
-    toJSON(): IWorkspace;
-}
 interface IRawFileWorkspaceFolder {
     readonly path: string;
     name?: string;
@@ -179,29 +160,5 @@ interface IRawUriWorkspaceFolder {
     readonly uri: string;
     name?: string;
 }
-declare class WorkspaceFolder implements IWorkspaceFolder {
-    /**
-     * Provides access to the original metadata for this workspace
-     * folder. This can be different from the metadata provided in
-     * this class:
-     * - raw paths can be relative
-     * - raw paths are not normalized
-     */
-    readonly raw?: IRawFileWorkspaceFolder | IRawUriWorkspaceFolder | undefined;
-    readonly uri: URI;
-    readonly name: string;
-    readonly index: number;
-    constructor(data: IWorkspaceFolderData, 
-    /**
-     * Provides access to the original metadata for this workspace
-     * folder. This can be different from the metadata provided in
-     * this class:
-     * - raw paths can be relative
-     * - raw paths are not normalized
-     */
-    raw?: IRawFileWorkspaceFolder | IRawUriWorkspaceFolder | undefined);
-    toResource(relativePath: string): URI;
-    toJSON(): IWorkspaceFolderData;
-}
 
-export { type IAnyWorkspaceIdentifier, type IBaseWorkspace, type IBaseWorkspaceIdentifier, type IEmptyWorkspaceIdentifier, type IRawFileWorkspaceFolder, type IRawUriWorkspaceFolder, type ISingleFolderWorkspaceIdentifier, type IWorkspace, IWorkspaceContextService, type IWorkspaceFolder, type IWorkspaceFolderData, type IWorkspaceFoldersChangeEvent, type IWorkspaceFoldersWillChangeEvent, type IWorkspaceIdentifier, WorkbenchState, Workspace, WorkspaceFolder };
+export { type IAnyWorkspaceIdentifier, type IBaseWorkspace, type IBaseWorkspaceIdentifier, type IEmptyWorkspaceIdentifier, type IRawFileWorkspaceFolder, type IRawUriWorkspaceFolder, type ISingleFolderWorkspaceIdentifier, type IWorkspace, IWorkspaceContextService, type IWorkspaceFolder, type IWorkspaceFolderData, type IWorkspaceFoldersChangeEvent, type IWorkspaceFoldersWillChangeEvent, type IWorkspaceIdentifier, WorkbenchState };

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

@@ -1,11 +1,18 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { toDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../services/extensions/common/extensionsRegistry.js';
 import { IStatusbarService } from '../../services/statusbar/browser/statusbar.js';
+import { isAccessibilityInformation } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
 import { getCodiconAriaLabel } from 'monaco-editor/esm/vs/base/common/iconLabels.js';
 import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { registerSingleton } from 'monaco-editor/esm/vs/platform/instantiation/common/extensions.js';
+import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
+import { ExtensionIdentifier } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
+import { asStatusBarItemIdentifier } from '../common/extHostTypes.js';
 import { STATUS_BAR_WARNING_ITEM_BACKGROUND, STATUS_BAR_ERROR_ITEM_BACKGROUND } from '../../common/theme.js';
 const IExtensionStatusBarItemService = ( createDecorator('IExtensionStatusBarItemService'));
 let ExtensionStatusBarItemService = class ExtensionStatusBarItemService {
@@ -93,4 +100,155 @@ ExtensionStatusBarItemService = ( __decorate([
     ( __param(0, IStatusbarService))
 ], ExtensionStatusBarItemService));
 registerSingleton(IExtensionStatusBarItemService, ExtensionStatusBarItemService, 1 );
-export { ExtensionStatusBarItemService, IExtensionStatusBarItemService };
+function isUserFriendlyStatusItemEntry(candidate) {
+    const obj = candidate;
+    return (typeof obj.id === 'string' && obj.id.length > 0)
+        && typeof obj.name === 'string'
+        && typeof obj.text === 'string'
+        && (obj.alignment === 'left' || obj.alignment === 'right')
+        && (obj.command === undefined || typeof obj.command === 'string')
+        && (obj.tooltip === undefined || typeof obj.tooltip === 'string')
+        && (obj.priority === undefined || typeof obj.priority === 'number')
+        && (obj.accessibilityInformation === undefined || isAccessibilityInformation(obj.accessibilityInformation));
+}
+const statusBarItemSchema = {
+    type: 'object',
+    required: ['id', 'text', 'alignment', 'name'],
+    properties: {
+        id: {
+            type: 'string',
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'id',
+                'The identifier of the status bar entry. Must be unique within the extension. The same value must be used when calling the `vscode.window.createStatusBarItem(id, ...)`-API'
+            ))
+        },
+        name: {
+            type: 'string',
+            description: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'name',
+                'The name of the entry, like \'Python Language Indicator\', \'Git Status\' etc. Try to keep the length of the name short, yet descriptive enough that users can understand what the status bar item is about.'
+            ))
+        },
+        text: {
+            type: 'string',
+            description: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'text',
+                'The text to show for the entry. You can embed icons in the text by leveraging the `$(<name>)`-syntax, like \'Hello $(globe)!\''
+            ))
+        },
+        tooltip: {
+            type: 'string',
+            description: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'tooltip',
+                'The tooltip text for the entry.'
+            ))
+        },
+        command: {
+            type: 'string',
+            description: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'command',
+                'The command to execute when the status bar entry is clicked.'
+            ))
+        },
+        alignment: {
+            type: 'string',
+            enum: ['left', 'right'],
+            description: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'alignment',
+                'The alignment of the status bar entry.'
+            ))
+        },
+        priority: {
+            type: 'number',
+            description: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'priority',
+                'The priority of the status bar entry. Higher value means the item should be shown more to the left.'
+            ))
+        },
+        accessibilityInformation: {
+            type: 'object',
+            description: ( localizeWithPath(
+                'vs/workbench/api/browser/statusBarExtensionPoint',
+                'accessibilityInformation',
+                'Defines the role and aria label to be used when the status bar entry is focused.'
+            )),
+            properties: {
+                role: {
+                    type: 'string',
+                    description: ( localizeWithPath(
+                        'vs/workbench/api/browser/statusBarExtensionPoint',
+                        'accessibilityInformation.role',
+                        'The role of the status bar entry which defines how a screen reader interacts with it. More about aria roles can be found here https://w3c.github.io/aria/#widget_roles'
+                    ))
+                },
+                label: {
+                    type: 'string',
+                    description: ( localizeWithPath(
+                        'vs/workbench/api/browser/statusBarExtensionPoint',
+                        'accessibilityInformation.label',
+                        'The aria label of the status bar entry. Defaults to the entry\'s text.'
+                    ))
+                }
+            }
+        }
+    }
+};
+const statusBarItemsSchema = {
+    description: ( localizeWithPath(
+        'vs/workbench/api/browser/statusBarExtensionPoint',
+        'vscode.extension.contributes.statusBarItems',
+        "Contributes items to the status bar."
+    )),
+    oneOf: [
+        statusBarItemSchema,
+        {
+            type: 'array',
+            items: statusBarItemSchema
+        }
+    ]
+};
+const statusBarItemsExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
+    extensionPoint: 'statusBarItems',
+    jsonSchema: statusBarItemsSchema,
+}));
+let StatusBarItemsExtensionPoint = class StatusBarItemsExtensionPoint {
+    constructor(statusBarItemsService) {
+        const contributions = ( new DisposableStore());
+        statusBarItemsExtensionPoint.setHandler((extensions) => {
+            contributions.clear();
+            for (const entry of extensions) {
+                if (!isProposedApiEnabled(entry.description, 'contribStatusBarItems')) {
+                    entry.collector.error(`The ${statusBarItemsExtensionPoint.name} is proposed API`);
+                    continue;
+                }
+                const { value, collector } = entry;
+                for (const candidate of Iterable.wrap(value)) {
+                    if (!isUserFriendlyStatusItemEntry(candidate)) {
+                        collector.error(( localizeWithPath(
+                            'vs/workbench/api/browser/statusBarExtensionPoint',
+                            'invalid',
+                            "Invalid status bar item contribution."
+                        )));
+                        continue;
+                    }
+                    const fullItemId = asStatusBarItemIdentifier(entry.description.identifier, candidate.id);
+                    const kind = statusBarItemsService.setOrUpdateEntry(fullItemId, fullItemId, ExtensionIdentifier.toKey(entry.description.identifier), candidate.name ?? entry.description.displayName ?? entry.description.name, candidate.text, candidate.tooltip, candidate.command ? { id: candidate.command, title: candidate.name } : undefined, undefined, undefined, candidate.alignment === 'left', candidate.priority, candidate.accessibilityInformation);
+                    if (kind === 0 ) {
+                        contributions.add(toDisposable(() => statusBarItemsService.unsetEntry(fullItemId)));
+                    }
+                }
+            }
+        });
+    }
+};
+StatusBarItemsExtensionPoint = ( __decorate([
+    ( __param(0, IExtensionStatusBarItemService))
+], StatusBarItemsExtensionPoint));
+export { ExtensionStatusBarItemService, IExtensionStatusBarItemService, StatusBarItemsExtensionPoint };

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -1293,6 +1293,7 @@ let SearchResult = class SearchResult extends Disposable {
         this.disposePastResults = () => { };
         this._isDirty = false;
         this._rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
+        this.modelService.getModels().forEach(model => this.onModelAdded(model));
         this._register(this.modelService.onModelAdded(model => this.onModelAdded(model)));
         this._register(this.notebookEditorService.onDidAddNotebookEditor(widget => {
             if (widget instanceof NotebookEditorWidget) {