@codingame/monaco-vscode-views-service-override 1.83.7 → 1.83.8

package/index.d.ts

@@ -1,4 +1,4 @@
-export { CustomViewOption, SimpleEditorInput, SimpleEditorPane, attachPart, default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } from './views.js';
+export { CustomViewOption, SimpleEditorInput, SimpleEditorPane, attachPart, default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } from './views.js';
 export { SidebarPart } from './vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js';
 export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
@@ -11,7 +11,7 @@ export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs'
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
-export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
+export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 export { EditorPane } from './vscode/src/vs/workbench/browser/parts/editor/editorPane.js';
 export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 export { OpenEditor } from './tools/editor.js';

package/index.js

@@ -1,4 +1,4 @@
-export { SimpleEditorInput, SimpleEditorPane, attachPart, default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } from './views.js';
+export { SimpleEditorInput, SimpleEditorPane, attachPart, default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } from './views.js';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { SidebarPart } from './vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js';
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "1.83.7",
+  "version": "1.83.8",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.7",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.8",
     "monaco-editor": "0.44.0"
   }
 }

package/services.js

@@ -12,6 +12,7 @@ import 'vscode/service-override/extensions';
 import 'vscode/service-override/files';
 import 'vscode/service-override/quickaccess';
 import { serviceInitializedBarrier, serviceInitializedEmitter } from 'vscode/lifecycle';
