Changes before error encountered

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/common/protocol.ts

@@ -46,7 +46,7 @@ export class Protocol {
 				this.owner = this.getOwnerName(this.url.path) || '';
 			}
 		} catch (e) {
-			Logger.error(`Failed to parse '${uriString}'`, Protocol.ID);
+			Logger.error(`Failed to parse '${uriString}'`, Protocol._ID);
 			vscode.window.showWarningMessage(
 				vscode.l10n.t('Unable to parse remote \'{0}\'. Please check that it is correctly formatted.', uriString)
 			);

src/common/temporaryState.ts

@@ -16,29 +16,29 @@ export class TemporaryState extends vscode.Disposable {
 
 	constructor(private readonly _storageUri: vscode.Uri) {
 		super(() => disposeAll(this._disposables));
-	}
-
+	}
+
 	private get _path(): vscode.Uri {
 		return vscode.Uri.joinPath(this._storageUri, this._SUBPATH);
-	}
-
+	}
+
 	override dispose() {
 		disposeAll(this._disposables);
 		disposeAll(this._persistInSessionDisposables);
-	}
-
+	}
+
 	private _addDisposable(disposable: vscode.Disposable, persistInSession: boolean) {
 		if (persistInSession) {
 			this._persistInSessionDisposables.push(disposable);
 		} else {
 			if (this._disposables.length > 30) {
-				const oldDisposable = this._disposables.shift();
-				oldDisposable?.dispose();
-			}
+				const oldDisposable = this._disposables.shift();
+				oldDisposable?.dispose();
+			}
 			this._disposables.push(disposable);
 		}
-	}
-
+	}
+
 	private async _writeState(subpath: string, filename: string, contents: Uint8Array, persistInSession: boolean): Promise<vscode.Uri> {
 		let filePath: vscode.Uri = this._path;
 		const workspace = (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0)
@@ -64,10 +64,10 @@ export class TemporaryState extends vscode.Disposable {
 				}
 			}
 		};
-		this._addDisposable(dispose, persistInSession);
-		return file;
-	}
-
+		this._addDisposable(dispose, persistInSession);
+		return file;
+	}
+
 	private async _readState(subpath: string, filename: string): Promise<Uint8Array> {
 		let filePath: vscode.Uri = this._path;
 		const workspace = (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0)
@@ -82,36 +82,36 @@ export class TemporaryState extends vscode.Disposable {
 	}
 
 	static async init(context: vscode.ExtensionContext): Promise<vscode.Disposable | undefined> {
-		if (context.globalStorageUri && !tempState) {
-			tempState = new TemporaryState(context.globalStorageUri);
+		if (context.globalStorageUri && !tempState) {
+			tempState = new TemporaryState(context.globalStorageUri);
 			try {
 				await vscode.workspace.fs.delete(tempState._path, { recursive: true });
 			} catch (e) {
 				Logger.appendLine(`Error in initialization: ${e.message}`, TemporaryState.ID);
 			}
 			try {
-				await vscode.workspace.fs.createDirectory(tempState._path);
-			} catch (e) {
-				Logger.appendLine(`Error in initialization: ${e.message}`, TemporaryState.ID);
-			}
-			context.subscriptions.push(tempState);
-			return tempState;
-		}
-	}
-
-	static async write(subpath: string, filename: string, contents: Uint8Array, persistInSession: boolean = false): Promise<vscode.Uri | undefined> {
-		if (!tempState) {
-			return;
-		}
-
-		return tempState._writeState(subpath, filename, contents, persistInSession);
-	}
-
-	static async read(subpath: string, filename: string): Promise<Uint8Array | undefined> {
-		if (!tempState) {
-			return;
-		}
-
-		return tempState._readState(subpath, filename);
+				await vscode.workspace.fs.createDirectory(tempState._path);
+			} catch (e) {
+				Logger.appendLine(`Error in initialization: ${e.message}`, TemporaryState.ID);
+			}
+			context.subscriptions.push(tempState);
+			return tempState;
+		}
+	}
+
+	static async write(subpath: string, filename: string, contents: Uint8Array, persistInSession: boolean = false): Promise<vscode.Uri | undefined> {
+		if (!tempState) {
+			return;
+		}
+
+		return tempState._writeState(subpath, filename, contents, persistInSession);
+	}
+
+	static async read(subpath: string, filename: string): Promise<Uint8Array | undefined> {
+		if (!tempState) {
+			return;
+		}
+
+		return tempState._readState(subpath, filename);
 	}
 }

src/experimentationService.ts

