Fix updating the ER diagram webview. Refs #36

Author: badsyntax

src/util/ERDiagramWebViewProvider.ts

@@ -8,25 +8,11 @@ export class ERDiagramWebViewProvider extends Disposable {
   constructor(
     private readonly panel: vscode.WebviewPanel,
     private readonly extensionUri: vscode.Uri,
-    dbContext: string,
-    mermaidContent: string,
   ) {
     super();
     this.setWebviewMessageListener(this.panel.webview);
     this.subscriptions.push(this.panel);
     this.panel.onDidDispose(() => this.dispose(), null, this.subscriptions);
-
-    const activeTheme = vscode.window.activeColorTheme;
-    const mermaidTheme =
-      activeTheme.kind === vscode.ColorThemeKind.Dark ? 'dark' : 'default';
-
-    this.panel.webview.html = getWebviewContent(
-      dbContext,
-      this.panel.webview,
-      this.extensionUri,
-      mermaidContent,
-      mermaidTheme,
-    );
   }
 
   public dispose(): void {
@@ -39,11 +25,7 @@ export class ERDiagramWebViewProvider extends Disposable {
     dbContext: string,
     mermaidContent: string,
   ) {
-    if (ERDiagramWebViewProvider.currentProvider) {
-      ERDiagramWebViewProvider.currentProvider.panel.reveal(
-        vscode.ViewColumn.One,
-      );
-    } else {
+    if (!ERDiagramWebViewProvider.currentProvider) {
       const panel = vscode.window.createWebviewPanel(
         `${EXTENSION_NAMESPACE}-dbcontext`,
         'Entity Relationship Diagram',
@@ -55,10 +37,25 @@ export class ERDiagramWebViewProvider extends Disposable {
       ERDiagramWebViewProvider.currentProvider = new ERDiagramWebViewProvider(
         panel,
         extensionUri,
+      );
+    }
+
+    const activeTheme = vscode.window.activeColorTheme;
+    const mermaidTheme =
+      activeTheme.kind === vscode.ColorThemeKind.Dark ? 'dark' : 'default';
+
+    ERDiagramWebViewProvider.currentProvider.panel.webview.html =
+      getWebviewContent(
         dbContext,
+        ERDiagramWebViewProvider.currentProvider.panel.webview,
+        extensionUri,
         mermaidContent,
+        mermaidTheme,
       );
-    }
+
+    ERDiagramWebViewProvider.currentProvider.panel.reveal(
+      vscode.ViewColumn.One,
+    );
   }
 
   private setWebviewMessageListener(webview: vscode.Webview) {