|
4 | 4 | */ |
5 | 5 |
|
6 | 6 | import * as vscode from 'vscode' |
| 7 | +import path from 'path' |
7 | 8 | import { Position, TextEditor, window } from 'vscode' |
8 | 9 | import { getLogger } from '../../../shared/logger' |
| 10 | +import { amazonQDiffScheme, amazonQTabSuffix } from '../../../shared/constants' |
| 11 | +import { disposeOnEditorClose } from '../../../shared/utilities/editorUtilities' |
| 12 | +import { |
| 13 | + applyChanges, |
| 14 | + createTempFileForDiff, |
| 15 | + getSelectionFromRange, |
| 16 | +} from '../../../shared/utilities/textDocumentUtilities' |
| 17 | +import { extractFileAndCodeSelectionFromMessage, fs, getErrorMsg, getIndentedCode, ToolkitError } from '../../../shared' |
| 18 | + |
| 19 | +class ContentProvider implements vscode.TextDocumentContentProvider { |
| 20 | + constructor(private uri: vscode.Uri) {} |
| 21 | + |
| 22 | + provideTextDocumentContent(_uri: vscode.Uri) { |
| 23 | + return fs.readFileText(this.uri.fsPath) |
| 24 | + } |
| 25 | +} |
| 26 | + |
| 27 | +const chatDiffCode = 'ChatDiff' |
| 28 | +const ChatDiffError = ToolkitError.named(chatDiffCode) |
9 | 29 |
|
10 | 30 | export class EditorContentController { |
11 | 31 | /* * |
@@ -52,4 +72,106 @@ export class EditorContentController { |
52 | 72 | ) |
53 | 73 | } |
54 | 74 | } |
| 75 | + |
| 76 | + /** |
| 77 | + * Accepts and applies a diff to a file, then closes the associated diff view tab. |
| 78 | + * |
| 79 | + * @param {any} message - The message containing diff information. |
| 80 | + * @returns {Promise<void>} A promise that resolves when the diff is applied and the tab is closed. |
| 81 | + * |
| 82 | + * @description |
| 83 | + * This method performs the following steps: |
| 84 | + * 1. Extracts file path and selection from the message. |
| 85 | + * 2. If valid file path, non-empty code, and selection are present: |
| 86 | + * a. Opens the document. |
| 87 | + * b. Gets the indented code to update. |
| 88 | + * c. Applies the changes to the document. |
| 89 | + * d. Attempts to close the diff view tab for the file. |
| 90 | + * |
| 91 | + * @throws {Error} If there's an issue opening the document or applying changes. |
| 92 | + */ |
| 93 | + public async acceptDiff(message: any) { |
| 94 | + const errorNotification = 'Unable to Apply code changes.' |
| 95 | + const { filePath, selection } = extractFileAndCodeSelectionFromMessage(message) |
| 96 | + |
| 97 | + if (filePath && message?.code?.trim().length > 0 && selection) { |
| 98 | + try { |
| 99 | + const doc = await vscode.workspace.openTextDocument(filePath) |
| 100 | + |
| 101 | + const code = getIndentedCode(message, doc, selection) |
| 102 | + const range = getSelectionFromRange(doc, selection) |
| 103 | + await applyChanges(doc, range, code) |
| 104 | + |
| 105 | + // Sets the editor selection from the start of the given range, extending it by the number of lines in the code till the end of the last line |
| 106 | + const editor = await vscode.window.showTextDocument(doc) |
| 107 | + editor.selection = new vscode.Selection( |
| 108 | + range.start, |
| 109 | + new Position(range.start.line + code.split('\n').length, Number.MAX_SAFE_INTEGER) |
| 110 | + ) |
| 111 | + |
| 112 | + // If vscode.diff is open for the filePath then close it. |
| 113 | + vscode.window.tabGroups.all.flatMap(({ tabs }) => |
| 114 | + tabs.map((tab) => { |
| 115 | + if (tab.label === `${path.basename(filePath)} ${amazonQTabSuffix}`) { |
| 116 | + const tabClosed = vscode.window.tabGroups.close(tab) |
| 117 | + if (!tabClosed) { |
| 118 | + getLogger().error( |
| 119 | + '%s: Unable to close the diff view tab for %s', |
| 120 | + chatDiffCode, |
| 121 | + tab.label |
| 122 | + ) |
| 123 | + } |
| 124 | + } |
| 125 | + }) |
| 126 | + ) |
| 127 | + } catch (error) { |
| 128 | + void vscode.window.showInformationMessage(errorNotification) |
| 129 | + const wrappedError = ChatDiffError.chain(error, `Failed to Accept Diff`, { code: chatDiffCode }) |
| 130 | + getLogger().error('%s: Failed to open diff view %s', chatDiffCode, getErrorMsg(wrappedError, true)) |
| 131 | + throw wrappedError |
| 132 | + } |
| 133 | + } |
| 134 | + } |
| 135 | + |
| 136 | + /** |
| 137 | + * Displays a diff view comparing proposed changes with the existing file. |
| 138 | + * |
| 139 | + * How is diff generated: |
| 140 | + * 1. Creates a temporary file as a clone of the original file. |
| 141 | + * 2. Applies the proposed changes to the temporary file within the selected range. |
| 142 | + * 3. Opens a diff view comparing original file to the temporary file. |
| 143 | + * |
| 144 | + * This approach ensures that the diff view only shows the changes proposed by Amazon Q, |
| 145 | + * isolating them from any other modifications in the original file. |
| 146 | + * |
| 147 | + * @param message the message from Amazon Q chat |
| 148 | + */ |
| 149 | + public async viewDiff(message: any, scheme: string = amazonQDiffScheme) { |
| 150 | + const errorNotification = 'Unable to Open Diff.' |
| 151 | + const { filePath, selection } = extractFileAndCodeSelectionFromMessage(message) |
| 152 | + |
| 153 | + try { |
| 154 | + if (filePath && message?.code?.trim().length > 0 && selection) { |
| 155 | + const originalFileUri = vscode.Uri.file(filePath) |
| 156 | + const uri = await createTempFileForDiff(originalFileUri, message, selection, scheme) |
| 157 | + |
| 158 | + // Register content provider and show diff |
| 159 | + const contentProvider = new ContentProvider(uri) |
| 160 | + const disposable = vscode.workspace.registerTextDocumentContentProvider(scheme, contentProvider) |
| 161 | + await vscode.commands.executeCommand( |
| 162 | + 'vscode.diff', |
| 163 | + originalFileUri, |
| 164 | + uri, |
| 165 | + `${path.basename(filePath)} ${amazonQTabSuffix}` |
| 166 | + ) |
| 167 | + |
| 168 | + disposeOnEditorClose(uri, disposable) |
| 169 | + } |
| 170 | + } catch (error) { |
| 171 | + void vscode.window.showInformationMessage(errorNotification) |
| 172 | + const wrappedError = ChatDiffError.chain(error, `Failed to Open Diff View`, { code: chatDiffCode }) |
| 173 | + getLogger().error('%s: Failed to open diff view %s', chatDiffCode, getErrorMsg(wrappedError, true)) |
| 174 | + throw wrappedError |
| 175 | + } |
| 176 | + } |
55 | 177 | } |
0 commit comments