[scm][plugin] restore view containers and view laout

Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Aug 3, 2019 · 9320510 · 9320510
1 parent 2f593e3
commit 9320510
Show file tree

Hide file tree

Showing 12 changed files with 280 additions and 148 deletions.
diff --git a/packages/core/src/browser/frontend-application-module.ts b/packages/core/src/browser/frontend-application-module.ts
@@ -74,7 +74,7 @@ import { ResourceContextKey } from './resource-context-key';
 import { KeyboardLayoutService } from './keyboard/keyboard-layout-service';
 import { MimeService } from './mime-service';
 import { ApplicationShellMouseTracker } from './shell/application-shell-mouse-tracker';
-import { ViewContainer, ViewContainerOptions } from './view-container';
+import { ViewContainer, ViewContainerIdentifier } from './view-container';
 
 export const frontendApplicationModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     const themeService = ThemeService.get();
@@ -241,9 +241,9 @@ export const frontendApplicationModule = new ContainerModule((bind, unbind, isBo
     bind(ApplicationShellMouseTracker).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(ApplicationShellMouseTracker);
 
-    bind(ViewContainer.Factory).toFactory(context => (options: ViewContainerOptions) => {
+    bind(ViewContainer.Factory).toFactory(context => (options: ViewContainerIdentifier) => {
         const container = context.container.createChild();
-        container.bind(ViewContainerOptions).toConstantValue(options);
+        container.bind(ViewContainerIdentifier).toConstantValue(options);
         container.bind(ViewContainer).toSelf().inSingletonScope();
         return container.get(ViewContainer);
     });

diff --git a/packages/core/src/browser/shell/shell-layout-restorer.ts b/packages/core/src/browser/shell/shell-layout-restorer.ts
@@ -49,7 +49,7 @@ export namespace StatefulWidget {
 
 interface WidgetDescription {
     constructionOptions: WidgetConstructionOptions,
-    innerWidgetState?: object
+    innerWidgetState?: string | object
 }
 
 @injectable()
@@ -111,7 +111,7 @@ export class ShellLayoutRestorer implements CommandContribution {
     /**
      * Turns the layout data to a string representation.
      */
-    protected deflate(data: ApplicationShell.LayoutData): string {
+    protected deflate(data: object): string {
         return JSON.stringify(data, (property: string, value) => {
             if (this.isWidgetProperty(property)) {
                 const description = this.convertToDescription(value as Widget);
@@ -139,7 +139,7 @@ export class ShellLayoutRestorer implements CommandContribution {
             }
             return {
                 constructionOptions: desc,
-                innerWidgetState: innerState
+                innerWidgetState: innerState && this.deflate(innerState)
             };
         }
     }
@@ -185,10 +185,11 @@ export class ShellLayoutRestorer implements CommandContribution {
     private convertToWidget(desc: WidgetDescription): Promise<Widget | undefined> {
         if (desc.constructionOptions) {
             return this.widgetManager.getOrCreateWidget(desc.constructionOptions.factoryId, desc.constructionOptions.options)
-                .then(widget => {
+                .then(async widget => {
                     if (StatefulWidget.is(widget) && desc.innerWidgetState !== undefined) {
                         try {
-                            widget.restoreState(desc.innerWidgetState);
+                            const oldState = typeof desc.innerWidgetState === 'string' ? await this.inflate(desc.innerWidgetState) : desc.innerWidgetState;
+                            widget.restoreState(oldState);
                         } catch (err) {
                             this.logger.warn(`Couldn't restore widget state for ${widget.id}. Error: ${err} `);
                         }

diff --git a/packages/core/src/browser/shell/view-contribution.ts b/packages/core/src/browser/shell/view-contribution.ts
@@ -32,7 +32,7 @@ export interface OpenViewArguments extends ApplicationShell.WidgetOptions {
     reveal?: boolean;
 }
 
-export interface ViewContributionOptions<T extends Widget> {
+export interface ViewContributionOptions {
     widgetId: string;
     widgetName: string;
     defaultWidgetOptions: ApplicationShell.WidgetOptions;
@@ -61,7 +61,7 @@ export abstract class AbstractViewContribution<T extends Widget> implements Comm
     readonly toggleCommand?: Command;
 
     constructor(
-        protected readonly options: ViewContributionOptions<T>
+        protected readonly options: ViewContributionOptions
     ) {
         if (options.toggleCommandId) {
             this.toggleCommand = {