@codingame/monaco-vscode-view-common-service-override 4.5.2 → 5.0.1

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js

@@ -1,10 +1,11 @@
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import { DocumentLineRangeMap } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ReentrancyBarrier } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { ReentrancyBarrier } from 'vscode/vscode/vs/base/common/controlFlow';
 
 class ScrollSynchronizer extends Disposable {
     get model() { return this.viewModel.get()?.model; }
@@ -42,7 +43,7 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
         };
-        this._store.add(this.input1View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+        this._store.add(this.input1View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (c.scrollTopChanged) {
                 handleInput1OnScroll();
             }
@@ -52,7 +53,7 @@ class ScrollSynchronizer extends Disposable {
                 this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
             }
         })));
-        this._store.add(this.input2View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+        this._store.add(this.input2View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (!this.model) {
                 return;
             }
@@ -82,7 +83,7 @@ class ScrollSynchronizer extends Disposable {
                 this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
             }
         })));
-        this._store.add(this.inputResultView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+        this._store.add(this.inputResultView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (c.scrollTopChanged) {
                 if (this.shouldAlignResult) {
                     this.input1View.editor.setScrollTop(c.scrollTop, 1 );
@@ -109,7 +110,7 @@ class ScrollSynchronizer extends Disposable {
         this._store.add(autorunWithStore((reader, store) => {
             const baseView = this.baseView.read(reader);
             if (baseView) {
-                store.add(baseView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+                store.add(baseView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
                     if (c.scrollTopChanged) {
                         if (!this.model) {
                             return;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js

@@ -6,6 +6,7 @@ import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived
 import 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import { derivedObservableWithWritableCache } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';

package/vscode/src/vs/workbench/contrib/webview/browser/webviewFindWidget.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { SimpleFindWidget } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
@@ -9,12 +10,12 @@ let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {
     async _getResultCount(dataChanged) {
         return undefined;
     }
-    constructor(_delegate, contextViewService, contextKeyService, keybindingService) {
+    constructor(_delegate, contextViewService, contextKeyService, hoverService, keybindingService) {
         super({
             showCommonFindToggles: false,
             checkImeCompletionState: _delegate.checkImeCompletionState,
             enableSash: true,
-        }, contextViewService, contextKeyService, keybindingService);
+        }, contextViewService, contextKeyService, hoverService, keybindingService);
         this._delegate = _delegate;
         this._findWidgetFocused = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
         this._register(_delegate.hasFindResult(hasResult => {
@@ -59,7 +60,8 @@ let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {
 WebviewFindWidget = ( __decorate([
     ( __param(1, IContextViewService)),
     ( __param(2, IContextKeyService)),
-    ( __param(3, IKeybindingService))
+    ( __param(3, IHoverService)),
+    ( __param(4, IKeybindingService))
 ], WebviewFindWidget));
 
 export { WebviewFindWidget };

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js

@@ -25,6 +25,7 @@ import { IWebviewViewService } from 'vscode/vscode/vs/workbench/contrib/webviewV
 import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var WebviewViewPane_1;
 const storageKeys = {
@@ -36,8 +37,8 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         this._originStore ??= ( new ExtensionKeyedWebviewOriginStore('webviewViews.origins', storageService));
         return this._originStore;
     }
-    constructor(options, configurationService, contextKeyService, contextMenuService, instantiationService, keybindingService, openerService, telemetryService, themeService, viewDescriptorService, activityService, extensionService, progressService, storageService, viewService, webviewService, webviewViewService) {
-        super({ ...options, titleMenuId: MenuId.ViewTitle, showActions: ViewPaneShowActions.WhenExpanded }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, configurationService, contextKeyService, contextMenuService, instantiationService, keybindingService, openerService, telemetryService, hoverService, themeService, viewDescriptorService, activityService, extensionService, progressService, storageService, viewService, webviewService, webviewViewService) {
+        super({ ...options, titleMenuId: MenuId.ViewTitle, showActions: ViewPaneShowActions.WhenExpanded }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.activityService = activityService;
         this.extensionService = extensionService;
         this.progressService = progressService;
@@ -220,15 +221,16 @@ WebviewViewPane = WebviewViewPane_1 = ( __decorate([
     ( __param(5, IKeybindingService)),
     ( __param(6, IOpenerService)),
     ( __param(7, ITelemetryService)),
-    ( __param(8, IThemeService)),
-    ( __param(9, IViewDescriptorService)),
-    ( __param(10, IActivityService)),
-    ( __param(11, IExtensionService)),
-    ( __param(12, IProgressService)),
-    ( __param(13, IStorageService)),
-    ( __param(14, IViewsService)),
-    ( __param(15, IWebviewService)),
-    ( __param(16, IWebviewViewService))
+    ( __param(8, IHoverService)),
+    ( __param(9, IThemeService)),
+    ( __param(10, IViewDescriptorService)),
+    ( __param(11, IActivityService)),
+    ( __param(12, IExtensionService)),
+    ( __param(13, IProgressService)),
+    ( __param(14, IStorageService)),
+    ( __param(15, IViewsService)),
+    ( __param(16, IWebviewService)),
+    ( __param(17, IWebviewViewService))
 ], WebviewViewPane));
 
 export { WebviewViewPane };

package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js

@@ -17,10 +17,18 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { Barrier } from 'vscode/vscode/vs/base/common/async';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
+import { getZoomLevel } from 'vscode/vscode/vs/base/browser/browser';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 var BrowserAuxiliaryWindowService_1;
 const _moduleId = "vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService";
+var AuxiliaryWindowMode;
+( ((function(AuxiliaryWindowMode) {
+    AuxiliaryWindowMode[AuxiliaryWindowMode["Maximized"] = 0] = "Maximized";
+    AuxiliaryWindowMode[AuxiliaryWindowMode["Normal"] = 1] = "Normal";
+    AuxiliaryWindowMode[AuxiliaryWindowMode["Fullscreen"] = 2] = "Fullscreen";
+})(AuxiliaryWindowMode || (AuxiliaryWindowMode = {}))));
 let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
     constructor(window, container, stylesHaveLoaded, configurationService, hostService, environmentService) {
         super(window, undefined, hostService, environmentService);
@@ -100,6 +108,17 @@ let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
         this._onWillLayout.fire(dimension);
         this._onDidLayout.fire(dimension);
     }
+    createState() {
+        return {
+            bounds: {
+                x: this.window.screenX,
+                y: this.window.screenY,
+                width: this.window.outerWidth,
+                height: this.window.outerHeight
+            },
+            zoomLevel: getZoomLevel(this.window)
+        };
+    }
     dispose() {
         if (this._store.isDisposed) {
             return;
@@ -184,14 +203,23 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
             width,
             height
         };
-        if (newWindowBounds.x === activeWindowBounds.x && newWindowBounds.y === activeWindowBounds.y) {
+        if (!options?.bounds && newWindowBounds.x === activeWindowBounds.x && newWindowBounds.y === activeWindowBounds.y) {
             newWindowBounds = {
                 ...newWindowBounds,
                 x: newWindowBounds.x + 30,
                 y: newWindowBounds.y + 30
             };
         }
-        const auxiliaryWindow = mainWindow.open('about:blank', undefined, `popup=yes,left=${newWindowBounds.x},top=${newWindowBounds.y},width=${newWindowBounds.width},height=${newWindowBounds.height}`);
+        const features = coalesce([
+            'popup=yes',
+            `left=${newWindowBounds.x}`,
+            `top=${newWindowBounds.y}`,
+            `width=${newWindowBounds.width}`,
+            `height=${newWindowBounds.height}`,
+            options?.mode === AuxiliaryWindowMode.Maximized ? 'window-maximized=yes' : undefined,
+            options?.mode === AuxiliaryWindowMode.Fullscreen ? 'window-fullscreen=yes' : undefined
+        ]);
+        const auxiliaryWindow = mainWindow.open('about:blank', undefined, features.join(','));
         if (!auxiliaryWindow && isWeb) {
             return (await this.dialogService.prompt({
                 type: Severity$1.Warning,
@@ -327,6 +355,9 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
         mark('code/auxiliaryWindow/didApplyHTML');
         return container;
     }
+    getWindow(windowId) {
+        return this.windows.get(windowId);
+    }
 };
 BrowserAuxiliaryWindowService = BrowserAuxiliaryWindowService_1 = ( (__decorate([
     ( (__param(0, IWorkbenchLayoutService))),
@@ -337,4 +368,4 @@ BrowserAuxiliaryWindowService = BrowserAuxiliaryWindowService_1 = ( (__decorate(
     ( (__param(5, IWorkbenchEnvironmentService)))
 ], BrowserAuxiliaryWindowService)));
 
-export { AuxiliaryWindow, BrowserAuxiliaryWindowService };
+export { AuxiliaryWindow, AuxiliaryWindowMode, BrowserAuxiliaryWindowService };

package/vscode/src/vs/workbench/services/driver/browser/driver.js

@@ -137,7 +137,7 @@ let BrowserWindowDriver = class BrowserWindowDriver {
         if (!xterm) {
             throw ( new Error(`Xterm not found: ${selector}`));
         }
-        xterm._core.coreService.triggerDataEvent(text);
+        xterm.input(text);
     }
     getLocaleInfo() {
         return Promise.resolve({