Add review action back on Change / Staged Changes

Author: chrmarti

package.json

@@ -3322,6 +3322,28 @@
 					"when": "github.copilot.chat.reviewDiff.enabled && github.copilot.chat.review.sourceControlProgress && scmProvider == git && scmProviderRootUri in github.copilot.chat.reviewDiff.enabledRootUris"
 				}
 			],
+			"scm/resourceGroup/context": [
+				{
+					"command": "github.copilot.chat.review.stagedChanges",
+					"when": "github.copilot.chat.reviewDiff.enabled && !github.copilot.chat.review.sourceControlProgress && scmProvider == git && scmResourceGroup == index",
+					"group": "inline@-3"
+				},
+				{
+					"command": "github.copilot.chat.review.changes.cancel",
+					"when": "github.copilot.chat.reviewDiff.enabled && github.copilot.chat.review.sourceControlProgress && scmProvider == git && scmResourceGroup == index",
+					"group": "inline@-3"
+				},
+				{
+					"command": "github.copilot.chat.review.unstagedChanges",
+					"when": "github.copilot.chat.reviewDiff.enabled && !github.copilot.chat.review.sourceControlProgress && scmProvider == git && scmResourceGroup == workingTree",
+					"group": "inline@-3"
+				},
+				{
+					"command": "github.copilot.chat.review.changes.cancel",
+					"when": "github.copilot.chat.reviewDiff.enabled && github.copilot.chat.review.sourceControlProgress && scmProvider == git && scmResourceGroup == workingTree",
+					"group": "inline@-3"
+				}
+			],
 			"scm/inputBox": [
 				{
 					"command": "github.copilot.git.generateCommitMessage",

package.nls.json

@@ -11,10 +11,10 @@
 	"github.copilot.command.discardReviewSuggestion": "Discard",
 	"github.copilot.command.discardReviewSuggestionAndNext": "Discard and Go to Next",
 	"github.copilot.command.discardAllReviewSuggestion": "Discard All",
-	"github.copilot.command.reviewStagedChanges": "Code review - Staged changes",
-	"github.copilot.command.reviewUnstagedChanges": "Code review - Unstaged changes",
-	"github.copilot.command.reviewChanges": "Code review - Uncommitted changes",
-	"github.copilot.command.reviewChanges.cancel": "Code review - Cancel",
+	"github.copilot.command.reviewStagedChanges": "Code Review - Staged Changes",
+	"github.copilot.command.reviewUnstagedChanges": "Code Review - Unstaged Changes",
+	"github.copilot.command.reviewChanges": "Code Review - Uncommitted Changes",
+	"github.copilot.command.reviewChanges.cancel": "Code Review - Cancel",
 	"github.copilot.command.gotoPreviousReviewSuggestion": "Previous Suggestion",
 	"github.copilot.command.gotoNextReviewSuggestion": "Next Suggestion",
 	"github.copilot.command.continueReviewInInlineChat": "Discard and Copy to Inline Chat",

src/extension/inlineChat/vscode-node/inlineChatCommands.ts

@@ -59,6 +59,7 @@ export function registerInlineChatCommands(accessor: ServicesAccessor): IDisposa
 	const extensionContext = accessor.get(IVSCodeExtensionContext);
 	const configurationService = accessor.get(IConfigurationService);
 	const parserService = accessor.get(IParserService);
+	const commandExecutionService = accessor.get(IRunCommandExecutionService);
 
 	const disposables = new DisposableStore();
 	const doExplain = async (arg0: any, fromPalette?: true) => {
@@ -314,7 +315,7 @@ ${message}`,
 	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.stagedChanges', () => doReview(...instaService.invokeFunction(getServicesForReview), 'index', vscode.ProgressLocation.SourceControl)));
 	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.unstagedChanges', () => doReview(...instaService.invokeFunction(getServicesForReview), 'workingTree', vscode.ProgressLocation.SourceControl)));
 	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.changes', () => doReview(...instaService.invokeFunction(getServicesForReview), 'all', vscode.ProgressLocation.SourceControl)));
-	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.changes.cancel', () => cancelReview(vscode.ProgressLocation.SourceControl, accessor.get(IRunCommandExecutionService))));
+	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.changes.cancel', () => cancelReview(vscode.ProgressLocation.SourceControl, commandExecutionService)));
 	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.apply', doApplyReview));
 	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.applyAndNext', (commentThread: vscode.CommentThread) => doApplyReview(commentThread, true)));
 	disposables.add(vscode.commands.registerCommand('github.copilot.chat.review.applyShort', (commentThread: vscode.CommentThread) => doApplyReview(commentThread, true)));