Remove uses of property existence with in (#6932)

Author: alexr00

resources/icons/dark/output.svg

@@ -1331,12 +1331,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));
 			}

src/commands.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));
 	}
 }

src/common/logger.ts

@@ -11,7 +11,7 @@ import fetch from 'cross-fetch';
 import * as vscode from 'vscode';
 import { Repository } from '../api/api';
 import { EXTENSION_ID } from '../constants';
-import { IAccount, isTeam, ITeam, reviewerId } from '../github/interface';
+import { IAccount, isITeam, ITeam, reviewerId } from '../github/interface';
 import { PullRequestModel } from '../github/pullRequestModel';
 import { GitChangeType } from './file';
 import Logger from './logger';
@@ -322,7 +322,7 @@ export namespace DataUri {
 						await doFetch();
 					} catch (retryError) {
 						// Log the error and return a generic user icon instead of crashing
-						const userIdentifier = isTeam(user) ? `${user.org}/${user.slug}` : user.login || 'unknown';
+						const userIdentifier = isITeam(user) ? `${user.org}/${user.slug}` : user.login || 'unknown';
 						Logger.error(`Failed to fetch avatar after retry for user ${userIdentifier}: ${retryError}`, 'avatarCirclesAsImageDataUris');
 						return genericUserIconAsImageDataURI(width, height);
 					}

src/common/uri.ts

@@ -13,7 +13,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, ReviewEventEnum, ReviewState } from './interface';
+import { GithubItemStateEnum, IAccount, isITeam, ITeam, PullRequestMergeability, reviewerId, ReviewEventEnum, ReviewState } from './interface';
 import { PullRequestModel } from './pullRequestModel';
 import { getDefaultMergeMethod } from './pullRequestOverview';
 import { PullRequestView } from './pullRequestOverviewCommon';
@@ -154,9 +154,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);
 		}
 

src/github/activityBarViewProvider.ts

@@ -33,7 +33,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';
@@ -315,7 +315,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);

src/github/createPRViewProvider.ts

@@ -121,11 +121,13 @@ export interface Account extends Actor {
 }
 
 export function isAccount(x: Actor | Team | Node | 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 | Node | undefined | null): x is Team {
-	return !!x && 'slug' in x;
+	const asTeam = x as Partial<Team>;
+	return !!asTeam && !!asTeam?.slug;
 }
 
 export interface Team {

src/github/graphql.ts

@@ -104,26 +104,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 {

src/github/interface.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';

src/github/pullRequestGitHelper.ts

@@ -1256,20 +1256,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) {
@@ -1552,10 +1546,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;
 	}