🏷️ up to date with typescript@5.5

volatile-static · Jul 7, 2024 · 84e1721 · 84e1721
1 parent fbc9f63
commit 84e1721
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -28,7 +28,7 @@
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "vscode.typescript-language-features"
     },
     "typescript.tsdk": "node_modules/typescript/lib",
     "editor.suggestSelection": "recentlyUsed",

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/bootstrap/modules/recent.ts b/src/bootstrap/modules/recent.ts
@@ -1,4 +1,4 @@
-import { ICON_URL, isValid } from './utils';
+import { ICON_URL } from './utils';
 
 export default function (win: MainWindow) {
     // 注册“最近在读”菜单
@@ -41,7 +41,7 @@ export default function (win: MainWindow) {
 
 async function addRecentTabsMenu({ target }: Event) {
     const win = (target as any).ownerGlobal as MainWindow,
-        openedItems = win.Zotero_Tabs.getState().map(tab => tab.data?.itemID).filter(isValid),
+        openedItems = win.Zotero_Tabs.getState().map(tab => tab.data?.itemID).filter(i => !!i),
         regex = new RegExp(`(${Zotero.Utilities.quotemeta(win.Zotero_Tabs._tabsMenuFilter)})`, 'gi');
     let tabIndex = win.Zotero_Tabs.tabsMenuList.querySelectorAll('*[tabindex]').length;
     if (__dev__)
@@ -107,7 +107,7 @@ function getHistoryInfo() {
     return addon.history
         .getAll()
         .map((his, id) => (his ? { tim: his.record.lastTime ?? 0, id } : undefined))
-        .filter(isValid)
+        .filter(i => !!i)
         .sort((a, b) => b.tim - a.tim)
         .slice(0, 10)
         .map(his => {
@@ -125,5 +125,5 @@ function getHistoryInfo() {
                 return null;
             }
         })
-        .filter(isValid);
+        .filter(i => !!i);
 }
diff --git a/src/bootstrap/modules/utils.ts b/src/bootstrap/modules/utils.ts
@@ -163,10 +163,6 @@ export class WorkerManager extends WorkerManagerBase<Worker> {
     }
 }
 
-export function isValid<T>(x: T | undefined | null): x is T {
-    return Boolean(x);
-}
-
 export function isPDFReader(
     reader: _ZoteroTypes.ReaderInstance
 ): reader is _ZoteroTypes.ReaderInstance<'pdf'> {