Make two event callbacks inheritable class method

Author: Vigilans

src/webview/LeetCodeWebview.ts

@@ -11,17 +11,8 @@ export abstract class LeetCodeWebview implements Disposable {
     private listener: Disposable;
 
     public initialize(context: ExtensionContext): void {
-        const { onDidChangeConfiguration } = this.getWebviewOption();
         this.context = context;
-        if (onDidChangeConfiguration) {
-            this.listener = workspace.onDidChangeConfiguration(onDidChangeConfiguration, this);
-        } else {
-            this.listener = workspace.onDidChangeConfiguration((event: ConfigurationChangeEvent) => {
-                if (event.affectsConfiguration("markdown") && this.panel) {
-                    this.panel.webview.html = this.getWebviewContent();
-                }
-            }, this);
-        }
+        this.listener = workspace.onDidChangeConfiguration(this.onDidChangeConfiguration, this);
     }
 
     public dispose(): void {
@@ -33,7 +24,7 @@ export abstract class LeetCodeWebview implements Disposable {
 
     protected showWebviewInternal(): this is { panel: WebviewPanel } {
         if (!this.panel) {
-            const { viewType, title, viewColumn, onDidReceiveMessage } = this.getWebviewOption();
+            const { viewType, title, viewColumn } = this.getWebviewOption();
 
             this.panel = window.createWebviewPanel(viewType, title, viewColumn || ViewColumn.One, {
                 enableScripts: true,
@@ -47,15 +38,21 @@ export abstract class LeetCodeWebview implements Disposable {
                 this.panel = undefined;
             }, null, this.context.subscriptions);
 
-            if (onDidReceiveMessage) {
-                this.panel.webview.onDidReceiveMessage(onDidReceiveMessage, this, this.context.subscriptions);
-            }
+            this.panel.webview.onDidReceiveMessage(this.onDidReceiveMessage, this, this.context.subscriptions);
         }
 
         this.panel.webview.html = this.getWebviewContent();
         return true;
     }
 
+    protected async onDidChangeConfiguration(event: ConfigurationChangeEvent): Promise<void> {
+        if (this.panel && event.affectsConfiguration("markdown")) {
+            this.panel.webview.html = this.getWebviewContent();
+        }
+    }
+
+    protected async onDidReceiveMessage(/* message */_: any): Promise<void> { /* no special rule */ }
+
     protected abstract getWebviewOption(): ILeetCodeWebviewOption;
 
     protected abstract getWebviewContent(): string;
@@ -65,6 +62,4 @@ export interface ILeetCodeWebviewOption {
     viewType: string;
     title: string;
     viewColumn?: ViewColumn;
-    onDidReceiveMessage?: (message: any) => Promise<void>;
-    onDidChangeConfiguration?: (event: ConfigurationChangeEvent) => Promise<void>;
 }

src/webview/leetCodePreviewProvider.ts

@@ -13,28 +13,27 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
     private description: IDescription;
 
     public async show(node: IProblem): Promise<void> {
-        const descString: string = await leetCodeExecutor.getDescription(node);
+        this.description = this.parseDescription(await leetCodeExecutor.getDescription(node), node);
         this.node = node;
-        this.description = this.parseDescription(descString, node);
         if (this.showWebviewInternal()) {
-            this.panel.webview.html = this.getWebviewContent();
             this.panel.title = `${node.name}: Preview`;
             this.panel.reveal(ViewColumn.One);
         }
     }
 
+    protected async onDidReceiveMessage(message: IWebViewMessage): Promise<void> {
+        switch (message.command) {
+            case "ShowProblem": {
+                await commands.executeCommand("leetcode.showProblem", this.node);
+                break;
+            }
+        }
+    }
+
     protected getWebviewOption(): ILeetCodeWebviewOption {
         return {
             viewType: "leetcode.preview",
             title: "Preview Problem",
-            onDidReceiveMessage: async (message: IWebViewMessage): Promise<void> => {
-                switch (message.command) {
-                    case "ShowProblem": {
-                        await commands.executeCommand("leetcode.showProblem", this.node);
-                        break;
-                    }
-                }
-            },
         };
     }