Skip to content

Commit f6718e4

Browse files
Copilotalexr00
andauthored
Remove deprecated review.suggestDiff command (#7822)
* Initial plan * Remove review.suggestDiff command completely Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com> * Revert test fixture changes as requested Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>
1 parent 3ec7758 commit f6718e4

File tree

3 files changed

+0
-91
lines changed

3 files changed

+0
-91
lines changed

package.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,11 +1041,6 @@
10411041
"title": "%command.review.openLocalFile.title%",
10421042
"icon": "$(go-to-file)"
10431043
},
1044-
{
1045-
"command": "review.suggestDiff",
1046-
"title": "%command.review.suggestDiff.title%",
1047-
"category": "%command.pull.request.category%"
1048-
},
10491044
{
10501045
"command": "pr.refreshList",
10511046
"title": "%command.pr.refreshList.title%",
@@ -2110,10 +2105,6 @@
21102105
"command": "pr.openSessionLogFromDescription",
21112106
"when": "false"
21122107
},
2113-
{
2114-
"command": "review.suggestDiff",
2115-
"when": "false"
2116-
},
21172108
{
21182109
"command": "review.approve",
21192110
"when": "false"
@@ -3067,11 +3058,6 @@
30673058
}
30683059
],
30693060
"scm/title": [
3070-
{
3071-
"command": "review.suggestDiff",
3072-
"when": "scmProvider =~ /^git|^remoteHub:github/ && scmProviderRootUri in github:reposInReviewMode",
3073-
"group": "inline"
3074-
},
30753061
{
30763062
"command": "pr.create",
30773063
"when": "scmProvider =~ /^git|^remoteHub:github/ && scmProviderRootUri in github:reposNotInReviewMode",

package.nls.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@
205205
"command.pr.checkoutByNumber.title": "Checkout Pull Request by Number",
206206
"command.review.openFile.title": "Open File",
207207
"command.review.openLocalFile.title": "Open File",
208-
"command.review.suggestDiff.title": "Suggest Edit",
209208
"command.review.approve.title": "Approve",
210209
"command.review.comment.title": "Comment",
211210
"command.review.requestChanges.title": "Request Changes",

src/commands.ts

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -285,82 +285,6 @@ export function registerCommands(
285285
),
286286
);
287287

288-
context.subscriptions.push(
289-
vscode.commands.registerCommand('review.suggestDiff', async e => {
290-
const hasShownMessageKey = 'githubPullRequest.suggestDiffMessage';
291-
const hasShownMessage = context.globalState.get(hasShownMessageKey, false);
292-
if (!hasShownMessage) {
293-
await context.globalState.update(hasShownMessageKey, true);
294-
const documentation = vscode.l10n.t('Open documentation');
295-
const result = await vscode.window.showInformationMessage(vscode.l10n.t('You can now make suggestions from review comments, just like on GitHub.com. See the documentation for more details.'),
296-
{ modal: true }, documentation);
297-
if (result === documentation) {
298-
return vscode.env.openExternal(vscode.Uri.parse('https://github.com/microsoft/vscode-pull-request-github/blob/main/documentation/suggestAChange.md'));
299-
}
300-
}
301-
try {
302-
const folderManager = await chooseItem<FolderRepositoryManager>(
303-
reposManager.folderManagers,
304-
itemValue => pathLib.basename(itemValue.repository.rootUri.fsPath),
305-
);
306-
if (!folderManager || !folderManager.activePullRequest) {
307-
return;
308-
}
309-
310-
const { indexChanges, workingTreeChanges } = folderManager.repository.state;
311-
312-
if (!indexChanges.length) {
313-
if (workingTreeChanges.length) {
314-
const yes = vscode.l10n.t('Yes');
315-
const stageAll = await vscode.window.showWarningMessage(
316-
vscode.l10n.t('There are no staged changes to suggest.\n\nWould you like to automatically stage all your of changes and suggest them?'),
317-
{ modal: true },
318-
yes,
319-
);
320-
if (stageAll === yes) {
321-
await vscode.commands.executeCommand('git.stageAll');
322-
} else {
323-
return;
324-
}
325-
} else {
326-
vscode.window.showInformationMessage(vscode.l10n.t('There are no changes to suggest.'));
327-
return;
328-
}
329-
}
330-
331-
const diff = await folderManager.repository.diff(true);
332-
333-
let suggestEditMessage = vscode.l10n.t('Suggested edit:\n');
334-
if (e && e.inputBox && e.inputBox.value) {
335-
suggestEditMessage = `${e.inputBox.value}\n`;
336-
e.inputBox.value = '';
337-
}
338-
339-
const suggestEditText = `${suggestEditMessage}\`\`\`diff\n${diff}\n\`\`\``;
340-
await folderManager.activePullRequest.createIssueComment(suggestEditText);
341-
342-
// Reset HEAD and then apply reverse diff
343-
await vscode.commands.executeCommand('git.unstageAll');
344-
345-
const tempFilePath = pathLib.join(
346-
folderManager.repository.rootUri.fsPath,
347-
'.git',
348-
`${folderManager.activePullRequest.number}.diff`,
349-
);
350-
const encoder = new TextEncoder();
351-
const tempUri = vscode.Uri.file(tempFilePath);
352-
353-
await vscode.workspace.fs.writeFile(tempUri, encoder.encode(diff));
354-
await folderManager.repository.apply(tempFilePath, true);
355-
await vscode.workspace.fs.delete(tempUri);
356-
} catch (err) {
357-
const moreError = `${err}${err.stderr ? `\n${err.stderr}` : ''}`;
358-
Logger.error(`Applying patch failed: ${moreError}`, logId);
359-
vscode.window.showErrorMessage(vscode.l10n.t('Applying patch failed: {0}', formatError(err)));
360-
}
361-
}),
362-
);
363-
364288
context.subscriptions.push(
365289
vscode.commands.registerCommand('pr.openFileOnGitHub', async (e: GitFileChangeNode | RemoteFileChangeNode) => {
366290
if (e instanceof RemoteFileChangeNode) {

0 commit comments

Comments
 (0)