@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/services/progress/browser/media/progressService.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".monaco-workbench .progress-badge>.badge-content:before{background-color:currentColor;background-repeat:no-repeat;bottom:0;content:\"\";height:14px;left:0;margin:auto;mask:url(\"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0Ij48cGF0aCBmaWxsPSIjZmZmIiBkPSJNOSAxNmMtMy44NiAwLTctMy4xNC03LTdzMy4xNC03IDctN2MzLjg1OSAwIDcgMy4xNDEgNyA3cy0zLjE0MSA3LTcgN3pNOSAzLjRDNS45MTIgMy40IDMuNCA1LjkxMyAzLjQgOXMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNlMxMi4wODggMy40IDkgMy40em0zLjg2IDcuMUw5LjcgOC42MDRWNC44SDguM3Y0LjU5NmwzLjg0IDIuMzA1LjcyLTEuMjAxeiIvPjwvc3ZnPg==\") no-repeat;-webkit-mask:url(\"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0Ij48cGF0aCBmaWxsPSIjZmZmIiBkPSJNOSAxNmMtMy44NiAwLTctMy4xNC03LTdzMy4xNC03IDctN2MzLjg1OSAwIDcgMy4xNDEgNyA3cy0zLjE0MSA3LTcgN3pNOSAzLjRDNS45MTIgMy40IDMuNCA1LjkxMyAzLjQgOXMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNlMxMi4wODggMy40IDkgMy40em0zLjg2IDcuMUw5LjcgOC42MDRWNC44SDguM3Y0LjU5NmwzLjg0IDIuMzA1LjcyLTEuMjAxeiIvPjwvc3ZnPg==\") no-repeat;position:absolute;right:0;top:0;width:14px}";
 n(css,{});

package/vscode/src/vs/workbench/services/progress/browser/progressService.d.ts

