Create Pull Request Suggestions hard to find in SCM view (#6180)

Fixes #6163

Author: alexr00

package.json

@@ -2469,6 +2469,13 @@
 					"group": "inline@-2"
 				}
 			],
+			"scm/resourceState/context": [
+				{
+					"command": "review.createSuggestionsFromChanges",
+					"when": "scmProviderRootUri in github:reposInReviewMode && scmProvider =~ /^git|^remoteHub:github/ && scmResourceGroup == workingTree",
+					"group": "1_modification@5"
+				}
+			],
 			"comments/commentThread/context": [
 				{
 					"command": "pr.createComment",

src/commands.ts

@@ -1154,16 +1154,25 @@ ${contents}
 		}),
 	);
 
-	context.subscriptions.push(vscode.commands.registerCommand('review.createSuggestionsFromChanges', async (value: { resourceStates: { resourceUri }[] }) => {
-		if (value.resourceStates.length === 0) {
+	context.subscriptions.push(vscode.commands.registerCommand('review.createSuggestionsFromChanges', async (value: ({ resourceStates: { resourceUri }[] }) | ({ resourceUri: vscode.Uri }), ...additionalSelected: ({ resourceUri: vscode.Uri })[]) => {
+		let resources: vscode.Uri[];
+		if ('resourceStates' in value) {
+			resources = value.resourceStates.map(resource => resource.resourceUri);
+		} else {
+			resources = [value.resourceUri];
+			if (additionalSelected) {
+				resources.push(...additionalSelected.map(resource => resource.resourceUri));
+			}
+		}
+		if (resources.length === 0) {
 			return;
 		}
-		const folderManager = reposManager.getManagerForFile(value.resourceStates[0].resourceUri);
+		const folderManager = reposManager.getManagerForFile(resources[0]);
 		if (!folderManager || !folderManager.activePullRequest) {
 			return;
 		}
 		const reviewManager = ReviewManager.getReviewManagerForFolderManager(reviewsManager.reviewManagers, folderManager);
-		return reviewManager?.createSuggestionsFromChanges();
+		return reviewManager?.createSuggestionsFromChanges(resources);
 	}));
 
 	context.subscriptions.push(vscode.commands.registerDiffInformationCommand('review.createSuggestionFromChange', async (diffLines: vscode.LineChange[]) => {

src/view/reviewManager.ts

@@ -755,12 +755,13 @@ export class ReviewManager {
 		};
 	}
 
-	async createSuggestionsFromChanges() {
+	async createSuggestionsFromChanges(resources: vscode.Uri[]) {
+		const resourceStrings = resources.map(resource => resource.toString());
 		let hasError: boolean = false;
 		const convertedFiles: vscode.Uri[] = [];
 		await vscode.window.withProgress({ location: vscode.ProgressLocation.Window, title: 'Converting changes to suggestions' }, async () => {
 			await Promise.all(this._folderRepoManager.repository.state.workingTreeChanges.map(async changeFile => {
-				if (changeFile.status !== Status.MODIFIED) {
+				if (!resourceStrings.includes(changeFile.uri.toString()) || (changeFile.status !== Status.MODIFIED)) {
 					return;
 				}
 				const diff = parsePatch(await this._folderRepoManager.repository.diffWithHEAD(changeFile.uri.fsPath));