Merge branch 'microsoft:main' into not-close-file

Author: laharigandrapu11

.vscode/launch.json

@@ -102,12 +102,11 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Attach Web Test",
-			"program": "${workspaceFolder}/node_modules/vscode-test-web/out/index.js",
+			"program": "${workspaceFolder}/node_modules/@vscode/test-web/out/server/index.js",
 			"args": [
 				"--extensionTestsPath=dist/browser/test/index.js",
 				"--extensionDevelopmentPath=.",
 				"--browserType=chromium",
-				"--attach=9229"
 			],
 			"cascadeTerminateToConfigurations": [
 				"Launch Web Test"

CHANGELOG.md

@@ -1,7 +1,15 @@
 # Changelog
 
+## 0.114.2
+
+### Fixes
+
+- Copilot never shows as assignee. https://github.com/microsoft/vscode-pull-request-github/issues/7324
+
 ## 0.114.1
 
+### Fixes
+
 - Element with id Local Pull Request Branches is already registered. https://github.com/microsoft/vscode-pull-request-github/issues/7264
 
 ## 0.114.0

build/hygiene.js

@@ -56,7 +56,7 @@ function hygiene(some) {
 	const indentation = es.through(function (file) {
 		const lines = file.__lines;
 
-		lines.forEach((line, i) => {
+		lines?.forEach((line, i) => {
 			if (/^\s*$/.test(line)) {
 				// empty or whitespace lines are OK
 			} else if (/^[\t]*[^\s]/.test(line)) {

package.json

@@ -52,6 +52,7 @@
 		"onFileSystem:newIssue",
 		"onFileSystem:pr",
 		"onFileSystem:githubpr",
+		"onFileSystem:githubcommit",
 		"onFileSystem:review",
 		"onWebviewPanel:pr.codingAgentSessionLogView"
 	],
@@ -81,7 +82,8 @@
 				"name": "githubpr",
 				"fullName": "GitHub Pull Requests",
 				"description": "Chat participant for GitHub Pull Requests extension",
-				"when": "config.githubPullRequests.experimental.chat"
+				"when": "config.githubPullRequests.experimental.chat",
+				"isSticky": true
 			}
 		],
 		"configuration": {
@@ -3978,13 +3980,13 @@
 		"@types/webpack-env": "^1.16.0",
 		"@typescript-eslint/eslint-plugin": "6.10.0",
 		"@typescript-eslint/parser": "6.10.0",
-		"@vscode/test-electron": "^2.3.8",
+		"@vscode/test-electron": "^2.5.2",
 		"@vscode/test-web": "^0.0.71",
 		"assert": "^2.0.0",
 		"buffer": "^6.0.3",
 		"constants-browserify": "^1.0.0",
 		"crypto-browserify": "3.12.0",
-		"css-loader": "5.1.3",
+		"css-loader": "7.1.2",
 		"esbuild-loader": "4.2.2",
 		"eslint": "7.22.0",
 		"eslint-cli": "1.1.1",
@@ -4010,17 +4012,16 @@
 		"p-all": "^1.0.0",
 		"path-browserify": "1.0.1",
 		"process": "^0.11.10",
-		"raw-loader": "4.0.2",
 		"react-testing-library": "7.0.1",
 		"sinon": "9.0.0",
 		"source-map-support": "0.5.19",
 		"stream-browserify": "^3.0.0",
-		"style-loader": "2.0.0",
+		"style-loader": "4.0.0",
 		"svg-inline-loader": "^0.8.2",
 		"temp": "0.9.4",
 		"terser-webpack-plugin": "5.1.1",
 		"timers-browserify": "^2.0.12",
-		"ts-loader": "8.0.18",
+		"ts-loader": "9.5.2",
 		"tty": "1.0.1",
 		"typescript": "4.5.5",
 		"typescript-formatter": "^7.2.2",

src/common/uri.ts

@@ -92,6 +92,29 @@ export interface GitUriOptions {
 	base: boolean;
 }
 
+export interface GitHubCommitUriParams {
+	commit: string;
+	owner: string;
+	repo: string;
+}
+
+export function fromGitHubCommitUri(uri: vscode.Uri): GitHubCommitUriParams | undefined {
+	if (uri.scheme !== Schemes.GitHubCommit || uri.query === '') {
+		return undefined;
+	}
+	try {
+		return JSON.parse(uri.query) as GitHubCommitUriParams;
+	} catch (e) { }
+}
+
+export function toGitHubCommitUri(fileName: string, params: GitHubCommitUriParams): vscode.Uri {
+	return vscode.Uri.from({
+		scheme: Schemes.GitHubCommit,
+		path: `/${fileName}`,
+		query: JSON.stringify(params)
+	});
+}
+
 const ImageMimetypes = ['image/png', 'image/gif', 'image/jpeg', 'image/webp', 'image/tiff', 'image/bmp'];
 // Known media types that VS Code can handle: https://github.com/microsoft/vscode/blob/a64e8e5673a44e5b9c2d493666bde684bd5a135c/src/vs/base/common/mime.ts#L33-L84
 export const KnownMediaExtensions = [
@@ -651,6 +674,7 @@ export enum Schemes {
 	Repo = 'repo', // New issue file for passing data
 	Git = 'git', // File content from the git extension
 	PRQuery = 'prquery', // PR query tree item
+	GitHubCommit = 'githubcommit' // file content from GitHub for a commit
 }
 
 export const COPILOT_QUERY = vscode.Uri.from({ scheme: Schemes.PRQuery, path: 'copilot' });

src/extension.ts

@@ -39,6 +39,7 @@ import { CommentDecorationProvider } from './view/commentDecorationProvider';
 import { CompareChanges } from './view/compareChangesTreeDataProvider';
 import { CreatePullRequestHelper } from './view/createPullRequestHelper';
 import { FileTypeDecorationProvider } from './view/fileTypeDecorationProvider';
+import { GitHubCommitFileSystemProvider } from './view/githubFileContentProvider';
 import { getInMemPRFileSystemProvider } from './view/inMemPRContentProvider';
 import { PullRequestChangesTreeDataProvider } from './view/prChangesTreeDataProvider';
 import { PRNotificationDecorationProvider } from './view/prNotificationDecorationProvider';
@@ -227,7 +228,7 @@ async function init(
 	context.subscriptions.push(issuesFeatures);
 	await issuesFeatures.initialize();
 
-	const notificationsFeatures = new NotificationsFeatureRegister(credentialStore, reposManager, telemetry);
+	const notificationsFeatures = new NotificationsFeatureRegister(credentialStore, reposManager, telemetry, context);
 	context.subscriptions.push(notificationsFeatures);
 
 	context.subscriptions.push(new GitLensIntegration());
@@ -436,6 +437,8 @@ async function deferredActivate(context: vscode.ExtensionContext, showPRControll
 	const readOnlyMessage = new vscode.MarkdownString(vscode.l10n.t('Cannot edit this pull request file. [Check out](command:pr.checkoutFromReadonlyFile) this pull request to edit.'));
 	readOnlyMessage.isTrusted = { enabledCommands: ['pr.checkoutFromReadonlyFile'] };
 	context.subscriptions.push(vscode.workspace.registerFileSystemProvider(Schemes.Pr, inMemPRFileSystemProvider, { isReadonly: readOnlyMessage }));
+	const githubFilesystemProvider = new GitHubCommitFileSystemProvider(reposManager, apiImpl, credentialStore);
+	context.subscriptions.push(vscode.workspace.registerFileSystemProvider(Schemes.GitHubCommit, githubFilesystemProvider, { isReadonly: new vscode.MarkdownString(vscode.l10n.t('GitHub commits cannot be edited')) }));
 
 	await init(context, apiImpl, credentialStore, repositories, prTree, liveshareApiPromise, showPRController, reposManager, createPrHelper, copilotRemoteAgentManager, themeWatcher);
 	return apiImpl;

src/github/githubRepository.ts

@@ -12,6 +12,7 @@ import { Disposable, disposeAll } from '../common/lifecycle';
 import Logger from '../common/logger';
 import { GitHubRemote, parseRemote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
+import { PullRequestCommentController } from '../view/pullRequestCommentController';
 import { PRCommentControllerRegistry } from '../view/pullRequestCommentControllerRegistry';
 import { mergeQuerySchemaWithShared, OctokitCommon, Schema } from './common';
 import { CredentialStore, GitHub } from './credentials';
@@ -204,10 +205,10 @@ export class GitHubRepository extends Disposable {
 
 			await this.ensure();
 			this.commentsController = vscode.comments.createCommentController(
-				`github-browse-${this.remote.normalizedHost}-${this.remote.owner}-${this.remote.repositoryName}`,
+				`${PullRequestCommentController.PREFIX}-${this.remote.gitProtocol.normalizeUri()?.authority}-${this.remote.owner}-${this.remote.repositoryName}`,
 				`Pull Request (${this.remote.owner}/${this.remote.repositoryName})`,
 			);
-			this.commentsHandler = new PRCommentControllerRegistry(this.commentsController, this._telemetry);
+			this.commentsHandler = new PRCommentControllerRegistry(this.commentsController, this.telemetry);
 			this._register(this.commentsHandler);
 			this._register(this.commentsController);
 		} catch (e) {
@@ -234,7 +235,7 @@ export class GitHubRepository extends Disposable {
 		public remote: GitHubRemote,
 		public readonly rootUri: vscode.Uri,
 		private readonly _credentialStore: CredentialStore,
-		private readonly _telemetry: ITelemetry,
+		public readonly telemetry: ITelemetry,
 		silent: boolean = false
 	) {
 		super();
@@ -264,7 +265,7 @@ export class GitHubRepository extends Disposable {
 					"action": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 				}
 			*/
-			this._telemetry.sendTelemetryErrorEvent('pr.codespacesTokenError', {
+			this.telemetry.sendTelemetryErrorEvent('pr.codespacesTokenError', {
 				action: action.context
 			});
 
@@ -566,6 +567,19 @@ export class GitHubRepository extends Disposable {
 		return success;
 	}
 
+	async getCommitParent(ref: string): Promise<string | undefined> {
+		Logger.debug(`Fetch commit for ref ${ref} - enter`, this.id);
+		try {
+			const { octokit, remote } = await this.ensure();
+			const commit = (await octokit.call(octokit.api.repos.getCommit, { owner: remote.owner, repo: remote.repositoryName, ref })).data;
+			return commit.parents[0].sha;
+		} catch (e) {
+			Logger.error(`Fetching commit for ref ${ref} failed: ${e}`, this.id);
+		}
+		Logger.debug(`Fetch commit for ref ${ref} - done`, this.id);
+	}
+
+
 	async getAllPullRequests(page?: number): Promise<PullRequestData | undefined> {
 		let remote: GitHubRemote | undefined;
 		try {
@@ -950,7 +964,7 @@ export class GitHubRepository extends Disposable {
 		if (model) {
 			model.update(pullRequest);
 		} else {
-			model = new PullRequestModel(this._credentialStore, this._telemetry, this, this.remote, pullRequest);
+			model = new PullRequestModel(this._credentialStore, this.telemetry, this, this.remote, pullRequest);
 			const prModel = model;
 			const disposables: vscode.Disposable[] = [];
 			disposables.push(model.onDidChange(() => this._onPullRequestModelChanged(prModel)));

src/github/markdownUtils.ts

@@ -168,8 +168,9 @@ export async function issueMarkdown(
 			year: 'numeric',
 		})}  \n`,
 	);
+	const titleWithDraft = (issue instanceof PullRequestModel && issue.isDraft) ? `\[DRAFT\] ${issue.title}` : issue.title;
 	const title = marked
-		.parse(issue.title, {
+		.parse(titleWithDraft, {
 			renderer: new PlainTextRenderer(),
 		})
 		.trim();

src/github/pullRequestModel.ts

@@ -10,15 +10,15 @@ import gql from 'graphql-tag';
 import * as vscode from 'vscode';
 import { Repository } from '../api/api';
 import { COPILOT_ACCOUNTS, DiffSide, IComment, IReviewThread, SubjectType, ViewedState } from '../common/comment';
-import { getModifiedContentFromDiffHunk, parseDiff } from '../common/diffHunk';
+import { getGitChangeType, getModifiedContentFromDiffHunk, parseDiff } from '../common/diffHunk';
 import { commands } from '../common/executeCommands';
 import { GitChangeType, InMemFileChange, SlimFileChange } from '../common/file';
 import { GitHubRef } from '../common/githubRef';
 import Logger from '../common/logger';
 import { Remote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
 import { ClosedEvent, EventType, ReviewEvent, TimelineEvent } from '../common/timelineEvent';
-import { resolvePath, reviewPath, Schemes, toPRUri, toReviewUri } from '../common/uri';
+import { resolvePath, Schemes, toGitHubCommitUri, toPRUri, toReviewUri } from '../common/uri';
 import { formatError, isDescendant } from '../common/utils';
 import { InMemFileChangeModel, RemoteFileChangeModel } from '../view/fileChangeModel';
 import { OctokitCommon } from './common';
@@ -1111,6 +1111,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 					pullRequestId: this.graphNodeId,
 					teamIds: teamReviewers.map(t => t.id),
 					userIds: reviewers.filter(r => r.accountType !== AccountType.Bot).map(r => r.id),
+					botIds: reviewers.filter(r => r.accountType === AccountType.Bot).map(r => r.id),
 					union
 				},
 			},
@@ -1332,47 +1333,32 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		return vscode.commands.executeCommand('vscode.changes', vscode.l10n.t('Changes in Pull Request #{0}', pullRequestModel.number), args);
 	}
 
-	static async openCommitChanges(folderManager: FolderRepositoryManager, commitSha: string) {
+	static async openCommitChanges(githubRepository: GitHubRepository, commitSha: string) {
 		try {
-			// Get the repository from the folder manager
-			const repository = folderManager.repository;
-			if (!repository) {
-				vscode.window.showErrorMessage(vscode.l10n.t('No repository found'));
-				return;
-			}
-
-			// Get the commit to find its parent
-			const commit = await repository.getCommit(commitSha);
-			if (!commit.parents || commit.parents.length === 0) {
+			const parentCommit = await githubRepository.getCommitParent(commitSha);
+			if (!parentCommit) {
 				vscode.window.showErrorMessage(vscode.l10n.t('Commit {0} has no parent', commitSha.substring(0, 7)));
 				return;
 			}
-			const parentSha = commit.parents[0];
 
-			// Get the changes between the commit and its parent
-			const changes = await repository.diffBetween(parentSha, commitSha);
-			if (!changes || changes.length === 0) {
+			const changes = await githubRepository.compareCommits(parentCommit, commitSha);
+			if (!changes?.files || changes.files.length === 0) {
 				vscode.window.showInformationMessage(vscode.l10n.t('No changes found in commit {0}', commitSha.substring(0, 7)));
 				return;
 			}
 
 			// Create URI pairs for the multi diff editor using review scheme
 			const args: [vscode.Uri, vscode.Uri | undefined, vscode.Uri | undefined][] = [];
-			for (const change of changes) {
-				const rightRelativePath = path.relative(repository.rootUri.fsPath, change.uri.fsPath);
-				const rightPath = reviewPath(rightRelativePath, commitSha);
-				let rightUri = toReviewUri(rightPath, rightRelativePath, undefined, commitSha, false, { base: false }, repository.rootUri);
-
-				const leftRelativePath = path.relative(repository.rootUri.fsPath, change.originalUri.fsPath);
-				const leftPath = reviewPath(leftRelativePath, parentSha);
-				let leftUri = toReviewUri(leftPath, (change.status === GitChangeType.RENAME) ? path.relative(repository.rootUri.fsPath, change.originalUri.fsPath) : leftRelativePath, undefined, parentSha, false, { base: true }, repository.rootUri);
-
-				if (change.status === GitChangeType.ADD) {
+			for (const change of changes.files) {
+				const rightUri = toGitHubCommitUri(change.filename, { commit: commitSha, owner: githubRepository.remote.owner, repo: githubRepository.remote.repositoryName });
+				const leftUri = toGitHubCommitUri(change.previous_filename ?? change.filename, { commit: parentCommit, owner: githubRepository.remote.owner, repo: githubRepository.remote.repositoryName });
+				const changeType = getGitChangeType(change.status);
+				if (changeType === GitChangeType.ADD) {
 					// For added files, show against empty
 					args.push([rightUri, undefined, rightUri]);
-				} else if (change.status === GitChangeType.DELETE) {
+				} else if (changeType === GitChangeType.DELETE) {
 					// For deleted files, show old version against empty
-					args.push([rightPath, leftUri, undefined]);
+					args.push([rightUri, leftUri, undefined]);
 				} else {
 					args.push([rightUri, leftUri, rightUri]);
 				}
@@ -1381,7 +1367,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			/* __GDPR__
 				"pr.openCommitChanges" : {}
 			*/
-			folderManager.telemetry.sendTelemetryEvent('pr.openCommitChanges');
+			githubRepository.telemetry.sendTelemetryEvent('pr.openCommitChanges');
 
 			return commands.executeCommand('vscode.changes', vscode.l10n.t('Changes in Commit {0}', commitSha.substring(0, 7)), args);
 		} catch (error) {
@@ -2095,3 +2081,18 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		};
 	}
 }
+
+export async function isCopilotOnMyBehalf(pullRequestModel: PullRequestModel, currentUser: IAccount, coAuthors?: IAccount[]): Promise<boolean> {
+	if (!COPILOT_ACCOUNTS[pullRequestModel.author.login]) {
+		return false;
+	}
+
+	if (!coAuthors) {
+		coAuthors = await pullRequestModel.getCoAuthors();
+	}
+	if (!coAuthors || coAuthors.length === 0) {
+		return false;
+	}
+
+	return coAuthors.some(c => c.login === currentUser.login);
+}

src/github/pullRequestOverview.ts

@@ -33,7 +33,7 @@ import {
 	ReviewState,
 } from './interface';
 import { IssueOverviewPanel } from './issueOverview';
-import { PullRequestModel } from './pullRequestModel';
+import { isCopilotOnMyBehalf, PullRequestModel } from './pullRequestModel';
 import { PullRequestView } from './pullRequestOverviewCommon';
 import { pickEmail, reviewersQuickPick } from './quickPicks';
 import { parseReviewers } from './utils';
@@ -222,6 +222,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				isBranchUpToDateWithBase,
 				mergeability,
 				emailForCommit,
+				coAuthors,
 			] = await Promise.all([
 				this._folderRepositoryManager.resolvePullRequest(
 					pullRequestModel.remote.owner,
@@ -241,6 +242,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				this._folderRepositoryManager.isHeadUpToDateWithBase(pullRequestModel),
 				pullRequestModel.getMergeability(),
 				this._folderRepositoryManager.getPreferredEmail(pullRequestModel),
+				pullRequestModel.getCoAuthors()
 			]);
 			if (!pullRequest) {
 				throw new Error(
@@ -293,7 +295,8 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				isIssue: false,
 				emailForCommit,
 				currentUserReviewState: reviewState,
-				revertable: pullRequest.state === GithubItemStateEnum.Merged
+				revertable: pullRequest.state === GithubItemStateEnum.Merged,
+				isCopilotOnMyBehalf: await isCopilotOnMyBehalf(pullRequest, currentUser, coAuthors)
 			};
 			this._postMessage({
 				command: 'pr.initialize',
@@ -538,7 +541,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	private async openCommitChanges(message: IRequestMessage<OpenCommitChangesArgs>): Promise<void> {
 		try {
 			const { commitSha } = message.args;
-			await PullRequestModel.openCommitChanges(this._folderRepositoryManager, commitSha);
+			await PullRequestModel.openCommitChanges(this._item.githubRepository, commitSha);
 		} catch (error) {
 			Logger.error(`Failed to open commit changes: ${formatError(error)}`, PullRequestOverviewPanel.ID);
 			vscode.window.showErrorMessage(vscode.l10n.t('Failed to open commit changes: {0}', formatError(error)));