@@ -0,0 +1,36 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IProgressOptions, IProgressStep, IProgress } from "vscode/vscode/vs/platform/progress/common/progress";
+import { IProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+import { IStatusbarService } from "vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
+import { IActivityService } from "vscode/vscode/vs/workbench/services/activity/common/activity.service";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { ILayoutService } from "vscode/vscode/vs/platform/layout/browser/layoutService.service";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IViewsService } from "vscode/vscode/vs/workbench/services/views/common/viewsService.service";
+import { IPaneCompositePartService } from "vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
+import { IUserActivityService } from "vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service";
+export declare class ProgressService extends Disposable implements IProgressService {
+    private readonly activityService;
+    private readonly paneCompositeService;
+    private readonly viewDescriptorService;
+    private readonly viewsService;
+    private readonly notificationService;
+    private readonly statusbarService;
+    private readonly layoutService;
+    private readonly keybindingService;
+    private readonly userActivityService;
+    readonly _serviceBrand: undefined;
+    constructor(activityService: IActivityService, paneCompositeService: IPaneCompositePartService, viewDescriptorService: IViewDescriptorService, viewsService: IViewsService, notificationService: INotificationService, statusbarService: IStatusbarService, layoutService: ILayoutService, keybindingService: IKeybindingService, userActivityService: IUserActivityService);
+    withProgress<R = unknown>(options: IProgressOptions, originalTask: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: (choice?: number) => void): Promise<R>;
+    private readonly windowProgressStack;
+    private windowProgressStatusEntry;
+    private withWindowProgress;
+    private updateWindowProgress;
+    private withNotificationProgress;
+    private withPaneCompositeProgress;
+    private withViewProgress;
+    private showOnActivityBar;
+    private withCompositeProgress;
+    private withDialogProgress;
+}

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -1,29 +1,34 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import './media/progressService.css.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable, toDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { ProgressLocation, Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { timeout, DeferredPromise, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
-import { ProgressBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
+import { ProgressBadge } from '@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { NotificationPriority, NotificationsFilter, isNotificationSource } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
-import { Dialog } from 'vscode/vscode/vs/base/browser/ui/dialog/dialog';
+import { Dialog } from '@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common/vscode/vs/base/browser/ui/dialog/dialog';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { EventHelper } from 'vscode/vscode/vs/base/browser/dom';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
 import { IUserActivityService } from 'vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 
 let ProgressService = class ProgressService extends Disposable {
     constructor(activityService, paneCompositeService, viewDescriptorService, viewsService, notificationService, statusbarService, layoutService, keybindingService, userActivityService) {
@@ -62,13 +67,13 @@ let ProgressService = class ProgressService extends Disposable {
             if (this.viewDescriptorService.getViewDescriptorById(location) !== null) {
                 return this.withViewProgress(location, task, { ...options, location });
             }
-            throw ( (new Error(`Bad progress location: ${location}`)));
+            throw ( new Error(`Bad progress location: ${location}`));
         };
         if (typeof location === 'string') {
             return handleStringLocation(location);
         }
         switch (location) {
-            case 15 : {
+            case ProgressLocation.Notification: {
                 let priority = options.priority;
                 if (priority !== NotificationPriority.URGENT) {
                     if (this.notificationService.getFilter() === NotificationsFilter.ERROR) {
@@ -80,27 +85,27 @@ let ProgressService = class ProgressService extends Disposable {
                 }
                 return this.withNotificationProgress({ ...options, location, priority }, task, onDidCancel);
             }
-            case 10 : {
+            case ProgressLocation.Window: {
                 const type = options.type;
                 if (options.command) {
                     return this.withWindowProgress({ ...options, location, type }, task);
                 }
-                return this.withNotificationProgress({ delay: 150 , ...options, priority: NotificationPriority.SILENT, location: 15 , type }, task, onDidCancel);
+                return this.withNotificationProgress({ delay: 150 , ...options, priority: NotificationPriority.SILENT, location: ProgressLocation.Notification, type }, task, onDidCancel);
             }
-            case 1 :
-                return this.withPaneCompositeProgress('workbench.view.explorer', 0 , task, { ...options, location });
-            case 3 :
+            case ProgressLocation.Explorer:
+                return this.withPaneCompositeProgress('workbench.view.explorer', ViewContainerLocation.Sidebar, task, { ...options, location });
+            case ProgressLocation.Scm:
                 return handleStringLocation('workbench.scm');
-            case 5 :
-                return this.withPaneCompositeProgress('workbench.view.extensions', 0 , task, { ...options, location });
-            case 20 :
+            case ProgressLocation.Extensions:
+                return this.withPaneCompositeProgress('workbench.view.extensions', ViewContainerLocation.Sidebar, task, { ...options, location });
+            case ProgressLocation.Dialog:
                 return this.withDialogProgress(options, task, onDidCancel);
             default:
-                throw ( (new Error(`Bad progress location: ${location}`)));
+                throw ( new Error(`Bad progress location: ${location}`));
         }
     }
     withWindowProgress(options, callback) {
-        const task = [options, ( (new Progress(() => this.updateWindowProgress())))];
+        const task = [options, ( new Progress(() => this.updateWindowProgress()))];
         const promise = callback(task[1]);
         let delayHandle = setTimeout(() => {
             delayHandle = undefined;
@@ -127,23 +132,23 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localize(4210, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(4211, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(11708, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(11709, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             }
             else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(4212, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(11710, "[{0}]: {1}", source, progressTitle)) : text;
             }
             else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(4212, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(11710, "[{0}]: {1}", source, progressMessage)) : text;
             }
             else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(4213, "Progress Message")),
+                name: ( localize(11711, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -154,7 +159,7 @@ let ProgressService = class ProgressService extends Disposable {
                 this.windowProgressStatusEntry.update(statusEntryProperties);
             }
             else {
-                this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', 0 );
+                this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', StatusbarAlignment.LEFT);
             }
         }
         else {
@@ -168,9 +173,9 @@ let ProgressService = class ProgressService extends Disposable {
             get done() { return this._done; }
             constructor() {
                 super();
-                this._onDidReport = this._register(( (new Emitter())));
+                this._onDidReport = this._register(( new Emitter()));
                 this.onDidReport = this._onDidReport.event;
-                this._onWillDispose = this._register(( (new Emitter())));
+                this._onWillDispose = this._register(( new Emitter()));
                 this.onWillDispose = this._onWillDispose.event;
                 this._step = undefined;
                 this._done = false;
@@ -194,17 +199,17 @@ let ProgressService = class ProgressService extends Disposable {
             }
         });
         const createWindowProgress = () => {
-            const promise = ( (new DeferredPromise()));
+            const promise = ( new DeferredPromise());
             this.withWindowProgress({
-                location: 10 ,
-                title: options.title ? ( (parseLinkedText(options.title).toString())) : undefined,
+                location: ProgressLocation.Window,
+                title: options.title ? ( parseLinkedText(options.title).toString()) : undefined,
                 command: 'notifications.showList',
                 type: options.type
             }, progress => {
                 function reportProgress(step) {
                     if (step.message) {
                         progress.report({
-                            message: ( (parseLinkedText(step.message).toString()))
+                            message: ( parseLinkedText(step.message).toString())
                         });
                     }
                 }
@@ -219,7 +224,7 @@ let ProgressService = class ProgressService extends Disposable {
             return toDisposable(() => promise.complete());
         };
         const createNotification = (message, priority, increment) => {
-            const notificationDisposables = ( (new DisposableStore()));
+            const notificationDisposables = ( new DisposableStore());
             const primaryActions = options.primaryActions ? Array.from(options.primaryActions) : [];
             const secondaryActions = options.secondaryActions ? Array.from(options.secondaryActions) : [];
             if (options.buttons) {
@@ -239,7 +244,7 @@ let ProgressService = class ProgressService extends Disposable {
             if (options.cancellable) {
                 const cancelAction = new (class extends Action {
                     constructor() {
-                        super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(4214, "Cancel")), undefined, true);
+                        super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(11712, "Cancel")), undefined, true);
                     }
                     async run() {
                         progressStateModel.cancel();
@@ -249,7 +254,7 @@ let ProgressService = class ProgressService extends Disposable {
                 primaryActions.push(cancelAction);
             }
             const notification = this.notificationService.notify({
-                severity: Severity$1.Info,
+                severity: Severity.Info,
                 message: stripIcons(message),
                 source: options.source,
                 actions: { primary: primaryActions, secondary: secondaryActions },
@@ -330,7 +335,7 @@ let ProgressService = class ProgressService extends Disposable {
     withPaneCompositeProgress(paneCompositeId, viewContainerLocation, task, options) {
         const progressIndicator = this.paneCompositeService.getProgressIndicator(paneCompositeId, viewContainerLocation);
         const promise = progressIndicator ? this.withCompositeProgress(progressIndicator, task, options) : task({ report: () => { } });
-        if (viewContainerLocation === 0 ) {
+        if (viewContainerLocation === ViewContainerLocation.Sidebar) {
             this.showOnActivityBar(paneCompositeId, options, promise);
         }
         return promise;
@@ -339,7 +344,7 @@ let ProgressService = class ProgressService extends Disposable {
         const progressIndicator = this.viewsService.getViewProgressIndicator(viewId);
         const promise = progressIndicator ? this.withCompositeProgress(progressIndicator, task, options) : task({ report: () => { } });
         const location = this.viewDescriptorService.getViewLocationById(viewId);
-        if (location !== 0 ) {
+        if (location !== ViewContainerLocation.Sidebar) {
             return promise;
         }
         const viewletId = this.viewDescriptorService.getViewContainerByViewId(viewId)?.id;
@@ -353,7 +358,7 @@ let ProgressService = class ProgressService extends Disposable {
         let activityProgress;
         let delayHandle = setTimeout(() => {
             delayHandle = undefined;
-            const handle = this.activityService.showViewContainerActivity(viewletId, { badge: ( (new ProgressBadge(() => ''))), priority: 100 });
+            const handle = this.activityService.showViewContainerActivity(viewletId, { badge: ( new ProgressBadge(() => '')), priority: 100 });
             const startTimeVisible = Date.now();
             const minTimeVisible = 300;
             activityProgress = {
@@ -411,7 +416,7 @@ let ProgressService = class ProgressService extends Disposable {
         return promise;
     }
     withDialogProgress(options, task, onDidCancel) {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const allowableCommands = [
             'workbench.action.quit',
             'workbench.action.reloadWindow',
@@ -425,10 +430,10 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(options.cancellable
-                    ? (typeof options.cancellable === 'boolean' ? ( localize(4214, "Cancel")) : options.cancellable)
-                    : ( localize(4215, "Dismiss")));
+                    ? (typeof options.cancellable === 'boolean' ? ( localize(11712, "Cancel")) : options.cancellable)
+                    : ( localize(11713, "Dismiss")));
             }
-            dialog = ( (new Dialog(this.layoutService.activeContainer, message, buttons, {
+            dialog = ( new Dialog(this.layoutService.activeContainer, message, buttons, {
                 type: 'pending',
                 detail: options.detail,
                 cancelId: buttons.length - 1,
@@ -436,7 +441,7 @@ let ProgressService = class ProgressService extends Disposable {
                 disableDefaultAction: options.sticky,
                 keyEventProcessor: (event) => {
                     const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-                    if (resolved.kind === 2  && resolved.commandId) {
+                    if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
                         if (!allowableCommands.includes(resolved.commandId)) {
                             EventHelper.stop(event, true);
                         }
@@ -446,7 +451,7 @@ let ProgressService = class ProgressService extends Disposable {
                 checkboxStyles: defaultCheckboxStyles,
                 inputBoxStyles: defaultInputBoxStyles,
                 dialogStyles: defaultDialogStyles
-            })));
+            }));
             disposables.add(dialog);
             dialog.show().then(dialogResult => {
                 onDidCancel?.(dialogResult.button);
@@ -456,7 +461,7 @@ let ProgressService = class ProgressService extends Disposable {
         };
         let delay = options.delay ?? 0;
         let latestMessage = undefined;
-        const scheduler = disposables.add(( (new RunOnceScheduler(() => {
+        const scheduler = disposables.add(( new RunOnceScheduler(() => {
             delay = 0;
             if (latestMessage && !dialog) {
                 dialog = createDialog(latestMessage);
@@ -464,7 +469,7 @@ let ProgressService = class ProgressService extends Disposable {
             else if (latestMessage) {
                 dialog.updateMessage(latestMessage);
             }
-        }, 0))));
+        }, 0)));
         const updateDialog = function (message) {
             latestMessage = message;
             if (!scheduler.isScheduled()) {
@@ -485,16 +490,16 @@ let ProgressService = class ProgressService extends Disposable {
         return promise;
     }
 };
-ProgressService = ( (__decorate([
-    ( (__param(0, IActivityService))),
-    ( (__param(1, IPaneCompositePartService))),
-    ( (__param(2, IViewDescriptorService))),
-    ( (__param(3, IViewsService))),
-    ( (__param(4, INotificationService))),
-    ( (__param(5, IStatusbarService))),
-    ( (__param(6, ILayoutService))),
-    ( (__param(7, IKeybindingService))),
-    ( (__param(8, IUserActivityService)))
-], ProgressService)));
+ProgressService = ( __decorate([
+    ( __param(0, IActivityService)),
+    ( __param(1, IPaneCompositePartService)),
+    ( __param(2, IViewDescriptorService)),
+    ( __param(3, IViewsService)),
+    ( __param(4, INotificationService)),
+    ( __param(5, IStatusbarService)),
+    ( __param(6, ILayoutService)),
+    ( __param(7, IKeybindingService)),
+    ( __param(8, IUserActivityService))
+], ProgressService));
 
 export { ProgressService };

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.d.ts

@@ -0,0 +1,34 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IEditorSerializer } from "vscode/vscode/vs/workbench/common/editor";
+import { EditorInput } from "vscode/vscode/vs/workbench/common/editor/editorInput";
+import { ITextEditorService } from "vscode/vscode/vs/workbench/services/textfile/common/textEditorService.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IFilesConfigurationService } from "vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
+import { IPathService } from "vscode/vscode/vs/workbench/services/path/common/pathService.service";
+import { UntitledTextEditorInput } from "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IWorkingCopyIdentifier } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyEditorHandler } from "@codingame/monaco-vscode-working-copy-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService";
+import { IWorkingCopyEditorService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service";
+import { IUntitledTextEditorService } from "vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service";
+export declare class UntitledTextEditorInputSerializer implements IEditorSerializer {
+    private readonly filesConfigurationService;
+    private readonly environmentService;
+    private readonly pathService;
+    constructor(filesConfigurationService: IFilesConfigurationService, environmentService: IWorkbenchEnvironmentService, pathService: IPathService);
+    canSerialize(editorInput: EditorInput): boolean;
+    serialize(editorInput: EditorInput): string | undefined;
+    deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledTextEditorInput;
+}
+export declare class UntitledTextEditorWorkingCopyEditorHandler extends Disposable implements IWorkbenchContribution, IWorkingCopyEditorHandler {
+    private readonly environmentService;
+    private readonly pathService;
+    private readonly textEditorService;
+    private readonly untitledTextEditorService;
+    static readonly ID = "workbench.contrib.untitledTextEditorWorkingCopyEditorHandler";
+    constructor(workingCopyEditorService: IWorkingCopyEditorService, environmentService: IWorkbenchEnvironmentService, pathService: IPathService, textEditorService: ITextEditorService, untitledTextEditorService: IUntitledTextEditorService);
+    handles(workingCopy: IWorkingCopyIdentifier): boolean;
+    isOpen(workingCopy: IWorkingCopyIdentifier, editor: EditorInput): boolean;
+    createEditor(workingCopy: IWorkingCopyIdentifier): EditorInput;
+}

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -8,8 +9,8 @@ import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
-import { UntitledTextEditorInput } from 'vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { NO_TYPE_ID } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { UntitledTextEditorInput } from '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { NO_TYPE_ID } from '@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
 import { IUntitledTextEditorService } from 'vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service';
 

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.d.ts

@@ -0,0 +1,71 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { UntitledTextEditorModel, IUntitledTextEditorModel } from "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorModel";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IUntitledTextEditorService } from "vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service";
+export interface INewUntitledTextEditorOptions {
+    initialValue?: string;
+    languageId?: string;
+    encoding?: string;
+}
+export interface IExistingUntitledTextEditorOptions extends INewUntitledTextEditorOptions {
+    untitledResource?: URI;
+}
+export interface INewUntitledTextEditorWithAssociatedResourceOptions extends INewUntitledTextEditorOptions {
+    associatedResource?: {
+        authority: string;
+        path: string;
+        query: string;
+        fragment: string;
+    };
+}
+type IInternalUntitledTextEditorOptions = IExistingUntitledTextEditorOptions & INewUntitledTextEditorWithAssociatedResourceOptions;
+export interface IUntitledTextEditorModelManager {
+    readonly onDidChangeDirty: Event<IUntitledTextEditorModel>;
+    readonly onDidChangeEncoding: Event<IUntitledTextEditorModel>;
+    readonly onDidChangeLabel: Event<IUntitledTextEditorModel>;
+    readonly onDidCreate: Event<IUntitledTextEditorModel>;
+    readonly onWillDispose: Event<IUntitledTextEditorModel>;
+    create(options?: INewUntitledTextEditorOptions): IUntitledTextEditorModel;
+    create(options?: INewUntitledTextEditorWithAssociatedResourceOptions): IUntitledTextEditorModel;
+    create(options?: IExistingUntitledTextEditorOptions): IUntitledTextEditorModel;
+    get(resource: URI): IUntitledTextEditorModel | undefined;
+    getValue(resource: URI): string | undefined;
+    resolve(options?: INewUntitledTextEditorOptions): Promise<IUntitledTextEditorModel>;
+    resolve(options?: INewUntitledTextEditorWithAssociatedResourceOptions): Promise<IUntitledTextEditorModel>;
+    resolve(options?: IExistingUntitledTextEditorOptions): Promise<IUntitledTextEditorModel>;
+    isUntitledWithAssociatedResource(resource: URI): boolean;
+    canDispose(model: IUntitledTextEditorModel): true | Promise<true>;
+}
+export declare class UntitledTextEditorService extends Disposable implements IUntitledTextEditorService {
+    private readonly instantiationService;
+    private readonly configurationService;
+    readonly _serviceBrand: undefined;
+    private static readonly UNTITLED_WITHOUT_ASSOCIATED_RESOURCE_REGEX;
+    private readonly _onDidChangeDirty;
+    readonly onDidChangeDirty: Event<IUntitledTextEditorModel>;
+    private readonly _onDidChangeEncoding;
+    readonly onDidChangeEncoding: Event<IUntitledTextEditorModel>;
+    private readonly _onDidCreate;
+    readonly onDidCreate: Event<IUntitledTextEditorModel>;
+    private readonly _onWillDispose;
+    readonly onWillDispose: Event<IUntitledTextEditorModel>;
+    private readonly _onDidChangeLabel;
+    readonly onDidChangeLabel: Event<IUntitledTextEditorModel>;
+    private readonly mapResourceToModel;
+    constructor(instantiationService: IInstantiationService, configurationService: IConfigurationService);
+    get(resource: URI): UntitledTextEditorModel | undefined;
+    getValue(resource: URI): string | undefined;
+    resolve(options?: IInternalUntitledTextEditorOptions): Promise<UntitledTextEditorModel>;
+    create(options?: IInternalUntitledTextEditorOptions): UntitledTextEditorModel;
+    private doCreateOrGet;
+    private massageOptions;
+    private doCreate;
+    private registerModel;
+    isUntitledWithAssociatedResource(resource: URI): boolean;
+    canDispose(model: UntitledTextEditorModel): true | Promise<true>;
+    private doCanDispose;
+}
+export {};

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js

@@ -1,12 +1,14 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { UntitledTextEditorModel } from 'vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorModel';
+import { UntitledTextEditorModel } from '@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorModel';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 var UntitledTextEditorService_1;
 let UntitledTextEditorService = class UntitledTextEditorService extends Disposable {

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.d.ts

@@ -0,0 +1,122 @@
+import { ViewContainerLocation, ViewContainer, IViewDescriptor, ViewVisibilityState } from "vscode/vscode/vs/workbench/common/views";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ViewContainerModel } from "../common/viewContainerModel.js";
+import { ILoggerService } from "vscode/vscode/vs/platform/log/common/log.service";
+export declare class ViewDescriptorService extends Disposable implements IViewDescriptorService {
+    private readonly instantiationService;
+    private readonly contextKeyService;
+    private readonly storageService;
+    private readonly extensionService;
+    private readonly telemetryService;
+    readonly _serviceBrand: undefined;
+    private static readonly VIEWS_CUSTOMIZATIONS;
+    private static readonly COMMON_CONTAINER_ID_PREFIX;
+    private readonly _onDidChangeContainer;
+    readonly onDidChangeContainer: Event<{
+        views: IViewDescriptor[];
+        from: ViewContainer;
+        to: ViewContainer;
+    }>;
+    private readonly _onDidChangeLocation;
+    readonly onDidChangeLocation: Event<{
+        views: IViewDescriptor[];
+        from: ViewContainerLocation;
+        to: ViewContainerLocation;
+    }>;
+    private readonly _onDidChangeContainerLocation;
+    readonly onDidChangeContainerLocation: Event<{
+        viewContainer: ViewContainer;
+        from: ViewContainerLocation;
+        to: ViewContainerLocation;
+    }>;
+    private readonly viewContainerModels;
+    private readonly viewsVisibilityActionDisposables;
+    private canRegisterViewsVisibilityActions;
+    private readonly activeViewContextKeys;
+    private readonly movableViewContextKeys;
+    private readonly defaultViewLocationContextKeys;
+    private readonly defaultViewContainerLocationContextKeys;
+    private readonly viewsRegistry;
+    private readonly viewContainersRegistry;
+    private viewContainersCustomLocations;
+    private viewDescriptorsCustomLocations;
+    private viewContainerBadgeEnablementStates;
+    private readonly _onDidChangeViewContainers;
+    readonly onDidChangeViewContainers: Event<{
+        added: ReadonlyArray<{
+            container: ViewContainer;
+            location: ViewContainerLocation;
+        }>;
+        removed: ReadonlyArray<{
+            container: ViewContainer;
+            location: ViewContainerLocation;
+        }>;
+    }>;
+    get viewContainers(): ReadonlyArray<ViewContainer>;
+    private readonly logger;
+    constructor(instantiationService: IInstantiationService, contextKeyService: IContextKeyService, storageService: IStorageService, extensionService: IExtensionService, telemetryService: ITelemetryService, loggerService: ILoggerService);
+    private migrateToViewsCustomizationsStorage;
+    private registerGroupedViews;
+    private deregisterGroupedViews;
+    private moveOrphanViewsToDefaultLocation;
+    whenExtensionsRegistered(): void;
+    private onDidRegisterViews;
+    private isGeneratedContainerId;
+    private onDidDeregisterViews;
+    private regroupViews;
+    getViewDescriptorById(viewId: string): IViewDescriptor | null;
+    getViewLocationById(viewId: string): ViewContainerLocation | null;
+    getViewContainerByViewId(viewId: string): ViewContainer | null;
+    getViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
+    getDefaultViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
+    getDefaultContainerById(viewId: string): ViewContainer | null;
+    getViewContainerModel(container: ViewContainer): ViewContainerModel;
+    getViewContainerById(id: string): ViewContainer | null;
+    getViewContainersByLocation(location: ViewContainerLocation): ViewContainer[];
+    getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined;
+    moveViewContainerToLocation(viewContainer: ViewContainer, location: ViewContainerLocation, requestedIndex?: number, reason?: string): void;
+    getViewContainerBadgeEnablementState(id: string): boolean;
+    setViewContainerBadgeEnablementState(id: string, badgesEnabled: boolean): void;
+    moveViewToLocation(view: IViewDescriptor, location: ViewContainerLocation, reason?: string): void;
+    moveViewsToContainer(views: IViewDescriptor[], viewContainer: ViewContainer, visibilityState?: ViewVisibilityState, reason?: string): void;
+    reset(): void;
+    isViewContainerRemovedPermanently(viewContainerId: string): boolean;
+    private onDidChangeDefaultContainer;
+    private reportMovedViews;
+    private moveViewsWithoutSaving;
+    private moveViewContainerToLocationWithoutSaving;
+    private cleanUpGeneratedViewContainer;
+    private registerGeneratedViewContainer;
+    private onDidStorageChange;
+    private onDidViewCustomizationsStorageChange;
+    private generateContainerId;
+    private saveViewCustomizations;
+    private _viewCustomizations;
+    private get viewCustomizations();
+    private set viewCustomizations(value);
+    private getStoredViewCustomizationsValue;
+    private setStoredViewCustomizationsValue;
+    private getViewsByContainer;
+    private onDidRegisterViewContainer;
+    private getOrRegisterViewContainerModel;
+    private onDidDeregisterViewContainer;
+    private onDidChangeActiveViews;
+    private onDidChangeVisibleViews;
+    private registerViewsVisibilityActions;
+    private registerViewsVisibilityActionsForContainer;
+    private registerResetViewContainerAction;
+    private addViews;
+    private removeViews;
+    private getOrCreateActiveViewContextKey;
+    private getOrCreateVisibleViewContextKey;
+    private getOrCreateMovableViewContextKey;
+    private getOrCreateDefaultViewLocationContextKey;
+    private getOrCreateDefaultViewContainerLocationContextKey;
+}