update: 更新、替换 reload命令 (#568)

Author: shalldie

src/background/Background.ts

@@ -155,25 +155,20 @@ export class Background implements Disposable {
         if (!enabled) {
             if (hasInstalled) {
                 await this.uninstall();
-                vsHelp.showInfoReload(l10n.t('Background has been disabled! Please reload.'));
-            }
-            return;
-        }
 
-        // 更新，需要二次确认
-        const confirm = await vscode.window.showInformationMessage(
-            l10n.t('Configuration has been changed, click to update.'),
-            {
-                title: l10n.t('Update and Reload')
+                vsHelp.reload({
+                    message: l10n.t('Background has been disabled! Please reload.')
+                });
             }
-        );
-
-        if (!confirm) {
             return;
         }
 
-        await this.applyPatch();
-        vscode.commands.executeCommand('workbench.action.reloadWindow');
+        // 更新，需要二次确认
+        vsHelp.reload({
+            message: l10n.t('Configuration has been changed, click to update.'),
+            btnReload: l10n.t('Update and Reload'),
+            beforeReload: () => this.applyPatch()
+        });
     }
 
     public async applyPatch() {
@@ -207,8 +202,11 @@ export class Background implements Disposable {
         if (this.config.enabled) {
             // 此时一般为 「background更新」、「vscode更新」
             if ([EFilePatchType.Legacy, EFilePatchType.None].includes(patchType)) {
+                // 提示： background 可更新
                 if (await this.applyPatch()) {
-                    vsHelp.showInfoReload(l10n.t('Background has been changed! Please reload.'));
+                    vsHelp.reload({
+                        message: l10n.t('Background has been changed! Please reload.')
+                    });
                 }
             }
         }

src/extension.ts

@@ -40,15 +40,15 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         vscode.commands.registerCommand('extension.background.install', async () => {
             await background.config.update('enabled', true, true);
             await background.applyPatch();
-            await vscode.commands.executeCommand('workbench.action.reloadWindow');
+            await vsHelp.reload();
         })
     );
 
     context.subscriptions.push(
         vscode.commands.registerCommand('extension.background.disable', async () => {
             await background.config.update('enabled', false, true);
             await background.uninstall();
-            await vscode.commands.executeCommand('workbench.action.reloadWindow');
+            await vsHelp.reload();
         })
     );
 
@@ -58,7 +58,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
                 // 当且仅当成功删除样式时才会卸载扩展
                 // 否则可能导致没有成功删掉样式时扩展就被卸载掉
                 await vscode.commands.executeCommand('workbench.extensions.uninstallExtension', EXTENSION_ID);
-                await vsHelp.showInfoReload(l10n.t('Background extension has been uninstalled. See you next time!'));
+                vsHelp.reload({
+                    message: l10n.t('Background extension has been uninstalled. See you next time!')
+                });
             }
         })
     );

src/utils/vsHelp.ts

@@ -1,42 +1,37 @@
 import vscode, { l10n } from 'vscode';
 
-// class ReloadOptions {
-//     message = '';
-//     btnReload = l10n.t('Reload vscode');
-//     beforeReload?: () => void | Promise<void>;
-// }
+class ReloadOptions {
+    /** reload 提示内容 */
+    message = '';
+    /** reload 按钮文案 */
+    btnReload = l10n.t('Reload vscode');
+    /** reload 前置动作 */
+    beforeReload?: () => any;
+}
 
 export const vsHelp = {
-    // async reload(options: Partial<ReloadOptions> = {}): Promise<void> {
-    //     // 填充默认值
-    //     options = {
-    //         ...new ReloadOptions(),
-    //         ...options
-    //     };
-    //     // 如果需要确认
-    //     if (options.message) {
-    //         const goon = await vscode.window.showInformationMessage(options.message, { title: options.btnReload! });
-    //         // 关闭了 提示框
-    //         if (!goon) {
-    //             return Promise.resolve();
-    //         }
-
-    //         if (options.beforeReload) {
-    //             await options.beforeReload();
-    //         }
-    //     }
-    //     return vscode.commands.executeCommand('workbench.action.reloadWindow');
-    // },
     /**
-     * 提示内容并重载
+     * 重新加载 vscode
      *
-     * @param {string} message 提示内容
-     * @returns {Thenable<void>}
+     * @param {Partial<ReloadOptions>} [options={}] 定义重新加载的相关配置
+     * @return {*}  {Promise<void>}
      */
-    showInfoReload(message: string): Thenable<void> {
-        return vscode.window.showInformationMessage(message, { title: l10n.t('Reload vscode') }).then(function (item) {
-            if (!item) return;
-            vscode.commands.executeCommand('workbench.action.reloadWindow');
-        });
+    async reload(options: Partial<ReloadOptions> = {}): Promise<void> {
+        // 填充默认值
+        options = {
+            ...new ReloadOptions(),
+            ...options
+        };
+        // 如果需要确认
+        if (options.message) {
+            const goon = await vscode.window.showInformationMessage(options.message, { title: options.btnReload! });
+            // 关闭了 提示框
+            if (!goon) {
+                return Promise.resolve();
+            }
+            // 关闭前置动作
+            await options.beforeReload?.();
+        }
+        return vscode.commands.executeCommand('workbench.action.reloadWindow');
     }
 };