+import 'vscode/workbench';
 export { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 export { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 export { INotificationService, NeverShowAgainScope, NoOpNotification, NoOpProgress, NotificationPriority, NotificationsFilter } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';

package/views.d.ts

@@ -1,5 +1,5 @@
 import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocation, ViewContainer } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { BrandedService, ServicesAccessor } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
@@ -20,8 +20,8 @@ import { RegisteredEditorInfo, RegisteredEditorOptions, EditorInputFactoryObject
 export { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
-import { IEditorOpenContext, EditorInputCapabilities, Verbosity } from 'vscode/vscode/vs/workbench/common/editor';
-export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
+import { IEditorOpenContext, EditorInputCapabilities, Verbosity, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
+export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 import { EditorPane } from './vscode/src/vs/workbench/browser/parts/editor/editorPane.js';
 import { OpenEditor } from './tools/editor.js';
 
@@ -79,6 +79,9 @@ declare abstract class SimpleEditorInput extends EditorInput {
 }
 declare function registerEditorPane<Services extends BrandedService[]>(typeId: string, name: string, ctor: new (...services: Services) => EditorPane, inputCtors: (new (...args: any[]) => EditorInput)[]): IDisposable;
 declare function registerEditor(globPattern: string, editorInfo: RegisteredEditorInfo, editorOptions: RegisteredEditorOptions, factory: EditorInputFactoryObject): IDisposable;
+declare function registerEditorSerializer<Services extends BrandedService[]>(editorTypeId: string, ctor: {
+    new (...Services: Services): IEditorSerializer;
+}): IDisposable;
 interface CustomViewOption {
     readonly id: string;
     name: string;
@@ -97,9 +100,13 @@ interface CustomViewOption {
         icon?: keyof typeof Codicon;
         render?(container: HTMLElement): void;
     }[];
+    viewContainer?: ViewContainer;
+    canToggleVisibility?: boolean;
+    hideByDefault?: boolean;
+    collapsed?: boolean;
 }
 declare function registerCustomView(options: CustomViewOption): IDisposable;
 declare function isEditorPartVisible(): boolean;
 declare function getServiceOverride(openEditorFallback?: OpenEditor, _webviewIframeAlternateDomains?: string, _restoreEditorView?: boolean): IEditorOverrideServices;
 
-export { type CustomViewOption, EditorPane, OpenEditor, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };
+export { type CustomViewOption, EditorPane, OpenEditor, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };

package/views.js

@@ -99,7 +99,7 @@ import getServiceOverride$4 from 'vscode/service-override/quickaccess';
 import getServiceOverride$4$1 from 'vscode/service-override/keybindings';
 import { changeUrlDomain } from './tools/url.js';
 import { registerAssets } from 'vscode/assets';
-import { registerServiceInitializePostParticipant } from 'vscode/lifecycle';
+import { onRenderWorkbench } from 'vscode/lifecycle';
 import { withReadyServices } from './services.js';
 
 function createPart(id, role, classes) {
@@ -284,9 +284,12 @@ function registerEditor(globPattern, editorInfo, editorOptions, factory) {
         return resolverService.registerEditor(globPattern, editorInfo, editorOptions, factory);
     });
 }
+function registerEditorSerializer(editorTypeId, ctor) {
+    return ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(editorTypeId, ctor);
+}
 function registerCustomView(options) {
     const iconUrl = options.icon != null ? ( URI.parse(options.icon)) : undefined;
-    const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
+    const viewContainer = options.viewContainer ?? ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
         id: options.id,
         title: { value: options.name, original: options.name },
         order: options.order,
@@ -299,7 +302,6 @@ function registerCustomView(options) {
     const views = [{
             id: options.id,
             name: options.name,
-            canToggleVisibility: false,
             ctorDescriptor: new SyncDescriptor(class extends ViewPane {
                 renderBody(container) {
                     super.renderBody(container);
@@ -327,14 +329,20 @@ function registerCustomView(options) {
                 }
             }),
             canMoveView: options.canMoveView ?? true,
+            canToggleVisibility: options.canToggleVisibility ?? false,
+            hideByDefault: options.hideByDefault ?? false,
+            collapsed: options.collapsed ?? false,
+            order: options.order,
             containerIcon: iconUrl
         }];
-    ( Registry.as(Extensions.ViewsRegistry)).registerViews(views, VIEW_CONTAINER);
+    ( Registry.as(Extensions.ViewsRegistry)).registerViews(views, viewContainer);
     const disposableCollection = new DisposableStore();
     disposableCollection.add({
         dispose() {
-            ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(views, VIEW_CONTAINER);
-            ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(VIEW_CONTAINER);
+            ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(views, viewContainer);
+            if (options.viewContainer == null) {
+                ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(viewContainer);
+            }
         }
     });
     for (const action of options.actions ?? []) {
@@ -466,13 +474,12 @@ registerAssets({
     'vs/workbench/contrib/webview/browser/pre/fake.html': () => changeUrlDomain(new URL(new URL('./assets/fake.html', import.meta.url).href, import.meta.url).href, webviewIframeAlternateDomains)
 });
 let restoreEditorView = false;
-registerServiceInitializePostParticipant(async (accessor) => {
+onRenderWorkbench(async (accessor) => {
     const paneCompositePartService = accessor.get(IPaneCompositePartService);
     const viewDescriptorService = accessor.get(IViewDescriptorService);
     const withStatusBar = accessor.get(IStatusbarService) instanceof Part;
     const withBannerPart = accessor.get(IBannerService) instanceof Part;
     const withTitlePart = accessor.get(ITitleService) instanceof Part;
-    paneCompositePartService.getPaneComposites(1 );
     const layoutService = accessor.get(ILayoutService);
     const invisibleContainer = document.createElement('div');
     invisibleContainer.style.display = 'none';
@@ -541,4 +548,4 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
     };
 }
 
-export { ActivityService, HoverService, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };
+export { ActivityService, HoverService, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.js

@@ -3,7 +3,7 @@ import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
-import { ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
+import { CustomEditorInputSerializer, ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
 import { WebviewEditor } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 
@@ -11,5 +11,7 @@ import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEdit
     .registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, 'Webview Editor'), [
     ( new SyncDescriptor(CustomEditorInput))
 ]);
+( Registry.as(EditorExtensions.EditorFactory))
+    .registerEditorSerializer(CustomEditorInputSerializer.ID, CustomEditorInputSerializer);
 ( Registry.as(Extensions.Workbench))
     .registerWorkbenchContribution(ComplexCustomWorkingCopyEditorHandler, 1 );

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js

@@ -9,10 +9,11 @@ import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customE
 import { NotebookEditorInput } from '../../../../../../../override/vs/workbench/contrib/notebook/common/notebookEditorInput.js';
 import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { WebviewEditorInputSerializer, reviveWebviewExtensionDescription, restoreWebviewOptions, restoreWebviewContentOptions } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
+import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
 
-(class CustomEditorInputSerializer extends WebviewEditorInputSerializer {
+let CustomEditorInputSerializer = class CustomEditorInputSerializer extends WebviewEditorInputSerializer {
     static { this.ID = CustomEditorInput.typeId; }
     constructor(webviewWorkbenchService, _instantiationService, _webviewService) {
         super(webviewWorkbenchService);
@@ -50,7 +51,12 @@ import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/w
         }
         return customInput;
     }
-});
+};
+CustomEditorInputSerializer = ( __decorate([
+    ( __param(0, IWebviewWorkbenchService)),
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IWebviewService))
+], CustomEditorInputSerializer));
 function reviveWebview(webviewService, data) {
     const webview = webviewService.createWebviewOverlay({
         providedViewType: data.viewType,
@@ -136,4 +142,4 @@ ComplexCustomWorkingCopyEditorHandler = ( __decorate([
     ( __param(4, ICustomEditorService))
 ], ComplexCustomWorkingCopyEditorHandler));
 
-export { ComplexCustomWorkingCopyEditorHandler };
+export { ComplexCustomWorkingCopyEditorHandler, CustomEditorInputSerializer };

package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.js

@@ -1,11 +1,47 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { ITextEditorService } from 'vscode/vscode/vs/workbench/services/textfile/common/textEditorService';
 import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { NO_TYPE_ID } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 
+class FileEditorInputSerializer {
+    canSerialize(editorInput) {
+        return true;
+    }
+    serialize(editorInput) {
+        const fileEditorInput = editorInput;
+        const resource = fileEditorInput.resource;
+        const preferredResource = fileEditorInput.preferredResource;
+        const serializedFileEditorInput = {
+            resourceJSON: resource.toJSON(),
+            preferredResourceJSON: isEqual(resource, preferredResource) ? undefined : preferredResource,
+            name: fileEditorInput.getPreferredName(),
+            description: fileEditorInput.getPreferredDescription(),
+            encoding: fileEditorInput.getEncoding(),
+            modeId: fileEditorInput.getPreferredLanguageId()
+        };
+        return JSON.stringify(serializedFileEditorInput);
+    }
+    deserialize(instantiationService, serializedEditorInput) {
+        return instantiationService.invokeFunction(accessor => {
+            const serializedFileEditorInput = JSON.parse(serializedEditorInput);
+            const resource = URI.revive(serializedFileEditorInput.resourceJSON);
+            const preferredResource = URI.revive(serializedFileEditorInput.preferredResourceJSON);
+            const name = serializedFileEditorInput.name;
+            const description = serializedFileEditorInput.description;
+            const encoding = serializedFileEditorInput.encoding;
+            const languageId = serializedFileEditorInput.modeId;
+            const fileEditorInput = accessor.get(ITextEditorService).createTextEditor({ resource, label: name, description, encoding, languageId, forceFile: true });
+            if (preferredResource) {
+                fileEditorInput.setPreferredResource(preferredResource);
+            }
+            return fileEditorInput;
+        });
+    }
+}
 let FileEditorWorkingCopyEditorHandler = class FileEditorWorkingCopyEditorHandler extends Disposable {
     constructor(workingCopyEditorService, textEditorService, fileService) {
         super();
@@ -35,4 +71,4 @@ FileEditorWorkingCopyEditorHandler = ( __decorate([
     ( __param(2, IFileService))
 ], FileEditorWorkingCopyEditorHandler));
 
-export { FileEditorWorkingCopyEditorHandler };
+export { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler };

package/vscode/src/vs/workbench/contrib/files/browser/files.contribution2.js

@@ -21,7 +21,7 @@ import { DirtyFilesIndicator } from '../common/dirtyFilesIndicator.js';
 import { UndoCommand, RedoCommand } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
 import { IUndoRedoService } from 'monaco-editor/esm/vs/platform/undoRedo/common/undoRedo.js';
 import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
-import { FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
+import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
 import { ModesRegistry } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { TextFileEditor } from './editors/textFileEditor.js';
@@ -67,6 +67,7 @@ FileUriLabelContribution = ( __decorate([
         return obj instanceof FileEditorInput;
     }
 });
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(FILE_EDITOR_INPUT_ID, FileEditorInputSerializer);
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(FileEditorWorkingCopyEditorHandler, 2 );
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ExplorerViewletViewsContribution, 1 );
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(TextFileEditorTracker, 1 );

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js

@@ -12,6 +12,7 @@ import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor
 import { ShowWebViewEditorFindWidgetAction, HideWebViewEditorFindCommand, WebViewEditorFindNextCommand, WebViewEditorFindPreviousCommand, ReloadWebviewAction } from './webviewCommands.js';
 import { WebviewEditor } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
 import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewEditorInputSerializer } from './webviewEditorInputSerializer.js';
 
 (( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localizeWithPath(
     'vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution',
@@ -59,6 +60,7 @@ WebviewPanelContribution = ( __decorate([
 ], WebviewPanelContribution));
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(WebviewPanelContribution, 1 );
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(WebviewEditorInputSerializer.ID, WebviewEditorInputSerializer);
 registerAction2(ShowWebViewEditorFindWidgetAction);
 registerAction2(HideWebViewEditorFindCommand);
 registerAction2(WebViewEditorFindNextCommand);