@codingame/monaco-vscode-api 2.2.1 → 3.0.0

package/missing-services.js

@@ -176,7 +176,6 @@ import { INotebookExecutionService } from './vscode/src/vs/workbench/contrib/not
 import { INotebookKeymapService } from './vscode/src/vs/workbench/contrib/notebook/common/notebookKeymapService.js';
 import { INotebookLoggingService } from './vscode/src/vs/workbench/contrib/notebook/common/notebookLoggingService.js';
 import { IWalkthroughsService } from './vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.js';
-import { IFeaturedExtensionsService } from './vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/featuredExtensionService.js';
 import { IUserDataSyncMachinesService } from './vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js';
 import { IWorkingCopyHistoryService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyHistory.js';
 import { mainWindow } from './vscode/src/vs/base/browser/window.js';
@@ -191,8 +190,10 @@ import { IMultiDiffSourceResolverService } from './vscode/src/vs/workbench/contr
 import { IInteractiveHistoryService } from './vscode/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.js';
 import { IWorkspaceTagsService } from './vscode/src/vs/workbench/contrib/tags/common/workspaceTags.js';
 import { NoOpWorkspaceTagsService } from './vscode/src/vs/workbench/contrib/tags/browser/workspaceTagsService.js';
-import { unsupported } from './tools.js';
+import { IExtensionFeaturesManagementService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionFeatures.js';
+import { IEditorPaneService } from './vscode/src/vs/workbench/services/editor/common/editorPaneService.js';
 import { getBuiltInExtensionTranslationsUris } from './l10n.js';
+import { unsupported } from './tools.js';
 import { IFileDialogService } from './vscode/src/vs/platform/dialogs/common/dialogs.js';
 var _a;
 registerSingleton(ILoggerService, class NullLoggerService extends AbstractLoggerService {
@@ -204,6 +205,7 @@ registerSingleton(ILoggerService, class NullLoggerService extends AbstractLogger
 registerSingleton(IEditorService, class EditorService {
     constructor() {
         this._serviceBrand = undefined;
+        this.onWillOpenEditor = Event.None;
         this.onDidActiveEditorChange = Event.None;
         this.onDidVisibleEditorsChange = Event.None;
         this.onDidEditorsChange = Event.None;
@@ -517,6 +519,7 @@ registerSingleton(ITitleService, class TitleService {
         this.onMenubarVisibilityChange = Event.None;
         this.isCommandCenterVisible = false;
         this.onDidChangeCommandCenterVisibility = Event.None;
+        this.registerVariables = () => { };
     }
     updateProperties() { }
 }, 0 );
@@ -525,8 +528,8 @@ registerSingleton(IPathService, BrowserPathService, 1 );
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.86.2";
-        this.commit = "1.86.2";
+        this.version = "1.87.0";
+        this.commit = "1.87.0";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';
@@ -711,10 +714,15 @@ const debugModel = {
     onDidChangeCallStack: Event.None,
     onDidChangeWatchExpressions: Event.None,
     fetchCallstack: unsupported,
-    getId: unsupported
+    getId: unsupported,
+    registerBreakpointModes: unsupported,
+    getBreakpointModes: () => []
 };
 class FakeViewModel {
     constructor() {
+        this.setVisualizedExpression = unsupported;
+        this.getVisualizedExpression = () => undefined;
+        this.onDidChangeVisualization = Event.None;
         this.getId = unsupported;
         this.focusedSession = undefined;
         this.focusedThread = undefined;
@@ -888,6 +896,10 @@ registerSingleton(IViewDescriptorService, class ViewDescriptorService {
 }, 0 );
 registerSingleton(IHistoryService, class HistoryService {
     constructor() {
+        this.suspendTracking = () => ({
+            dispose() {
+            }
+        });
         this.goForward = unsupported;
         this.goBack = unsupported;
         this.goPrevious = unsupported;
@@ -905,6 +917,7 @@ registerSingleton(IHistoryService, class HistoryService {
 }, 0 );
 registerSingleton(ITaskService, class TaskService {
     constructor() {
+        this.onDidChangeTaskConfig = Event.None;
         this.onDidStateChange = Event.None;
         this.supportsMultipleTaskExecutions = false;
         this.configureAction = unsupported;
@@ -1930,6 +1943,7 @@ registerSingleton(IWorkbenchAssignmentService, class WorkbenchAssignmentService
 }, 1 );
 registerSingleton(IChatService, class ChatService {
     constructor() {
+        this.onDidUnregisterProvider = Event.None;
         this.clearAllHistoryEntries = unsupported;
         this.onDidSubmitAgent = Event.None;
         this.onDidRegisterProvider = Event.None;
@@ -2189,6 +2203,9 @@ registerSingleton(IExtensionUrlHandler, class ExtensionUrlHandler {
 }, 1 );
 registerSingleton(ICommentService, class CommentService {
     constructor() {
+        this.onDidChangeActiveEditingCommentThread = Event.None;
+        this.setActiveEditingCommentThread = unsupported;
+        this.setActiveCommentAndThread = unsupported;
         this.onDidSetResourceCommentInfos = Event.None;
         this.onDidSetAllCommentThreads = Event.None;
         this.onDidUpdateCommentThreads = Event.None;
@@ -2360,6 +2377,8 @@ registerSingleton(IRemoteExplorerService, class RemoteExplorerService {
 }, 1 );
 registerSingleton(IAuthenticationService, class AuthenticationService {
     constructor() {
+        this.onDidChangeExtensionSessionAccess = Event.None;
+        this.readAllowedExtensions = () => [];
         this.isAuthenticationProviderRegistered = () => false;
         this.getProviderIds = () => [];
         this.registerAuthenticationProvider = unsupported;
@@ -2577,6 +2596,8 @@ registerSingleton(INotebookSearchService, class NotebookSearchService {
 }, 1 );
 registerSingleton(IChatProviderService, class ChatProviderService {
     constructor() {
+        this.onDidChangeProviders = Event.None;
+        this.getProviders = () => [];
         this.lookupChatResponseProvider = unsupported;
         this.registerChatResponseProvider = unsupported;
         this.fetchChatResponse = unsupported;
@@ -2779,14 +2800,6 @@ registerSingleton(IWalkthroughsService, class WalkthroughsService {
         this.markWalkthroughOpened = unsupported;
     }
 }, 1 );
-registerSingleton(IFeaturedExtensionsService, class FeaturedExtensionsService {
-    constructor() {
-        this.getExtensions = unsupported;
-    }
-    get title() {
-        return unsupported();
-    }
-}, 1 );
 registerSingleton(IUserDataSyncStoreManagementService, class UserDataSyncStoreManagementService {
     constructor() {
         this.onDidChangeUserDataSyncStore = Event.None;
@@ -2933,6 +2946,10 @@ registerSingleton(INotebookDocumentService, class NotebookDocumentService {
 }, 1 );
 registerSingleton(IDebugVisualizerService, class DebugVisualizerService {
     constructor() {
+        this.registerTree = unsupported;
+        this.getVisualizedNodeFor = unsupported;
+        this.getVisualizedChildren = unsupported;
+        this.editTreeItem = unsupported;
         this.getApplicableFor = unsupported;
         this.register = unsupported;
     }
@@ -2975,3 +2992,21 @@ registerSingleton(IMultiDiffSourceResolverService, class MultiDiffSourceResolver
     }
 }, 1 );
 registerSingleton(IWorkspaceTagsService, NoOpWorkspaceTagsService, 1 );
+registerSingleton(IExtensionFeaturesManagementService, class ExtensionFeaturesManagementService {
+    constructor() {
+        this.onDidChangeEnablement = Event.None;
+        this.isEnabled = () => true;
+        this.setEnablement = unsupported;
+        this.getEnablementData = unsupported;
+        this.getAccess = unsupported;
+        this.onDidChangeAccessData = Event.None;
+        this.getAccessData = () => undefined;
+        this.setStatus = unsupported;
+    }
+}, 1 );
+registerSingleton(IEditorPaneService, class EditorPaneService {
+    constructor() {
+        this.onWillInstantiateEditorPane = Event.None;
+        this.didInstantiateEditorPane = () => false;
+    }
+}, 1 );

package/monaco.js

@@ -32,7 +32,7 @@ import { INotificationService } from './vscode/src/vs/platform/notification/comm
 import { ILogService } from './vscode/src/vs/platform/log/common/log.js';
 import { ICodeEditorService } from './vscode/src/vs/editor/browser/services/codeEditorService.js';
 import { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/keybinding.js';
-import { Emitter } from './vscode/src/vs/base/common/event.js';
+import { ResourceContextKey } from './vscode/src/vs/workbench/common/contextkeys.js';
 import { createInjectedClass } from './tools/injection.js';
 import { getService } from './services.js';
 function computeConfiguration(configuration, overrides) {
@@ -73,6 +73,12 @@ function createConfiguredEditorClass(impl) {
             this._register(this.onDidChangeModelLanguage(() => this.updateEditorConfiguration()));
             this._register(this.onDidChangeModel(() => this.updateEditorConfiguration()));
             this.updateEditorConfiguration();
+            const scopedInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService]));
+            const resourceContext = this._register(scopedInstantiationService.createInstance(ResourceContextKey));
+            this.onDidChangeModel((e) => {
+                resourceContext.set(e.newModelUrl);
+            });
+            resourceContext.set(this.getModel()?.uri);
         }
         updateEditorConfiguration() {
             if (!this.hasModel() || this.textResourceConfigurationService == null) {
@@ -186,27 +192,37 @@ let DelegateStandaloneKeybindingService = class DelegateStandaloneKeybindingServ
     constructor(delegate, contextKeyService, commandService, telemetryService, notificationService, logService, codeEditorService) {
         super(contextKeyService, commandService, telemetryService, notificationService, logService, codeEditorService);
         this.delegate = delegate;
-        this._onDidChangeKeybindings = new Emitter();
         this._register(delegate.registerKeybindingProvider({
             provideKeybindings: () => {
                 return this.getUserKeybindingItems();
             },
-            onDidChangeKeybindings: this._onDidChangeKeybindings.event
+            onDidChangeKeybindings: this.onDidUpdateKeybindings
         }));
     }
     _getResolver() {
         return this.delegate._getResolver();
     }
-    updateResolver() {
-        super.updateResolver();
-        this._onDidChangeKeybindings.fire();
-    }
     resolveKeyboardEvent(keyboardEvent) {
         return this.delegate.resolveKeyboardEvent(keyboardEvent);
     }
     resolveKeybinding(keybinding) {
         return this.delegate.resolveKeybinding(keybinding);
     }
+    resolveUserBinding(userBinding) {
+        return this.delegate.resolveUserBinding(userBinding);
+    }
+    _dumpDebugInfo() {
+        return this.delegate._dumpDebugInfo();
+    }
+    _dumpDebugInfoJSON() {
+        return this.delegate._dumpDebugInfoJSON();
+    }
+    registerSchemaContribution(contribution) {
+        return this.delegate.registerSchemaContribution(contribution);
+    }
+    enableKeybindingHoldMode(commandId) {
+        return this.delegate.enableKeybindingHoldMode(commandId);
+    }
 };
 DelegateStandaloneKeybindingService = __decorate([
     ( __param(1, IContextKeyService)),
@@ -217,25 +233,25 @@ DelegateStandaloneKeybindingService = __decorate([
     ( __param(6, ICodeEditorService))
 ], DelegateStandaloneKeybindingService);
 let standaloneEditorInstantiationService = null;
-function getStandaloneEditorInstantiationService() {
+function getStandaloneEditorInstantiationService(accessor) {
     if (standaloneEditorInstantiationService == null) {
         const serviceCollection = new ServiceCollection();
         serviceCollection.set(IQuickInputService, new SyncDescriptor(StandaloneQuickInputService, undefined, true));
-        const keybindingService = StandaloneServices.get(IKeybindingService);
+        const keybindingService = accessor.get(IKeybindingService);
         if (!(keybindingService instanceof StandaloneKeybindingService) && isDynamicKeybindingService(keybindingService)) {
             serviceCollection.set(IKeybindingService, new SyncDescriptor(DelegateStandaloneKeybindingService, [keybindingService], true));
         }
-        standaloneEditorInstantiationService = StandaloneServices.get(IInstantiationService).createChild(serviceCollection);
+        standaloneEditorInstantiationService = accessor.get(IInstantiationService).createChild(serviceCollection);
     }
     return standaloneEditorInstantiationService;
 }
 const createConfiguredEditor = (domElement, options, override) => {
-    StandaloneServices.initialize(override ?? {});
-    return getStandaloneEditorInstantiationService().createInstance(ConfiguredStandaloneEditor, domElement, options);
+    const instantiationService = StandaloneServices.initialize(override ?? {});
+    return instantiationService.invokeFunction(getStandaloneEditorInstantiationService).createInstance(ConfiguredStandaloneEditor, domElement, options);
 };
 const createConfiguredDiffEditor = (domElement, options, override) => {
-    StandaloneServices.initialize(override ?? {});
-    return getStandaloneEditorInstantiationService().createInstance(ConfiguredStandaloneDiffEditor, domElement, options);
+    const instantiationService = StandaloneServices.initialize(override ?? {});
+    return instantiationService.invokeFunction(getStandaloneEditorInstantiationService).createInstance(ConfiguredStandaloneDiffEditor, domElement, options);
 };
 const Extensions = {
     ...Extensions$1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -96,12 +96,12 @@
   "dependencies": {
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "2.2.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.1",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.1",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.1",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.1",
-    "@codingame/monaco-vscode-host-service-override": "2.2.1",
-    "@codingame/monaco-vscode-base-service-override": "2.2.1"
+    "@codingame/monaco-vscode-files-service-override": "3.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "3.0.0",
+    "@codingame/monaco-vscode-extensions-service-override": "3.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "3.0.0",
+    "@codingame/monaco-vscode-layout-service-override": "3.0.0",
+    "@codingame/monaco-vscode-host-service-override": "3.0.0",
+    "@codingame/monaco-vscode-base-service-override": "3.0.0"
   }
 }

package/service-override/tools/editor.js

@@ -191,8 +191,8 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.onWillOpenEditor = this._onWillOpenEditor.event;
         this.id = --StandaloneEditorGroup_1.idCounter;
         this.index = -1;
-        this.label = `standalone editor ${this.editor.getId()}`;
-        this.ariaLabel = `standalone editor ${this.editor.getId()}`;
+        this.label = `standalone editor ${-this.id}`;
+        this.ariaLabel = `standalone editor ${-this.id}`;
         this.previewEditor = null;
         this.isLocked = true;
         this.stickyCount = 0;
@@ -200,8 +200,22 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.findEditors = (resource) => this.pane != null && ( resource.toString()) === ( this.pane.input.resource.toString()) ? [this.pane.input] : [];
         this.getEditorByIndex = (index) => this.pane != null && index === 0 ? this.pane.input : undefined;
         this.getIndexOfEditor = (editorInput) => this.pane != null && this.pane.input === editorInput ? 0 : -1;
-        this.openEditor = unsupported;
-        this.openEditors = unsupported;
+        this.openEditor = async (editor) => {
+            if (editor.isDisposed()) {
+                return undefined;
+            }
+            if (editor instanceof TextResourceEditorInput && ( editor.resource.toString()) === this.pane?.input.resource.toString()) {
+                this.focus();
+                return this.pane;
+            }
+            return undefined;
+        };
+        this.openEditors = async (editors) => {
+            if (editors.length === 1) {
+                return this.openEditor(editors[0].editor);
+            }
+            return undefined;
+        };
         this.isPinned = () => false;
         this.isSticky = () => false;
         this.isActive = () => this.editor.hasWidgetFocus();
@@ -317,6 +331,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
     }
     focus() {
         this.editor.focus();
+        this.editor.getContainerDomNode().scrollIntoView();
     }
 };
 StandaloneEditorGroup.idCounter = 0;
@@ -396,15 +411,23 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             const codeEditorService = StandaloneServices.get(ICodeEditorService);
             const handleCodeEditor = (editor) => {
                 if (editor instanceof StandaloneEditor) {
+                    let timeout;
                     const onEditorFocused = () => {
+                        if (timeout != null)
+                            window.clearTimeout(timeout);
                         this.activeGroupOverride = this.additionalGroups.find(group => group.editor === editor);
                         this._onDidChangeActiveGroup.fire(this.activeGroup);
                     };
                     const onEditorBlurred = () => {
-                        if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
-                            this.activeGroupOverride = undefined;
-                            this._onDidChangeActiveGroup.fire(this.activeGroup);
-                        }
+                        if (timeout != null)
+                            window.clearTimeout(timeout);
+                        timeout = window.setTimeout(() => {
+                            timeout = undefined;
+                            if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
+                                this.activeGroupOverride = undefined;
+                                this._onDidChangeActiveGroup.fire(this.activeGroup);
+                            }
+                        }, 100);
                     };
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);

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

@@ -4,11 +4,9 @@ import { BrandedService, ServicesAccessor } from '../../vscode/src/vs/platform/i
 import { IDisposable } from '../../vscode/src/vs/base/common/lifecycle.js';
 import { Dimension } from '../../vscode/src/vs/base/browser/dom.js';
 import { Event } from '../../vscode/src/vs/base/common/event.js';
+import { DomScrollableElement } from '../../vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js';
 import { CancellationToken } from '../../vscode/src/vs/base/common/cancellation.js';
 import { URI } from '../../vscode/src/vs/base/common/uri.js';
-import { IStorageService } from '../../vscode/src/vs/platform/storage/common/storage.js';
-import { ITelemetryService } from '../../vscode/src/vs/platform/telemetry/common/telemetry.js';
-import { IThemeService } from '../../vscode/src/vs/platform/theme/common/themeService.js';
 import { IEditorOptions } from '../../vscode/src/vs/platform/editor/common/editor.js';
 import { Parts, Position } from '../../vscode/src/vs/workbench/services/layout/browser/layoutService.js';
 import { Codicon } from '../../vscode/src/vs/base/common/codicons.js';
@@ -24,12 +22,14 @@ type Label = string | {
     medium: string;
     long: string;
 };
-declare abstract class SimpleEditorPane extends EditorPane {
+declare abstract class InjectedEditorPane extends EditorPane {
+    constructor(id: string);
+}
+declare abstract class SimpleEditorPane extends InjectedEditorPane {
     protected container: HTMLElement;
     protected wrapper: HTMLElement;
-    private scrollbar;
+    protected scrollbar: DomScrollableElement | undefined;
     private inputDisposable;
-    constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
     protected createEditor(parent: HTMLElement): void;
     setInput(input: EditorInput, editorOptions: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     layout(dimension: Dimension): void;
@@ -70,7 +70,7 @@ interface CustomViewOption {
     readonly id: string;
     name: string;
     order?: number;
-    renderBody(container: HTMLElement): IDisposable;
+    renderBody(container: HTMLElement, scrollbar: DomScrollableElement): IDisposable;
     location: ViewContainerLocation;
     icon?: string;
     canMoveView?: boolean;
@@ -99,4 +99,4 @@ declare function getPanelPosition(): Position;
 declare const onDidChangeSideBarPosition: Event<string>;
 declare function getSideBarPosition(): Position;
 
-export { type CustomViewOption, EditorInput, EditorInputCapabilities, EditorInputFactoryObject, EditorPane, IEditorCloseHandler, IEditorSerializer, Parts, RegisteredEditorInfo, RegisteredEditorOptions, SimpleEditorInput, SimpleEditorPane, ViewContainer, ViewContainerLocation, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };
+export { type CustomViewOption, DomScrollableElement, EditorInput, EditorInputCapabilities, EditorInputFactoryObject, InjectedEditorPane as EditorPane, IEditorCloseHandler, IEditorSerializer, Parts, RegisteredEditorInfo, RegisteredEditorOptions, SimpleEditorInput, SimpleEditorPane, ViewContainer, ViewContainerLocation, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/service-override/tools/views.js

@@ -1,4 +1,3 @@
-import { __decorate, __param } from '../../external/tslib/tslib.es6.js';
 import { SyncDescriptor } from '../../vscode/src/vs/platform/instantiation/common/descriptors.js';
 import { Extensions } from '../../vscode/src/vs/workbench/common/views.js';
 export { ViewContainerLocation } from '../../vscode/src/vs/workbench/common/views.js';
@@ -30,9 +29,14 @@ import { IWorkbenchLayoutService } from '../../vscode/src/vs/workbench/services/
 export { Parts } from '../../vscode/src/vs/workbench/services/layout/browser/layoutService.js';
 import { StandaloneServices } from '../../vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 import { withReadyServices } from '../../services.js';
-let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
-    constructor(id, telemetryService, themeService, storageService) {
-        super(id, telemetryService, themeService, storageService);
+class InjectedEditorPane extends EditorPane {
+    constructor(id) {
+        super(id, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
+    }
+}
+class SimpleEditorPane extends InjectedEditorPane {
+    constructor() {
+        super(...arguments);
         this.inputDisposable = this._register(new MutableDisposable());
     }
     createEditor(parent) {
@@ -72,12 +76,7 @@ let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
         this.inputDisposable.clear();
         super.clearInput();
     }
-};
-SimpleEditorPane = __decorate([
-    ( __param(1, ITelemetryService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService))
-], SimpleEditorPane);
+}
 class SimpleEditorInput extends EditorInput {
     constructor(resource, closeHandler) {
         super();
@@ -178,13 +177,13 @@ function registerCustomView(options) {
             ctorDescriptor: new SyncDescriptor(class extends ViewPane {
                 renderBody(container) {
                     super.renderBody(container);
+                    this.wrapper = document.createElement('div');
+                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
                     this.container = $('.view-pane-content');
                     this.container.style.display = 'flex';
                     this.container.style.alignItems = 'stretch';
-                    this._register(options.renderBody(this.container));
-                    this.wrapper = document.createElement('div');
+                    this._register(options.renderBody(this.container, this.scrollbar));
                     this.wrapper.append(this.container);
-                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
                     container.appendChild(this.scrollbar.getDomNode());
                     const observer = new ResizeObserver(() => {
                         assertIsDefined(this.scrollbar).scanDomNode();
@@ -273,4 +272,4 @@ const onDidChangeSideBarPosition = (listener) => {
 function getSideBarPosition() {
     return StandaloneServices.get(IWorkbenchLayoutService).getSideBarPosition();
 }
-export { EditorInput, EditorPane, SimpleEditorInput, SimpleEditorPane, ViewPaneContainer, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };
+export { DomScrollableElement, EditorInput, InjectedEditorPane as EditorPane, SimpleEditorInput, SimpleEditorPane, ViewPaneContainer, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/services.d.ts

@@ -16,12 +16,12 @@ export { IConfigurationChangeEvent, IConfigurationService } from './vscode/src/v
 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 { IAudioCueService } from './vscode/src/vs/platform/audioCues/browser/audioCueService.js';
+export { IAccessibilitySignalService } from './vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js';
 export { ILanguageFeaturesService } from './vscode/src/vs/editor/common/services/languageFeatures.js';
 export { ILogService, ILoggerService, LogLevel } from './vscode/src/vs/platform/log/common/log.js';
+export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/keybinding.js';
 export { IWorkspaceContextService } from './vscode/src/vs/platform/workspace/common/workspace.js';
 export { IClipboardService } from './vscode/src/vs/platform/clipboard/common/clipboardService.js';
 export { IEditorWorkerService } from './vscode/src/vs/editor/common/services/editorWorker.js';
@@ -42,6 +42,7 @@ export { IQuickInputService } from './vscode/src/vs/platform/quickinput/common/q
 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 { 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';

package/services.js

@@ -38,6 +38,7 @@ import './vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js';
 import './vscode/src/vs/editor/contrib/links/browser/links.js';
 import './vscode/src/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.js';
 import './vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js';
+import './vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.js';
 import './vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js';
 import './vscode/src/vs/editor/contrib/rename/browser/rename.js';
 import './vscode/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.js';
@@ -114,7 +115,7 @@ export { IContextKeyService } from './vscode/src/vs/platform/contextkey/common/c
 export { IThemeService } from './vscode/src/vs/platform/theme/common/themeService.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 { IAccessibilitySignalService } from './vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.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 } from './vscode/src/vs/workbench/common/views.js';
@@ -139,15 +140,16 @@ export { IStatusbarService } from './vscode/src/vs/workbench/services/statusbar/
 export { ITitleService } from './vscode/src/vs/workbench/services/title/browser/titleService.js';
 export { IBannerService } from './vscode/src/vs/workbench/services/banner/browser/bannerService.js';
 export { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from './vscode/src/vs/platform/workspace/common/workspaceTrust.js';
+export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/keybinding.js';
 export { IDialogService, IFileDialogService } from './vscode/src/vs/platform/dialogs/common/dialogs.js';
 async function initialize(overrides, container = document.body, configuration = {}, productConfiguration = {}) {
     checkServicesNotInitialized();
     initialize$1(container, configuration);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.86.2",
+            version: "1.87.0",
             quality: 'oss',
-            commit: "1.86.2",
+            commit: "1.87.0",
             nameShort: 'Code - OSS Dev',
             nameLong: 'Code - OSS Dev',
             applicationName: 'code-oss',

package/vscode/src/vs/base/browser/browser.js

@@ -1,6 +1,5 @@
-import { mainWindow, $window } from './window.js';
+import { mainWindow } from './window.js';
 import { Emitter } from '../common/event.js';
-import { markAsSingleton, Disposable } from '../common/lifecycle.js';
 class WindowManager {
     constructor() {
         this.mapWindowIdToZoomLevel = ( new Map());
@@ -44,78 +43,15 @@ class WindowManager {
         return targetWindow.vscodeWindowId;
     }
 }
-class DevicePixelRatioMonitor extends Disposable {
-    constructor() {
-        super();
-        this._onDidChange = this._register(( new Emitter()));
-        this.onDidChange = this._onDidChange.event;
-        this._listener = () => this._handleChange(true);
-        this._mediaQueryList = null;
-        this._handleChange(false);
-    }
-    _handleChange(fireEvent) {
-        this._mediaQueryList?.removeEventListener('change', this._listener);
-        this._mediaQueryList = $window.matchMedia(`(resolution: ${$window.devicePixelRatio}dppx)`);
-        this._mediaQueryList.addEventListener('change', this._listener);
-        if (fireEvent) {
-            this._onDidChange.fire();
-        }
-    }
-}
-class PixelRatioImpl extends Disposable {
-    get value() {
-        return this._value;
-    }
-    constructor() {
-        super();
-        this._onDidChange = this._register(( new Emitter()));
-        this.onDidChange = this._onDidChange.event;
-        this._value = this._getPixelRatio();
-        const dprMonitor = this._register(( new DevicePixelRatioMonitor()));
-        this._register(dprMonitor.onDidChange(() => {
-            this._value = this._getPixelRatio();
-            this._onDidChange.fire(this._value);
-        }));
-    }
-    _getPixelRatio() {
-        const ctx = document.createElement('canvas').getContext('2d');
-        const dpr = $window.devicePixelRatio || 1;
-        const bsr = ctx.webkitBackingStorePixelRatio ||
-            ctx.mozBackingStorePixelRatio ||
-            ctx.msBackingStorePixelRatio ||
-            ctx.oBackingStorePixelRatio ||
-            ctx.backingStorePixelRatio || 1;
-        return dpr / bsr;
-    }
-}
-class PixelRatioFacade {
-    constructor() {
-        this._pixelRatioMonitor = null;
-    }
-    _getOrCreatePixelRatioMonitor() {
-        if (!this._pixelRatioMonitor) {
-            this._pixelRatioMonitor = markAsSingleton(( new PixelRatioImpl()));
-        }
-        return this._pixelRatioMonitor;
-    }
-    get value() {
-        return this._getOrCreatePixelRatioMonitor().value;
-    }
-    get onDidChange() {
-        return this._getOrCreatePixelRatioMonitor().onDidChange;
-    }
-}
 function addMatchMediaChangeListener(targetWindow, query, callback) {
     if (typeof query === 'string') {
         query = targetWindow.matchMedia(query);
     }
     query.addEventListener('change', callback);
 }
-const PixelRatio = ( new PixelRatioFacade());
 function getZoomLevel(targetWindow) {
     return WindowManager.INSTANCE.getZoomLevel(targetWindow);
 }
-const onDidChangeZoomLevel = WindowManager.INSTANCE.onDidChangeZoomLevel;
 function getZoomFactor(targetWindow) {
     return WindowManager.INSTANCE.getZoomFactor(targetWindow);
 }
@@ -152,4 +88,4 @@ function isStandalone() {
 function isWCOEnabled() {
     return navigator?.windowControlsOverlay?.visible;
 }
-export { PixelRatio, addMatchMediaChangeListener, getZoomFactor, getZoomLevel, isAndroid, isChrome, isFirefox, isFullscreen, isSafari, isStandalone, isWCOEnabled, isWebKit, isWebkitWebView, onDidChangeFullscreen, onDidChangeZoomLevel, setFullscreen };
+export { addMatchMediaChangeListener, getZoomFactor, getZoomLevel, isAndroid, isChrome, isFirefox, isFullscreen, isSafari, isStandalone, isWCOEnabled, isWebKit, isWebkitWebView, onDidChangeFullscreen, setFullscreen };