Remove uses of property existence with in

alexr00 · alexr00 · commit 28cf23a35d27 · 2025-05-08T16:58:56.000+02:00
diff --git a/src/commands.ts b/src/commands.ts
@@ -1222,12 +1222,20 @@ ${contents}
 		}),
 	);
 
-	context.subscriptions.push(vscode.commands.registerCommand('review.createSuggestionsFromChanges', async (value: ({ resourceStates: { resourceUri }[] }) | ({ resourceUri: vscode.Uri }), ...additionalSelected: ({ resourceUri: vscode.Uri })[]) => {
+	interface SCMResourceStates {
+		resourceStates: { resourceUri: vscode.Uri }[];
+	}
+	interface SCMResourceUri {
+		resourceUri: vscode.Uri;
+	}
+	context.subscriptions.push(vscode.commands.registerCommand('review.createSuggestionsFromChanges', async (value: SCMResourceStates | SCMResourceUri, ...additionalSelected: SCMResourceUri[]) => {
 		let resources: vscode.Uri[];
-		if ('resourceStates' in value) {
-			resources = value.resourceStates.map(resource => resource.resourceUri);
+		const asResourceStates = value as Partial<SCMResourceStates>;
+		if (asResourceStates.resourceStates) {
+			resources = asResourceStates.resourceStates.map(resource => resource.resourceUri);
 		} else {
-			resources = [value.resourceUri];
+			const asResourceUri = value as SCMResourceUri;
+			resources = [asResourceUri.resourceUri];
 			if (additionalSelected) {
 				resources.push(...additionalSelected.map(resource => resource.resourceUri));
 			}
diff --git a/src/common/logger.ts b/src/common/logger.ts
@@ -7,6 +7,10 @@ import { Disposable } from './lifecycle';
 
 export const PR_TREE = 'PullRequestTree';
 
+interface Stringish {
+	toString: () => string;
+}
+
 class Log extends Disposable {
 	private readonly _outputChannel: vscode.LogOutputChannel;
 	private readonly _activePerfMarkers: Map<string, number> = new Map();
@@ -28,36 +32,40 @@ class Log extends Disposable {
 		this._activePerfMarkers.delete(marker);
 	}
 
-	private logString(message: any, component?: string): string {
+	private logString(message: string | Error | Stringish | Object, component?: string): string {
+		let logMessage: string;
 		if (typeof message !== 'string') {
+			const asString = message as Partial<Stringish>;
 			if (message instanceof Error) {
-				message = message.message;
-			} else if ('toString' in message) {
-				message = message.toString();
+				logMessage = message.message;
+			} else if (asString.toString) {
+				logMessage = asString.toString();
 			} else {
-				message = JSON.stringify(message);
+				logMessage = JSON.stringify(message);
 			}
+		} else {
+			logMessage = message;
 		}
-		return component ? `[${component}] ${message}` : message;
+		return component ? `[${component}] ${logMessage}` : logMessage;
 	}
 
-	public trace(message: any, component: string) {
+	public trace(message: string | Error | Stringish | Object, component: string) {
 		this._outputChannel.trace(this.logString(message, component));
 	}
 
-	public debug(message: any, component: string) {
+	public debug(message: string | Error | Stringish | Object, component: string) {
 		this._outputChannel.debug(this.logString(message, component));
 	}
 
-	public appendLine(message: any, component: string) {
+	public appendLine(message: string | Error | Stringish | Object, component: string) {
 		this._outputChannel.info(this.logString(message, component));
 	}
 
-	public warn(message: any, component?: string) {
+	public warn(message: string | Error | Stringish | Object, component?: string) {
 		this._outputChannel.warn(this.logString(message, component));
 	}
 
-	public error(message: any, component: string) {
+	public error(message: string | Error | Stringish | Object, component: string) {
 		this._outputChannel.error(this.logString(message, component));
 	}
 }
diff --git a/src/github/activityBarViewProvider.ts b/src/github/activityBarViewProvider.ts
@@ -12,7 +12,7 @@ import { formatError } from '../common/utils';
 import { getNonce, IRequestMessage, WebviewViewBase } from '../common/webview';
 import { ReviewManager } from '../view/reviewManager';
 import { FolderRepositoryManager } from './folderRepositoryManager';
-import { GithubItemStateEnum, IAccount, isTeam, ITeam, PullRequestMergeability, reviewerId, ReviewEvent, ReviewState } from './interface';
+import { GithubItemStateEnum, IAccount, isITeam, ITeam, PullRequestMergeability, reviewerId, ReviewEvent, ReviewState } from './interface';
 import { PullRequestModel } from './pullRequestModel';
 import { getDefaultMergeMethod } from './pullRequestOverview';
 import { PullRequestView } from './pullRequestOverviewCommon';
@@ -165,9 +165,9 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 			}
 		}
 
-		if (targetReviewer && isTeam(targetReviewer.reviewer)) {
+		if (targetReviewer && isITeam(targetReviewer.reviewer)) {
 			teamReviewers.push(targetReviewer.reviewer);
-		} else if (targetReviewer && !isTeam(targetReviewer.reviewer)) {
+		} else if (targetReviewer && !isITeam(targetReviewer.reviewer)) {
 			userReviewers.push(targetReviewer.reviewer);
 		}
 
diff --git a/src/github/createPRViewProvider.ts b/src/github/createPRViewProvider.ts
@@ -32,7 +32,7 @@ import {
 	titleAndBodyFrom,
 } from './folderRepositoryManager';
 import { GitHubRepository } from './githubRepository';
-import { IAccount, ILabel, IMilestone, IProject, isTeam, ITeam, MergeMethod, RepoAccessAndMergeMethods } from './interface';
+import { IAccount, ILabel, IMilestone, IProject, isITeam, ITeam, MergeMethod, RepoAccessAndMergeMethods } from './interface';
 import { BaseBranchMetadata, PullRequestGitHelper } from './pullRequestGitHelper';
 import { PullRequestModel } from './pullRequestModel';
 import { getDefaultMergeMethod } from './pullRequestOverview';
@@ -310,7 +310,7 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 			const users: IAccount[] = [];
 			const teams: ITeam[] = [];
 			for (const reviewer of reviewers) {
-				if (isTeam(reviewer)) {
+				if (isITeam(reviewer)) {
 					teams.push(reviewer);
 				} else {
 					users.push(reviewer);
diff --git a/src/github/graphql.ts b/src/github/graphql.ts
@@ -95,11 +95,13 @@ export interface Account extends Actor {
 }
 
 export function isAccount(x: Actor | Team | undefined | null): x is Account {
-	return !!x && 'name' in x && 'email' in x;
+	const asAccount = x as Partial<Account>;
+	return !!asAccount && !!asAccount?.name && !!asAccount?.email;
 }
 
 export function isTeam(x: Actor | Team | undefined | null): x is Team {
-	return !!x && 'slug' in x;
+	const asTeam = x as Partial<Team>;
+	return !!asTeam && !!asTeam?.slug;
 }
 
 export interface Team {
diff --git a/src/github/interface.ts b/src/github/interface.ts
@@ -105,26 +105,28 @@ export interface MergeQueueEntry {
 
 export function reviewerId(reviewer: ITeam | IAccount): string {
 	// We can literally get different login values for copilot depending on where it's coming from (already assignee vs suggested assingee)
-	return isTeam(reviewer) ? reviewer.id : (reviewer.specialDisplayName ?? reviewer.login);
+	return isITeam(reviewer) ? reviewer.id : (reviewer.specialDisplayName ?? reviewer.login);
 }
 
 export function reviewerLabel(reviewer: ITeam | IAccount | IActor | any): string {
-	return isTeam(reviewer) ? (reviewer.name ?? reviewer.slug ?? reviewer.id) : (reviewer.specialDisplayName ?? reviewer.login);
+	return isITeam(reviewer) ? (reviewer.name ?? reviewer.slug ?? reviewer.id) : (reviewer.specialDisplayName ?? reviewer.login);
 }
 
-export function isTeam(reviewer: ITeam | IAccount | IActor | any): reviewer is ITeam {
-	return 'org' in reviewer;
+export function isITeam(reviewer: ITeam | IAccount | IActor | any): reviewer is ITeam {
+	const asITeam = reviewer as Partial<ITeam>;
+	return !!asITeam.org;
 }
 
 export interface ISuggestedReviewer extends IAccount {
 	isAuthor: boolean;
 	isCommenter: boolean;
 }
 
-export function isSuggestedReviewer(
+export function isISuggestedReviewer(
 	reviewer: IAccount | ISuggestedReviewer | ITeam
 ): reviewer is ISuggestedReviewer {
-	return 'isAuthor' in reviewer && 'isCommenter' in reviewer;
+	const asISuggestedReviewer = reviewer as Partial<ISuggestedReviewer>;
+	return !!asISuggestedReviewer.isAuthor && !!asISuggestedReviewer.isCommenter;
 }
 
 export interface IProject {
diff --git a/src/github/pullRequestGitHelper.ts b/src/github/pullRequestGitHelper.ts
@@ -340,10 +340,7 @@ export class PullRequestGitHelper {
 
 	static async isRemoteCreatedForPullRequest(repository: Repository, remoteName: string) {
 		try {
-			Logger.debug(
-				`Check if remote '${remoteName}' is created for pull request - start`,
-				PullRequestGitHelper.ID,
-			);
+			Logger.debug(`Check if remote '${remoteName}' is created for pull request - start`, PullRequestGitHelper.ID);
 			const isForPR = await repository.getConfig(`remote.${remoteName}.${PullRequestRemoteMetadataKey}`);
 			Logger.debug(`Check if remote '${remoteName}' is created for pull request - end`, PullRequestGitHelper.ID);
 			return isForPR === 'true';
diff --git a/src/github/pullRequestModel.ts b/src/github/pullRequestModel.ts
@@ -1108,20 +1108,14 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		commit: OctokitCommon.PullsListCommitsResponseData[0],
 	): Promise<OctokitCommon.ReposGetCommitResponseFiles> {
 		try {
-			Logger.debug(
-				`Fetch file changes of commit ${commit.sha} in PR #${this.number} - enter`,
-				PullRequestModel.ID,
-			);
+			Logger.debug(`Fetch file changes of commit ${commit.sha} in PR #${this.number} - enter`, PullRequestModel.ID,);
 			const { octokit, remote } = await this.githubRepository.ensure();
 			const fullCommit = await octokit.call(octokit.api.repos.getCommit, {
 				owner: remote.owner,
 				repo: remote.repositoryName,
 				ref: commit.sha,
 			});
-			Logger.debug(
-				`Fetch file changes of commit ${commit.sha} in PR #${this.number} - done`,
-				PullRequestModel.ID,
-			);
+			Logger.debug(`Fetch file changes of commit ${commit.sha} in PR #${this.number} - done`, PullRequestModel.ID,);
 
 			return fullCommit.data.files ?? [];
 		} catch (e) {
@@ -1448,10 +1442,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			this._onDidChangeChangesSinceReview.fire();
 		}
 
-		Logger.debug(
-			`Fetch file changes and merge base of PR #${this.number} - done, total files ${files.length} `,
-			PullRequestModel.ID,
-		);
+		Logger.debug(`Fetch file changes and merge base of PR #${this.number} - done, total files ${files.length} `, PullRequestModel.ID,);
 		return files;
 	}
 
diff --git a/src/github/pullRequestOverview.ts b/src/github/pullRequestOverview.ts
@@ -19,7 +19,7 @@ import { FolderRepositoryManager } from './folderRepositoryManager';
 import {
 	GithubItemStateEnum,
 	IAccount,
-	isTeam,
+	isITeam,
 	ITeam,
 	MergeMethod,
 	MergeMethodsAvailability,
@@ -382,7 +382,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			quickPick.busy = false;
 			const acceptPromise: Promise<(IAccount | ITeam)[]> = asPromise<void>(quickPick.onDidAccept).then(() => {
 				const pickedReviewers: (IAccount | ITeam)[] | undefined = quickPick?.selectedItems.filter(item => item.user).map(item => item.user) as (IAccount | ITeam)[];
-				const botReviewers = this._existingReviewers.filter(reviewer => !isTeam(reviewer.reviewer) && reviewer.reviewer.accountType === 'Bot').map(reviewer => reviewer.reviewer);
+				const botReviewers = this._existingReviewers.filter(reviewer => !isITeam(reviewer.reviewer) && reviewer.reviewer.accountType === 'Bot').map(reviewer => reviewer.reviewer);
 				return pickedReviewers.concat(botReviewers);
 			});
 			const hidePromise = asPromise<void>(quickPick.onDidHide);
@@ -394,15 +394,15 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				const newUserReviewers: IAccount[] = [];
 				const newTeamReviewers: ITeam[] = [];
 				allReviewers.forEach(reviewer => {
-					const newReviewers: (IAccount | ITeam)[] = isTeam(reviewer) ? newTeamReviewers : newUserReviewers;
+					const newReviewers: (IAccount | ITeam)[] = isITeam(reviewer) ? newTeamReviewers : newUserReviewers;
 					newReviewers.push(reviewer);
 				});
 
 				const removedUserReviewers: IAccount[] = [];
 				const removedTeamReviewers: ITeam[] = [];
 				this._existingReviewers.forEach(existing => {
-					let newReviewers: (IAccount | ITeam)[] = isTeam(existing.reviewer) ? newTeamReviewers : newUserReviewers;
-					let removedReviewers: (IAccount | ITeam)[] = isTeam(existing.reviewer) ? removedTeamReviewers : removedUserReviewers;
+					let newReviewers: (IAccount | ITeam)[] = isITeam(existing.reviewer) ? newTeamReviewers : newUserReviewers;
+					let removedReviewers: (IAccount | ITeam)[] = isITeam(existing.reviewer) ? removedTeamReviewers : removedUserReviewers;
 					if (!newReviewers.find(newTeamReviewer => newTeamReviewer.id === existing.reviewer.id)) {
 						removedReviewers.push(existing.reviewer);
 					}
@@ -663,9 +663,9 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			}
 		}
 
-		if (targetReviewer && isTeam(targetReviewer.reviewer)) {
+		if (targetReviewer && isITeam(targetReviewer.reviewer)) {
 			teamReviewers.push(targetReviewer.reviewer);
-		} else if (targetReviewer && !isTeam(targetReviewer.reviewer)) {
+		} else if (targetReviewer && !isITeam(targetReviewer.reviewer)) {
 			userReviewers.push(targetReviewer.reviewer);
 		}
 
diff --git a/src/github/quickPicks.ts b/src/github/quickPicks.ts
@@ -12,7 +12,7 @@ import { DataUri } from '../common/uri';
 import { formatError } from '../common/utils';
 import { FolderRepositoryManager } from './folderRepositoryManager';
 import { GitHubRepository, TeamReviewerRefreshKind } from './githubRepository';
-import { AccountType, IAccount, ILabel, IMilestone, IProject, isSuggestedReviewer, isTeam, ISuggestedReviewer, ITeam, reviewerId, ReviewState } from './interface';
+import { AccountType, IAccount, ILabel, IMilestone, IProject, isISuggestedReviewer, isITeam, ISuggestedReviewer, ITeam, reviewerId, ReviewState } from './interface';
 import { IssueModel } from './issueModel';
 
 async function getItems<T extends IAccount | ITeam | ISuggestedReviewer>(context: vscode.ExtensionContext, skipList: Set<string>, users: T[], picked: boolean, tooManyAssignable: boolean = false): Promise<(vscode.QuickPickItem & { user?: T })[]> {
@@ -32,7 +32,7 @@ async function getItems<T extends IAccount | ITeam | ISuggestedReviewer>(context
 		const user = filteredUsers[i];
 
 		let detail: string | undefined;
-		if (isSuggestedReviewer(user)) {
+		if (isISuggestedReviewer(user)) {
 			detail = user.isAuthor && user.isCommenter
 				? vscode.l10n.t('Recently edited and reviewed changes to these files')
 				: user.isAuthor
@@ -43,7 +43,7 @@ async function getItems<T extends IAccount | ITeam | ISuggestedReviewer>(context
 		}
 
 		alreadyAssignedItems.push({
-			label: isTeam(user) ? `${user.org}/${user.slug}` : COPILOT_ACCOUNTS[user.login] ? COPILOT_ACCOUNTS[user.login].name : user.login,
+			label: isITeam(user) ? `${user.org}/${user.slug}` : COPILOT_ACCOUNTS[user.login] ? COPILOT_ACCOUNTS[user.login].name : user.login,
 			description: user.name,
 			user,
 			picked,
@@ -120,13 +120,13 @@ export async function getAssigneesQuickPickItems(folderRepositoryManager: Folder
 }
 
 function userThemeIcon(user: IAccount | ITeam) {
-	return (isTeam(user) ? new vscode.ThemeIcon('organization') : new vscode.ThemeIcon('account'));
+	return (isITeam(user) ? new vscode.ThemeIcon('organization') : new vscode.ThemeIcon('account'));
 }
 
 async function getReviewersQuickPickItems(folderRepositoryManager: FolderRepositoryManager, remoteName: string, isInOrganization: boolean, author: IAccount, existingReviewers: ReviewState[],
 	suggestedReviewers: ISuggestedReviewer[] | undefined, refreshKind: TeamReviewerRefreshKind,
 ): Promise<(vscode.QuickPickItem & { user?: IAccount | ITeam })[]> {
-	existingReviewers = existingReviewers.filter(reviewer => isTeam(reviewer.reviewer) || (reviewer.reviewer.accountType !== AccountType.Bot));
+	existingReviewers = existingReviewers.filter(reviewer => isITeam(reviewer.reviewer) || (reviewer.reviewer.accountType !== AccountType.Bot));
 	if (!suggestedReviewers) {
 		return [];
 	}
diff --git a/src/github/utils.ts b/src/github/utils.ts
@@ -361,8 +361,8 @@ export function convertRESTPullRequestToRawPullRequest(
 	};
 
 	// mergeable is not included in the list response, will need to fetch later
-	if ('mergeable' in pullRequest) {
-		item.mergeable = pullRequest.mergeable
+	if ((pullRequest as OctokitCommon.PullsGetResponseData).mergeable !== undefined) {
+		item.mergeable = (pullRequest as OctokitCommon.PullsGetResponseData).mergeable
 			? PullRequestMergeability.Mergeable
 			: PullRequestMergeability.NotMergeable;
 	}
@@ -596,14 +596,39 @@ export interface RestAccount {
 	type: string;
 }
 
+export interface GraphQLAccount {
+	login: string;
+	url: string;
+	avatarUrl: string;
+	email?: string;
+	id: string;
+	name?: string;
+	__typename: string;
+}
+
 export function parseAccount(
-	author: { login: string; url: string; avatarUrl: string; email?: string, id: string, name?: string, __typename: string } | RestAccount | null,
+	author: GraphQLAccount | RestAccount | null,
 	githubRepository?: GitHubRepository,
 ): IAccount {
 	if (author) {
-		const avatarUrl = 'avatarUrl' in author ? author.avatarUrl : author.avatar_url;
-		const id = 'node_id' in author ? author.node_id : author.id;
-		const url = 'html_url' in author ? author.html_url : author.url;
+		let avatarUrl: string;
+		let id: string;
+		let url: string;
+		let accountType: string;
+		if ((author as RestAccount).html_url) {
+			const asRestAccount = author as RestAccount;
+			avatarUrl = asRestAccount.avatar_url;
+			id = asRestAccount.node_id;
+			url = asRestAccount.html_url;
+			accountType = asRestAccount.type;
+		} else {
+			const asGraphQLAccount = author as GraphQLAccount;
+			avatarUrl = asGraphQLAccount.avatarUrl;
+			id = asGraphQLAccount.id;
+			url = asGraphQLAccount.url;
+			accountType = asGraphQLAccount.__typename;
+		}
+
 		// In some places, Copilot comes in as a user, and in others as a bot
 		return {
 			login: author.login,
@@ -613,7 +638,7 @@ export function parseAccount(
 			id,
 			name: author.name ?? COPILOT_ACCOUNTS[author.login]?.name ?? undefined,
 			specialDisplayName: COPILOT_ACCOUNTS[author.login] ? (author.name ?? COPILOT_ACCOUNTS[author.login].name) : undefined,
-			accountType: toAccountType('__typename' in author ? author.__typename : author.type),
+			accountType: toAccountType(accountType),
 		};
 	} else {
 		return {
diff --git a/src/issues/util.ts b/src/issues/util.ts
@@ -183,11 +183,9 @@ async function getUpstream(repositoriesManager: RepositoriesManager, repository:
 function extractContext(context: LinkContext): { fileUri: vscode.Uri | undefined, lineNumber: number | undefined } {
 	if (context instanceof vscode.Uri) {
 		return { fileUri: context, lineNumber: undefined };
-	} else if (context !== undefined && 'lineNumber' in context && 'uri' in context) {
-		return { fileUri: context.uri, lineNumber: context.lineNumber };
-	} else {
-		return { fileUri: undefined, lineNumber: undefined };
 	}
+	const asEditorLineNumberContext = context as Partial<EditorLineNumberContext> | undefined;
+	return { fileUri: asEditorLineNumberContext?.uri, lineNumber: asEditorLineNumberContext?.lineNumber };
 }
 
 function getFileAndPosition(context: LinkContext, positionInfo?: NewIssue): { uri: vscode.Uri | undefined, range: vscode.Range | vscode.NotebookRange | undefined } {
diff --git a/src/notifications/notificationItem.ts b/src/notifications/notificationItem.ts
diff --git a/src/notifications/notificationsFeatureRegistar.ts b/src/notifications/notificationsFeatureRegistar.ts
diff --git a/webviews/components/comment.tsx b/webviews/components/comment.tsx
diff --git a/webviews/components/reviewer.tsx b/webviews/components/reviewer.tsx
diff --git a/webviews/createPullRequestViewNew/app.tsx b/webviews/createPullRequestViewNew/app.tsx

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,10 @@ import { Disposable } from './lifecycle';`
`7`	`7`
`8`	`8`	`export const PR_TREE = 'PullRequestTree';`
`9`	`9`
	`10`	`+interface Stringish {`
	`11`	`+ toString: () => string;`
	`12`	`+}`
	`13`	`+`
`10`	`14`	`class Log extends Disposable {`
`11`	`15`	`private readonly _outputChannel: vscode.LogOutputChannel;`
`12`	`16`	`private readonly _activePerfMarkers: Map<string, number> = new Map();`
`@@ -28,36 +32,40 @@ class Log extends Disposable {`
`28`	`32`	`this._activePerfMarkers.delete(marker);`
`29`	`33`	`}`
`30`	`34`
`31`		`- private logString(message: any, component?: string): string {`
	`35`	`+ private logString(message: string \| Error \| Stringish \| Object, component?: string): string {`
	`36`	`+ let logMessage: string;`
`32`	`37`	`if (typeof message !== 'string') {`
	`38`	`+ const asString = message as Partial<Stringish>;`
`33`	`39`	`if (message instanceof Error) {`
`34`		`- message = message.message;`
`35`		`- } else if ('toString' in message) {`
`36`		`- message = message.toString();`
	`40`	`+ logMessage = message.message;`
	`41`	`+ } else if (asString.toString) {`
	`42`	`+ logMessage = asString.toString();`
`37`	`43`	`} else {`
`38`		`- message = JSON.stringify(message);`
	`44`	`+ logMessage = JSON.stringify(message);`
`39`	`45`	`}`
	`46`	`+ } else {`
	`47`	`+ logMessage = message;`
`40`	`48`	`}`
`41`		- return component ? `[${component}] ${message}` : message;
	`49`	+ return component ? `[${component}] ${logMessage}` : logMessage;
`42`	`50`	`}`
`43`	`51`
`44`		`- public trace(message: any, component: string) {`
	`52`	`+ public trace(message: string \| Error \| Stringish \| Object, component: string) {`
`45`	`53`	`this._outputChannel.trace(this.logString(message, component));`
`46`	`54`	`}`
`47`	`55`
`48`		`- public debug(message: any, component: string) {`
	`56`	`+ public debug(message: string \| Error \| Stringish \| Object, component: string) {`
`49`	`57`	`this._outputChannel.debug(this.logString(message, component));`
`50`	`58`	`}`
`51`	`59`
`52`		`- public appendLine(message: any, component: string) {`
	`60`	`+ public appendLine(message: string \| Error \| Stringish \| Object, component: string) {`
`53`	`61`	`this._outputChannel.info(this.logString(message, component));`
`54`	`62`	`}`
`55`	`63`
`56`		`- public warn(message: any, component?: string) {`
	`64`	`+ public warn(message: string \| Error \| Stringish \| Object, component?: string) {`
`57`	`65`	`this._outputChannel.warn(this.logString(message, component));`
`58`	`66`	`}`
`59`	`67`
`60`		`- public error(message: any, component: string) {`
	`68`	`+ public error(message: string \| Error \| Stringish \| Object, component: string) {`
`61`	`69`	`this._outputChannel.error(this.logString(message, component));`
`62`	`70`	`}`
`63`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import { formatError } from '../common/utils';`
`12`	`12`	`import { getNonce, IRequestMessage, WebviewViewBase } from '../common/webview';`
`13`	`13`	`import { ReviewManager } from '../view/reviewManager';`
`14`	`14`	`import { FolderRepositoryManager } from './folderRepositoryManager';`
`15`		`-import { GithubItemStateEnum, IAccount, isTeam, ITeam, PullRequestMergeability, reviewerId, ReviewEvent, ReviewState } from './interface';`
	`15`	`+import { GithubItemStateEnum, IAccount, isITeam, ITeam, PullRequestMergeability, reviewerId, ReviewEvent, ReviewState } from './interface';`
`16`	`16`	`import { PullRequestModel } from './pullRequestModel';`
`17`	`17`	`import { getDefaultMergeMethod } from './pullRequestOverview';`
`18`	`18`	`import { PullRequestView } from './pullRequestOverviewCommon';`
`@@ -165,9 +165,9 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`- if (targetReviewer && isTeam(targetReviewer.reviewer)) {`
	`168`	`+ if (targetReviewer && isITeam(targetReviewer.reviewer)) {`
`169`	`169`	`teamReviewers.push(targetReviewer.reviewer);`
`170`		`- } else if (targetReviewer && !isTeam(targetReviewer.reviewer)) {`
	`170`	`+ } else if (targetReviewer && !isITeam(targetReviewer.reviewer)) {`
`171`	`171`	`userReviewers.push(targetReviewer.reviewer);`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,13 @@ export interface Account extends Actor {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`export function isAccount(x: Actor \| Team \| undefined \| null): x is Account {`
`98`		`- return !!x && 'name' in x && 'email' in x;`
	`98`	`+ const asAccount = x as Partial<Account>;`
	`99`	`+ return !!asAccount && !!asAccount?.name && !!asAccount?.email;`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`export function isTeam(x: Actor \| Team \| undefined \| null): x is Team {`
`102`		`- return !!x && 'slug' in x;`
	`103`	`+ const asTeam = x as Partial<Team>;`
	`104`	`+ return !!asTeam && !!asTeam?.slug;`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`export interface Team {`
Original file line number	Diff line number	Diff line change
`@@ -105,26 +105,28 @@ export interface MergeQueueEntry {`
`105`	`105`
`106`	`106`	`export function reviewerId(reviewer: ITeam \| IAccount): string {`
`107`	`107`	`// We can literally get different login values for copilot depending on where it's coming from (already assignee vs suggested assingee)`
`108`		`- return isTeam(reviewer) ? reviewer.id : (reviewer.specialDisplayName ?? reviewer.login);`
	`108`	`+ return isITeam(reviewer) ? reviewer.id : (reviewer.specialDisplayName ?? reviewer.login);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`export function reviewerLabel(reviewer: ITeam \| IAccount \| IActor \| any): string {`
`112`		`- return isTeam(reviewer) ? (reviewer.name ?? reviewer.slug ?? reviewer.id) : (reviewer.specialDisplayName ?? reviewer.login);`
	`112`	`+ return isITeam(reviewer) ? (reviewer.name ?? reviewer.slug ?? reviewer.id) : (reviewer.specialDisplayName ?? reviewer.login);`
`113`	`113`	`}`
`114`	`114`
`115`		`-export function isTeam(reviewer: ITeam \| IAccount \| IActor \| any): reviewer is ITeam {`
`116`		`- return 'org' in reviewer;`
	`115`	`+export function isITeam(reviewer: ITeam \| IAccount \| IActor \| any): reviewer is ITeam {`
	`116`	`+ const asITeam = reviewer as Partial<ITeam>;`
	`117`	`+ return !!asITeam.org;`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`export interface ISuggestedReviewer extends IAccount {`
`120`	`121`	`isAuthor: boolean;`
`121`	`122`	`isCommenter: boolean;`
`122`	`123`	`}`
`123`	`124`
`124`		`-export function isSuggestedReviewer(`
	`125`	`+export function isISuggestedReviewer(`
`125`	`126`	`reviewer: IAccount \| ISuggestedReviewer \| ITeam`
`126`	`127`	`): reviewer is ISuggestedReviewer {`
`127`		`- return 'isAuthor' in reviewer && 'isCommenter' in reviewer;`
	`128`	`+ const asISuggestedReviewer = reviewer as Partial<ISuggestedReviewer>;`
	`129`	`+ return !!asISuggestedReviewer.isAuthor && !!asISuggestedReviewer.isCommenter;`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`export interface IProject {`