Replace instanceof ThemeIcon with an is method (#10012)

eclipse-theia · Sep 16, 2021 · b1a3e73 · b1a3e73
1 parent 585967a
commit b1a3e73
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/plugin-ext/src/plugin/quick-open.ts b/packages/plugin-ext/src/plugin/quick-open.ts
@@ -41,7 +41,7 @@ export function isPromiseCanceledError(error: any): boolean {
 }
 
 export function getIconUris(iconPath: theia.QuickInputButton['iconPath']): { dark: URI, light: URI } | { id: string } {
-    if (iconPath instanceof ThemeIcon) {
+    if (ThemeIcon.is(iconPath)) {
         return { id: iconPath.id };
     }
     const dark = getDarkIconUri(iconPath as URI | { light: URI; dark: URI; });
@@ -439,7 +439,7 @@ export class QuickInputExt implements QuickInput {
             const relativePath = path.relative(packagePath, normalizedPath);
             return PluginPackage.toPluginUrl(this.plugin.rawModel, relativePath);
         };
-        if ('id' in iconPath || iconPath instanceof ThemeIcon) {
+        if (ThemeIcon.is(iconPath)) {
             return iconPath;
         } else if (typeof iconPath === 'string' || iconPath instanceof monaco.Uri) {
             return URI.parse(toUrl(iconPath));

diff --git a/packages/plugin-ext/src/plugin/tree/tree-views.ts b/packages/plugin-ext/src/plugin/tree/tree-views.ts
@@ -369,7 +369,7 @@ class TreeViewExtImpl<T> implements Disposable {
                 const { iconPath } = treeItem;
                 if (typeof iconPath === 'string' && iconPath.indexOf('fa-') !== -1) {
                     icon = iconPath;
-                } else if (iconPath instanceof ThemeIcon) {
+                } else if (ThemeIcon.is(iconPath)) {
                     themeIconId = iconPath.id;
                 } else {
                     iconUrl = PluginIconPath.toUrl(<PluginIconPath | undefined>iconPath, this.plugin);

diff --git a/packages/plugin-ext/src/plugin/types-impl.ts b/packages/plugin-ext/src/plugin/types-impl.ts
@@ -702,6 +702,12 @@ export class ThemeIcon {
 
 }
 
+export namespace ThemeIcon {
+    export function is(item: unknown): item is ThemeIcon {
+        return typeof item === 'object' && !!item && 'id' in item;
+    }
+}
+
 export enum TextEditorRevealType {
     Default = 0,
     InCenter = 1,