Avoid opening duplicate editor tabs.

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

Diff for: arduino-ide-extension/src/browser/theia/core/shell-layout-restorer.ts

@@ -1,78 +1,118 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { WidgetDescription } from '@theia/core/lib/browser';
 import { ShellLayoutRestorer as TheiaShellLayoutRestorer } from '@theia/core/lib/browser/shell/shell-layout-restorer';
-import { EditorManager } from '@theia/editor/lib/browser';
+import { injectable } from '@theia/core/shared/inversify';
+import { EditorPreviewWidgetFactory } from '@theia/editor-preview/lib/browser/editor-preview-widget-factory';
+import { EditorWidgetFactory } from '@theia/editor/lib/browser/editor-widget-factory';
 
 @injectable()
 export class ShellLayoutRestorer extends TheiaShellLayoutRestorer {
-  // The editor manager is unused in the layout restorer.
-  // We inject the editor manager to achieve better logging when filtering duplicate editor tabs.
-  // Feel free to remove it in later IDE2 releases if the duplicate editor tab issues do not occur anymore.
-  @inject(EditorManager)
-  private readonly editorManager: EditorManager;
-
-  // Workaround for https://github.com/eclipse-theia/theia/issues/6579.
-  async storeLayoutAsync(app: FrontendApplication): Promise<void> {
-    if (this.shouldStoreLayout) {
-      try {
-        this.logger.info('>>> Storing the layout...');
-        const layoutData = app.shell.getLayoutData();
-        const serializedLayoutData = this.deflate(layoutData);
-        await this.storageService.setData(
-          this.storageKey,
-          serializedLayoutData
-        );
-        this.logger.info('<<< The layout has been successfully stored.');
-      } catch (error) {
-        await this.storageService.setData(this.storageKey, undefined);
-        this.logger.error('Error during serialization of layout data', error);
+  /**
+   * Customized to filter out duplicate editor tabs.
+   */
+  protected override parse<T>(
+    layoutData: string,
+    parseContext: TheiaShellLayoutRestorer.ParseContext
+  ): T {
+    return JSON.parse(layoutData, (property: string, value) => {
+      if (this.isWidgetsProperty(property)) {
+        const widgets = parseContext.filteredArray();
+        const descs = this.filterDescriptions(value); // <--- customization to filter out editor preview construction options.
+        for (let i = 0; i < descs.length; i++) {
+          parseContext.push(async (context) => {
+            widgets[i] = await this.convertToWidget(descs[i], context);
+          });
+        }
+        return widgets;
+      } else if (value && typeof value === 'object' && !Array.isArray(value)) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const copy: any = {};
+        for (const p in value) {
+          if (this.isWidgetProperty(p)) {
+            parseContext.push(async (context) => {
+              copy[p] = await this.convertToWidget(value[p], context);
+            });
+          } else {
+            copy[p] = value[p];
+          }
+        }
+        return copy;
       }
-    }
+      return value;
+    });
   }
 
-  override async restoreLayout(app: FrontendApplication): Promise<boolean> {
-    this.logger.info('>>> Restoring the layout state...');
-    const serializedLayoutData = await this.storageService.getData<string>(
-      this.storageKey
-    );
-    if (serializedLayoutData === undefined) {
-      this.logger.info('<<< Nothing to restore.');
-      return false;
-    }
-
-    const layoutData = await this.inflate(serializedLayoutData);
-    // workaround to remove duplicated tabs
-    console.log(
-      '>>> Filtering persisted layout data to eliminate duplicate editor tabs...'
-    );
-    const filesUri: string[] = [];
-    if ((layoutData as any)?.mainPanel?.main?.widgets) {
-      (layoutData as any).mainPanel.main.widgets = (
-        layoutData as any
-      ).mainPanel.main.widgets.filter((widget: any) => {
-        const uri = widget.getResourceUri().toString();
-        if (filesUri.includes(uri)) {
-          console.log(`[SKIP]: Already visited editor URI: '${uri}'.`);
-          return false;
+  /**
+   * Workaround to avoid duplicate editor tabs on IDE2 startup.
+   *
+   * This function filters all widget construction options with `editor-preview-widget`
+   * factory ID if another option has the same URI and `code-editor-opener` factory ID.
+   * In other words, if a resource is about to open in the Code editor, the same resource won't open as a preview widget.
+   *
+   * We do not know yet how the `editor-preview-widget` widget factory persisted in
+   * local storage when storing the app layout on shutdown, but IDE2 restores the following JSON:
+   * ```json
+   * [
+   *   {
+   *     "constructionOptions": {
+   *       "factoryId": "editor-preview-widget",
+   *       "options": {
+   *         "kind": "navigatable",
+   *         "uri": "file:///Users/a.kitta/Documents/Arduino/sketch_jun3b/sketch_jun3b.ino",
+   *         "counter": 1,
+   *         "preview": false
+   *       }
+   *     },
+   *     "innerWidgetState": "{\"isPreview\":false,\"editorState\":{\"cursorState\":[{\"inSelectionMode\":false,\"selectionStart\":{\"lineNumber\":10,\"column\":1},\"position\":{\"lineNumber\":10,\"column\":1}}],\"viewState\":{\"scrollLeft\":0,\"firstPosition\":{\"lineNumber\":1,\"column\":1},\"firstPositionDeltaTop\":0},\"contributionsState\":{\"editor.contrib.folding\":{\"lineCount\":10,\"provider\":\"indent\",\"foldedImports\":false},\"editor.contrib.wordHighlighter\":false}}}"
+   *   },
+   *   {
+   *     "constructionOptions": {
+   *       "factoryId": "code-editor-opener",
+   *       "options": {
+   *         "kind": "navigatable",
+   *         "uri": "file:///Users/a.kitta/Documents/Arduino/sketch_jun3b/sketch_jun3b.ino",
+   *         "counter": 0
+   *       }
+   *     },
+   *     "innerWidgetState": "{\"cursorState\":[{\"inSelectionMode\":false,\"selectionStart\":{\"lineNumber\":1,\"column\":1},\"position\":{\"lineNumber\":1,\"column\":1}}],\"viewState\":{\"scrollLeft\":0,\"firstPosition\":{\"lineNumber\":1,\"column\":1},\"firstPositionDeltaTop\":0},\"contributionsState\":{\"editor.contrib.folding\":{\"lineCount\":10,\"provider\":\"indent\",\"foldedImports\":false},\"editor.contrib.wordHighlighter\":false}}"
+   *   }
+   * ]
+   * ```
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private filterDescriptions(value: any): WidgetDescription[] {
+    const descriptions = value as WidgetDescription[];
+    const codeEditorUris = new Set<string>();
+    descriptions.forEach(({ constructionOptions }) => {
+      const { options, factoryId } = constructionOptions;
+      if (isResourceWidgetOptions(options)) {
+        const { uri } = options;
+        // resource about to open in code editor
+        if (factoryId === EditorWidgetFactory.ID) {
+          codeEditorUris.add(uri);
         }
-        console.log(`[OK]: Visited editor URI: '${uri}'.`);
-        filesUri.push(uri);
-        return true;
-      });
-    }
-    console.log('<<< Filtered the layout data before restoration.');
-
-    await app.shell.setLayoutData(layoutData);
-    const allOpenedEditors = this.editorManager.all;
-    // If any editor was visited during the layout data filtering,
-    // but the editor manager does not know about opened editors, then
-    // the IDE2 will show duplicate editors.
-    if (filesUri.length && !allOpenedEditors.length) {
-      console.warn(
-        'Inconsistency detected between the editor manager and the restored layout data. Editors were detected to be open in the layout data from the previous session, but the editor manager does not know about the opened editor.'
-      );
-    }
-    this.logger.info('<<< The layout has been successfully restored.');
-    return true;
+      }
+    });
+    return descriptions.filter(({ constructionOptions }) => {
+      const { options, factoryId } = constructionOptions;
+      if (factoryId === EditorPreviewWidgetFactory.ID) {
+        // resource about to open in preview editor
+        if (isResourceWidgetOptions(options)) {
+          const { uri } = options;
+          // if the resource is about to open in the code editor, do not open the resource in a preview widget too.
+          if (codeEditorUris.has(uri)) {
+            console.log(
+              `Filtered a widget construction options to avoid duplicate editor tab. URI: ${options.uri}, factory ID: ${factoryId}.`
+            );
+            return false;
+          }
+        }
+      }
+      return true;
+    });
   }
 }
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isResourceWidgetOptions(options: any): options is { uri: string } {
+  return !!options && 'uri' in options && typeof options.uri === 'string';
+}