feat(overmind-devtools-vscode): open in focused window and reopen on restart

Author: christianalfoni

packages/node_modules/overmind-devtools-vscode/package.json

@@ -3,7 +3,7 @@
   "displayName": "Overmind Devtools VSCode",
   "description": "Devtools for Overmind",
   "publisher": "christianalfoni",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cerebral/overmind.git"

packages/node_modules/overmind-devtools-vscode/src/DevtoolsPanel.ts

@@ -18,25 +18,33 @@ export class DevtoolsPanel {
   constructor(options: Options) {
     this._options = options
   }
-  show(content: string) {
+  show(content: string, panel?: vscode.WebviewPanel) {
     if (this._panel) {
       this._panel.dispose()
     }
 
-    this._panel = vscode.window.createWebviewPanel(
-      DevtoolsPanel.viewType,
-      'Overmind',
-      this.getColumn(),
-      {
-        enableScripts: true,
-        retainContextWhenHidden: true,
-        localResourceRoots: [
-          vscode.Uri.file(
-            path.join(this._options.context.extensionPath, 'devtoolsDist')
-          ),
-        ],
-      }
-    )
+    this._panel =
+      panel ||
+      vscode.window.createWebviewPanel(
+        DevtoolsPanel.viewType,
+        'Overmind',
+        {
+          viewColumn:
+            vscode.window.activeTextEditor &&
+            vscode.window.activeTextEditor.viewColumn
+              ? vscode.window.activeTextEditor.viewColumn
+              : vscode.ViewColumn.One,
+        },
+        {
+          enableScripts: true,
+          retainContextWhenHidden: true,
+          localResourceRoots: [
+            vscode.Uri.file(
+              path.join(this._options.context.extensionPath, 'devtoolsDist')
+            ),
+          ],
+        }
+      )
 
     this._panel.webview.onDidReceiveMessage(
       (message) => {
@@ -55,17 +63,6 @@ export class DevtoolsPanel {
       this._options.context.subscriptions
     )
     this._panel.webview.html = content
-    this._panel.reveal(this.getColumn())
-  }
-
-  private getColumn() {
-    if (
-      vscode.window.activeTextEditor &&
-      vscode.window.activeTextEditor.viewColumn
-    ) {
-      return vscode.window.activeTextEditor.viewColumn
-    }
-
-    return vscode.ViewColumn.One
+    this._panel.reveal()
   }
 }

packages/node_modules/overmind-devtools-vscode/src/DevtoolsPanel_old.ts

@@ -54,7 +54,7 @@ export function activate(context: vscode.ExtensionContext) {
     },
   })
 
-  function startDevtools() {
+  function startDevtools(panel?: vscode.WebviewPanel) {
     const port: number =
       vscode.workspace.getConfiguration().get('overmind.port') || 3031
 
@@ -64,27 +64,20 @@ export function activate(context: vscode.ExtensionContext) {
         let scriptFile: vscode.Uri | string
 
         // TODO consider https://github.com/microsoft/vscode/commit/fbcdb4c6a736ff38e60a7e9d0a3f1be5ccbaf3af ?
-        if (process.env.VSCODE_DEBUG_MODE || vscode.workspace.getConfiguration().get('overmind.devmode.enabled')) {
-          scriptFile = <string>vscode.workspace.getConfiguration().get('overmind.devmode.url')
+        if (
+          process.env.VSCODE_DEBUG_MODE ||
+          vscode.workspace.getConfiguration().get('overmind.devmode.enabled')
+        ) {
+          scriptFile = <string>(
+            vscode.workspace.getConfiguration().get('overmind.devmode.url')
+          )
         } else {
           const onDiskPath = vscode.Uri.file(
             path.join(context.extensionPath, 'devtoolsDist', 'bundle.js')
           )
           scriptFile = onDiskPath.with({ scheme: 'vscode-resource' })
         }
 
-        /*
-    // activityBar-background
-    foreground: 'hsl(206, 57%, 17%)',
-    // editor-background
-    background: 'hsl(206, 57%, 13%)',
-    // dropdown-border
-    border: 'hsl(206, 57%, 16%)',
-    // editor-foreground
-    text: 'hsl(0, 0%, 90%)',
-    // focusForeground
-    highlight: 'hsl(0, 0%, 85%)'
-        */
         devtoolsPanel.show(
           devtoolBackend.getMarkup(scriptFile, port).replace(
             '</head>',
@@ -126,7 +119,8 @@ export function activate(context: vscode.ExtensionContext) {
                 command: 'restart',
               })
             }
-          )
+          ),
+          panel
         )
       })
   }
@@ -135,20 +129,13 @@ export function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand('overmind-devtools.start', startDevtools)
   )
 
-  // This is supposed keep Overmind extension in same position on restart, though
-  // do not think we need that really? https://code.visualstudio.com/api/extension-guides/webview
-  /*
   if (vscode.window.registerWebviewPanelSerializer) {
     vscode.window.registerWebviewPanelSerializer(DevtoolsPanel.viewType, {
-      async deserializeWebviewPanel(
-        webViewPanel: vscode.WebviewPanel,
-        state: any
-      ) {
-        DevtoolsPanel.revive(webViewPanel, context.extensionPath)
+      async deserializeWebviewPanel(webViewPanel: vscode.WebviewPanel) {
+        startDevtools(webViewPanel)
       },
     })
   }
-  */
 }
 
 // this method is called when your extension is deactivated