@@ -24,8 +24,8 @@ export class ExperimentationTelemetry extends Disposable implements IExperimenta
 
 	constructor(private _baseReporter) {
 		super();
-		if (this._baseReporter) {
-			this._register(this._baseReporter);
+		if (baseReporter) {
+			this._register(baseReporter);
 		}
 	}
 

src/gitProviders/GitHubContactServiceProvider.ts

@@ -36,12 +36,12 @@ interface Contact {
 export class GitHubContactServiceProvider implements ContactServiceProvider {
 	private readonly _onNotifiedEmitter = new vscode.EventEmitter<NotifyContactServiceEventArgs>();
 
-	public onNotified: vscode.Event<NotifyContactServiceEventArgs> = this._onNotifiedEmitter.event;
+	public onNotified: vscode.Event<NotifyContactServiceEventArgs> = this.onNotifiedEmitter.event;
 
 	constructor(private readonly _pullRequestManager) {
 		pullRequestManager.folderManagers.forEach(folderManager => {
 			folderManager.onDidChangeAssignableUsers(e => {
-				this._notifySuggestedAccounts(e);
+				this.notifySuggestedAccounts(e);
 			});
 		});
 	}
@@ -68,7 +68,7 @@ export class GitHubContactServiceProvider implements ContactServiceProvider {
 
 				// if we get initialized and users are available on the pr manager
 				const allAssignableUsers: Map<string, IAccount> = new Map();
-				for (const pullRequestManager of this._pullRequestManager.folderManagers) {
+				for (const pullRequestManager of this.pullRequestManager.folderManagers) {
 					const batch = pullRequestManager.getAllAssignableUsers();
 					if (!batch) {
 						continue;
@@ -80,7 +80,7 @@ export class GitHubContactServiceProvider implements ContactServiceProvider {
 					}
 				}
 				if (allAssignableUsers.size > 0) {
-					this._notifySuggestedAccounts(Array.from(allAssignableUsers.values()));
+					this.notifySuggestedAccounts(Array.from(allAssignableUsers.values()));
 				}
 
 				break;
@@ -94,7 +94,7 @@ export class GitHubContactServiceProvider implements ContactServiceProvider {
 	private async _notifySuggestedAccounts(accounts: IAccount[]) {
 		let currentLoginUser: string | undefined;
 		try {
-			currentLoginUser = await this._getCurrentUserLogin();
+			currentLoginUser = await this.getCurrentUserLogin();
 		} catch (e) {
 			// If there are no GitHub repositories at the time of the above call, then we can get an error here.
 			// Since we don't care about the error and are just trying to notify accounts and not responding to user action,
@@ -103,7 +103,7 @@ export class GitHubContactServiceProvider implements ContactServiceProvider {
 		if (currentLoginUser) {
 			// Note: only suggest if the current user is part of the aggregated mentionable users
 			if (accounts.findIndex(u => u.login === currentLoginUser) !== -1) {
-				this._notifySuggestedUsers(
+				this.notifySuggestedUsers(
 					accounts
 						.filter(u => u.email)
 						.map(u => {
@@ -120,10 +120,10 @@ export class GitHubContactServiceProvider implements ContactServiceProvider {
 	}
 
 	private async _getCurrentUserLogin(): Promise<string | undefined> {
-		if (this._pullRequestManager.folderManagers.length === 0) {
+		if (this.pullRequestManager.folderManagers.length === 0) {
 			return undefined;
 		}
-		const origin = await this._pullRequestManager.folderManagers[0]?.getOrigin();
+		const origin = await this.pullRequestManager.folderManagers[0]?.getOrigin();
 		if (origin) {
 			const currentUser = origin.hub.currentUser ? await origin.hub.currentUser : undefined;
 			if (currentUser) {
@@ -133,7 +133,7 @@ export class GitHubContactServiceProvider implements ContactServiceProvider {
 	}
 
 	private _notify(type: string, body: { contacts: Contact[]; exclusive?: boolean }) {
-		this._onNotifiedEmitter.fire({
+		this.onNotifiedEmitter.fire({
 			type,
 			body,
 		});

src/github/copilotApi.ts

@@ -279,15 +279,15 @@ export class CopilotApi {
 
 	private _getHub(): GitHub | undefined {
 		let authProvider: AuthProvider | undefined;
-		if (this._credentialStore.isAuthenticated(AuthProvider.githubEnterprise) && hasEnterpriseUri()) {
+		if (this.credentialStore.isAuthenticated(AuthProvider.githubEnterprise) && hasEnterpriseUri()) {
 			authProvider = AuthProvider.githubEnterprise;
-		} else if (this._credentialStore.isAuthenticated(AuthProvider.github)) {
+		} else if (this.credentialStore.isAuthenticated(AuthProvider.github)) {
 			authProvider = AuthProvider.github;
 		} else {
 			return;
 		}
 
-		return this._credentialStore.getHub(authProvider);
+		return this.credentialStore.getHub(authProvider);
 	}
 }
 

src/github/copilotRemoteAgent.ts

@@ -98,7 +98,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 	) {
 		super();
 		this.gitOperationsManager = new GitOperationsManager(CopilotRemoteAgentManager.ID);
-		this._register(this._credentialStore.onDidChangeSessions((e: vscode.AuthenticationSessionsChangeEvent) => {
+		this._register(this.credentialStore.onDidChangeSessions((e: vscode.AuthenticationSessionsChangeEvent) => {
 			if (e.provider.id === 'github') {
 				this._copilotApiPromise = undefined; // Invalidate cached session
 			}
@@ -144,7 +144,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 	}
 
 	private async _initializeCopilotApi(): Promise<CopilotApi | undefined> {
-		return await getCopilotApi(this._credentialStore, this.telemetry);
+		return await getCopilotApi(this.credentialStore, this.telemetry);
 	}
 
 	public get enabled(): boolean {
@@ -206,7 +206,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 			return false;
 		}
 
-		if (!this._credentialStore.isAnyAuthenticated()) {
+		if (!this.credentialStore.isAnyAuthenticated()) {
 			// If not signed in, then we optimistically say it's available.
 			return true;
 		}
@@ -350,7 +350,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 	}
 
 	async tryPromptForAuthAndRepo(): Promise<FolderRepositoryManager | undefined> {
-		const authResult = await this._credentialStore.tryPromptForCopilotAuth();
+		const authResult = await this.credentialStore.tryPromptForCopilotAuth();
 		if (!authResult) {
 			return undefined;
 		}

src/github/folderRepositoryManager.ts

@@ -492,7 +492,7 @@ export class FolderRepositoryManager extends Disposable {
 
 		const activeRemotes = await this.getActiveRemotes();
 		const isAuthenticated = this.checkForAuthMatch(activeRemotes);
-		if (this._credentialStore.isAnyAuthenticated() && (activeRemotes.length === 0)) {
+		if (this.credentialStore.isAnyAuthenticated() && (activeRemotes.length === 0)) {
 			const areAllNeverGitHub = (await this.computeAllUnknownRemotes()).every(remote => GitHubManager.isNeverGitHub(vscode.Uri.parse(remote.normalizedHost).authority));
 			if (areAllNeverGitHub) {
 				this.state = ReposManagerState.RepositoriesLoaded;
@@ -1297,7 +1297,7 @@ export class FolderRepositoryManager extends Disposable {
 			parsedIssue.repositoryUrl!,
 			new Protocol(parsedIssue.repositoryUrl!),
 		);
-		return this.createGitHubRepository(remote, this._credentialStore, true, true);
+		return this.createGitHubRepository(remote, this.credentialStore, true, true);
 
 	}
 
@@ -2288,7 +2288,7 @@ export class FolderRepositoryManager extends Disposable {
 		if (!headGitHubRepo && this.gitHubRepositories.length > 0) {
 			const remote = parseRemote(protocol.repositoryName, remoteUrl, protocol);
 			if (remote) {
-				headGitHubRepo = await this.createGitHubRepository(remote, this._credentialStore, true, true);
+				headGitHubRepo = await this.createGitHubRepository(remote, this.credentialStore, true, true);
 			}
 		}
 		const matchingPR = await this.doGetMatchingPullRequestMetadataFromGitHub(headGitHubRepo, upstreamBranchName);
@@ -2323,7 +2323,7 @@ export class FolderRepositoryManager extends Disposable {
 			const protocol = new Protocol(remoteUrl ?? '');
 			const remote = parseRemote(remoteName, remoteUrl, protocol);
 			if (remote) {
-				headGitHubRepo = await this.createGitHubRepository(remote, this._credentialStore, true, true);
+				headGitHubRepo = await this.createGitHubRepository(remote, this.credentialStore, true, true);
 			}
 		}
 
@@ -2806,7 +2806,7 @@ export class FolderRepositoryManager extends Disposable {
 	public async publishBranch(pushRemote: Remote, branchName: string): Promise<GitHubRemote | undefined> {
 		const githubRepo = await this.createGitHubRepository(
 			pushRemote,
-			this._credentialStore,
+			this.credentialStore,
 		);
 		const permission = await githubRepo.getViewerPermission();
 		let selectedRemote: GitHubRemote | undefined;
@@ -2867,7 +2867,7 @@ export class FolderRepositoryManager extends Disposable {
 	}
 
 	public async getPreferredEmail(pullRequest: PullRequestModel): Promise<string | undefined> {
-		const isEmu = await this._credentialStore.getIsEmu(pullRequest.remote.authProviderId);
+		const isEmu = await this.credentialStore.getIsEmu(pullRequest.remote.authProviderId);
 		if (isEmu) {
 			return undefined;
 		}