1.2.4

whosydd · Oct 14, 2021 · a0b4aa5 · a0b4aa5
1 parent 5908341
commit a0b4aa5
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 24 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.4 (2021-10-14)
+
+- 修复：移除主题时，没有选择会弹出‘移除 undefined 的提示’
+
 ## 1.2.3 (2021-09-21)
 
 - 修改 "debugConsole.warningForeground": "#dfbb74"

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "ayu-mirage-plus",
   "displayName": "Ayu Mirage Plus",
   "description": "This theme is basic on Ayu Mirage, just for fun! :)",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "publisher": "GY",
   "repository": {
     "type": "git",

diff --git a/src/extension.ts b/src/extension.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
-import add from './add'
-import remove from './remove'
-import reset from './reset'
+import add from './utils/add'
+import remove from './utils/remove'
+import reset from './utils/reset'
 
 export function activate(context: vscode.ExtensionContext) {
   // 生成主题

diff --git a/src/add.ts → src/utils/add.ts b/src/add.ts → src/utils/add.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs'
 import * as vscode from 'vscode'
-import settings from './config/settings'
+import settings from '../config/settings'
 
 const { foregroundColors, themeColors, borderColors, highlightColors } = settings
 

diff --git a/src/remove.ts → src/utils/remove.ts b/src/remove.ts → src/utils/remove.ts
@@ -30,15 +30,18 @@ export default async () => {
     const res = themes.filter(item => !rmThemeList?.includes(item))
     packageFile.contributes.themes = res
     fs.writeFileSync(`${__dirname}/../package.json`, JSON.stringify(packageFile))
-    vscode.window
-      .showInformationMessage(
-        `${rmThemeList?.map(item => item.label).toString()} has been removed!`,
-        'Reload Window'
-      )
-      .then(value =>
-        value === 'Reload Window'
-          ? vscode.commands.executeCommand('workbench.action.reloadWindow')
-          : null
-      )
+
+    if (rmThemeList !== undefined) {
+      vscode.window
+        .showInformationMessage(
+          `${rmThemeList?.map(item => item.label).toString()} has been removed!`,
+          'Reload Window'
+        )
+        .then(value =>
+          value === 'Reload Window'
+            ? vscode.commands.executeCommand('workbench.action.reloadWindow')
+            : null
+        )
+    }
   })
 }
diff --git a/src/reset.ts → src/utils/reset.ts b/src/reset.ts → src/utils/reset.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs'
 import * as vscode from 'vscode'
-import settings from './config/settings'
+import settings from '../config/settings'
 
 const { foregroundColors, themeColors, borderColors, highlightColors } = settings