Merge pull request microsoft#153824 from microsoft/tyriar/153490_2

Correct id type, inherit id/color individually from parent

Author: Tyriar

src/vs/workbench/api/browser/mainThreadTask.ts

@@ -342,7 +342,7 @@ namespace TaskDTO {
 		return result;
 	}
 
-	export function to(task: ITaskDTO | undefined, workspace: IWorkspaceContextService, executeOnly: boolean, icon?: { id: string; color?: string }): ContributedTask | undefined {
+	export function to(task: ITaskDTO | undefined, workspace: IWorkspaceContextService, executeOnly: boolean, icon?: { id?: string; color?: string }): ContributedTask | undefined {
 		if (!task || (typeof task.name !== 'string')) {
 			return undefined;
 		}

src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts

@@ -512,7 +512,12 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 			for (const dependency of task.configurationProperties.dependsOn) {
 				const dependencyTask = await resolver.resolve(dependency.uri, dependency.task!);
 				if (dependencyTask) {
-					dependencyTask.configurationProperties.icon = dependencyTask.configurationProperties.icon || task.configurationProperties.icon;
+					if (dependencyTask.configurationProperties.icon) {
+						dependencyTask.configurationProperties.icon.id ||= task.configurationProperties.icon?.id;
+						dependencyTask.configurationProperties.icon.color ||= task.configurationProperties.icon?.color;
+					} else {
+						dependencyTask.configurationProperties.icon = task.configurationProperties.icon;
+					}
 					const key = dependencyTask.getMapKey();
 					let promise = this._activeTasks[key] ? this._getDependencyPromise(this._activeTasks[key]) : undefined;
 					if (!promise) {
@@ -1037,7 +1042,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				remoteAuthority: this._environmentService.remoteAuthority
 			});
 			let icon: URI | ThemeIcon | { light: URI; dark: URI } | undefined;
-			if (task.configurationProperties.icon) {
+			if (task.configurationProperties.icon?.id) {
 				icon = ThemeIcon.fromId(task.configurationProperties.icon.id);
 			} else {
 				const taskGroupKind = task.configurationProperties.group ? GroupKind.to(task.configurationProperties.group) : undefined;

src/vs/workbench/contrib/tasks/common/tasks.ts

@@ -548,7 +548,7 @@ export interface IConfigurationProperties {
 	/**
 	 * The icon for this task in the terminal tabs list
 	 */
-	icon?: { id: string; color?: string };
+	icon?: { id?: string; color?: string };
 }
 
 export enum RunOnOptions {
@@ -912,7 +912,7 @@ export class ContributedTask extends CommonTask {
 	/**
 	 * The icon for the task
 	 */
-	icon: { id: string; color?: string } | undefined;
+	icon: { id?: string; color?: string } | undefined;
 
 	public constructor(id: string, source: IExtensionTaskSource, label: string, type: string | undefined, defines: KeyedTaskIdentifier,
 		command: ICommandConfiguration, hasDefinedMatchers: boolean, runOptions: IRunOptions,