Merge branch 'main' into don/disableAutoBuild

src/test/mocks/vsc/extHostedTypes.ts

@@ -2067,7 +2067,7 @@ export namespace vscMockExtHostedTypes {
     export class TreeItem {
         label?: string;
         resourceUri?: vscUri.URI;
-        iconPath?: string | vscUri.URI | { light: string | vscUri.URI; dark: string | vscUri.URI };
+        iconPath?: IconPath;
         command?: vscode.Command;
         contextValue?: string;
         tooltip?: string;
@@ -2104,6 +2104,24 @@ export namespace vscMockExtHostedTypes {
         }
     }
 
+    /**
+     * Represents an icon in the UI. This is either an uri, separate uris for the light- and dark-themes,
+     * or a {@link ThemeIcon theme icon}.
+     */
+    export type IconPath =
+        | vscode.Uri
+        | {
+              /**
+               * The icon path for the light theme.
+               */
+              light: vscode.Uri;
+              /**
+               * The icon path for the dark theme.
+               */
+              dark: vscode.Uri;
+          }
+        | ThemeIcon;
+
     export class ThemeColor {
         id: string;
         constructor(id: string) {