Merge pull request #7723 from ntrogh/ntrogh-195-edits

Merge 1.95 release branch into main (also fixes video in release notes)

Author: ntrogh

build/sitemap.xml

@@ -360,6 +360,11 @@
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
+    <url>
+        <loc>https://code.visualstudio.com/docs/copilot/copilot-edits</loc>
+        <changefreq>weekly</changefreq>
+        <priority>0.8</priority>
+    </url>
     <url>
         <loc>https://code.visualstudio.com/docs/copilot/prompt-crafting</loc>
         <changefreq>weekly</changefreq>
@@ -370,6 +375,11 @@
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
+    <url>
+        <loc>https://code.visualstudio.com/docs/copilot/copilot-customization</loc>
+        <changefreq>weekly</changefreq>
+        <priority>0.8</priority>
+    </url>
     <url>
         <loc>https://code.visualstudio.com/docs/copilot/copilot-settings</loc>
         <changefreq>weekly</changefreq>

docs/copilot/copilot-edits.md

@@ -39,6 +39,13 @@ The team is continuously working on improving Copilot in VS Code and adding new
 * `setting(chat.editor.lineHeight)`: Line height in pixels in chat codeblocks.
 * `setting(chat.editor.wordWrap)`: Toggle line wrapping in chat codeblocks.
 
+## Edits settings
+
+* `setting(github.copilot.chat.edits.enabled)` _(Preview)_ - enable or disable Copilot Edits
+* `setting(chat.editing.confirmEditRequestRemoval)` - ask for confirmation before undoing an edit (default: `true`)
+* `setting(chat.editing.confirmEditRequestRetry)` - ask for confirmation before performing a redo of the last edit (default: `true`)
+* `setting(chat.editing.alwaysSaveWithGeneratedChanges)` - automatically save generated changes from Copilot Edits to disk (default: `false`)
+
 ## Inline Chat settings
 
 * `setting(inlineChat.acceptedOrDiscardBeforeSave)`: Controls whether pending Inline Chat sessions in an editor prevent saving the file.
@@ -54,6 +61,7 @@ The team is continuously working on improving Copilot in VS Code and adding new
 * `setting(github.copilot.chat.codeGeneration.instructions)` <i class="codicon codicon-beaker"></i>: A set of instructions that will be added to Copilot requests that generate code.
 * `setting(github.copilot.chat.codeGeneration.useInstructionFiles)` _(Preview)_: Controls whether code instructions from `.github/copilot-instructions.md` are added to Copilot requests.
 * `setting(github.copilot.chat.testGeneration.instructions)` <i class="codicon codicon-beaker"></i>: A set of instructions that will be added to Copilot requests that generate tests.
+* `setting(github.copilot.chat.reviewSelection.instructions)` _(Preview)_: A set of instructions that will be added to Copilot requests for reviewing the current editor selection.
 
 ## Debugging settings
 

docs/copilot/copilot-settings.md

@@ -23,6 +23,7 @@ Use natural language to chat with GitHub Copilot and get help with coding tasks.
 | Action | Description |
 |--------|-------------|
 | `kb(workbench.action.chat.open)` | Open the **Chat view** and start a chat conversation with Copilot by using natural language. |
+| `kb(workbench.action.chat.openEditSession)` | Open the **Copilot Edits view** and start a code editing session across multiple files. |
 | `kb(workbench.action.quickchat.toggle)` | Open **Quick Chat** and ask a quick question to Copilot. |
 | `kb(inlinechat.start)` | Start **Inline Chat** to send a chat request to Copilot directly from the editor. Use natural language or use `/` commands to give instructions to Copilot. |
 | <i class="codicon codicon-mention"></i> | Type `@` in chat or select <i class="codicon codicon-mention"></i> to view the list of *chat participants*, which are domain experts that can help you in a specific area. Extensions can also contribute additional participants.<br/>Example: `@workspace how is auth implemented?`  |
@@ -38,6 +39,27 @@ Use natural language to chat with GitHub Copilot and get help with coding tasks.
 > - Be specific, keep it simple, and ask follow-up questions to get the best results.
 > - Provide context by attaching files, symbols, or selections to your chat prompt.
 
+## Code editing session (Preview)
+
+Use Copilot Edits to start a code editing session where you can iterate quickly on AI-generated code edits that are applied directly across multiple files in your workspace.
+
+| Action | Description |
+|--------|-------------|
+| `kb(workbench.action.chat.openEditSession)` | Open the **Copilot Edits view** and start a code editing session across multiple files. |
+| <i class="codicon codicon-plus"></i> | Start a new edit session. |
+| `Accept` | Accept all current edits. |
+| `Discard` | Discard all current edits. |
+| <i class="codicon codicon-diff-multiple"></i> | View all edits in a multi-file diff editor. |
+| <i class="codicon codicon-discard"></i> | Undo the last edit. |
+| <i class="codicon codicon-redo"></i> | Redo the last edit. |
+| `Add Files...` | Attach files to working set. |
+
+> **Tips**
+>
+> - Add all files for which you want to get edits to the working set.
+> - Be specific and precise about the changes you want Copilot Edits to make.
+> - If you have a larger task, decompose it in smaller tasks and iterate often.
+
 ## Generate code from chat
 
 Copilot can generate code blocks in response to your chat prompts. Quickly apply the generated code in your project or insert it in a new file. For example, ask Copilot to optimize an algorithm in your code.
@@ -100,19 +122,29 @@ As you're coding in the editor, you can use Copilot to generate code completions
 
 ## Customize AI code generation
 
-Copilot can generate code based on your chat prompt. You can customize the generated code by providing instructions to Copilot. For example, you can ask that generated code always uses a specific coding style, such as private variables should always be prefixed with an underscore.
+Copilot can generate responses that match the coding style, tools, and developer workflow of your team or project, provided it has the right context. You can provide custom instructions to help Copilot adjust to your preferences, so that you don't have to provide these details every time you make a Copilot request. These custom instructions are automatically added to your requests. Get more information about [customizing Copilot in VS Code](/docs/copilot/copilot-customization.md).
 
 | Action | Description |
 |--------|-------------|
-| Code-generation instructions <i class="codicon codicon-beaker"></i> | Define instructions for code generation with GitHub Copilot in settings or import from a file. You can define language-specific instructions. [Get more information](https://code.visualstudio.com/updates/v1_93#_code-generation-instructions). |
-| Shared instructions <i class="codicon codicon-beaker"></i> | Define shared instructions for code generation in a `.gitHub/copilot-instructions.md` file in your workspace. These common instructions supplement your own personal code generation instructions.  |
-| Test-generation instructions <i class="codicon codicon-beaker"></i> | Define instructions for test generation with GitHub Copilot in settings or import from a file. You can define language-specific instructions. [Get more information](https://code.visualstudio.com/updates/v1_94#_custom-instructions-experimental). |
+| File-based instructions _(Preview)_ | Define shared instructions for code generation in a `.gitHub/copilot-instructions.md` file in your workspace. These common instructions supplement your own personal code-generation instructions.  |
+| Code-review instructions _(Preview)_ | Define instructions for using Copilot to review an editor selection in settings or import from a file. You can define language-specific instructions. |
+| Code-generation instructions <i class="codicon codicon-beaker"></i> | Define instructions for code generation with GitHub Copilot in settings or import from a file. You can define language-specific instructions. |
+| Test-generation instructions <i class="codicon codicon-beaker"></i> | Define instructions for test generation with GitHub Copilot in settings or import from a file. You can define language-specific instructions. |
 
 > **Tips**
 >
 > - Define language-specific instructions to get more accurate generated code for each language.
 > - Store your instructions in a file to easily share them with your team and across projects.
 
+## Review code (Preview)
+
+Copilot can do a quick review pass of a code block or perform a review of uncommitted changes in your workspace. Review feedback shows up as comments in the editor, where you can apply the suggestions.
+
+| Action | Description |
+|--------|-------------|
+| **Review and Comment** _(Preview)_ | Select a block of code, and select **Copilot** > **Review and Comment** from the editor context menu for quick review pass.  |
+| **Copilot Code Review** | Select the **Copilot Code Review** button in the Source Control view for a deeper review of all uncommitted changes. Join the [waitlist](https://gh.io/copilot-code-review-waitlist). |
+
 ## Generate tests
 
 Copilot can generate tests for functions and methods in your codebase. Get more information about [slash commands in Chat](/docs/copilot/copilot-chat.md#slash-commands).
@@ -121,6 +153,7 @@ Copilot can generate tests for functions and methods in your codebase. Get more
 |--------|-------------|
 | `/tests` | Generate tests for all or only the selected methods and functions in the editor. The generated tests are appended in an existing tests file or a new tests file is created.  |
 | `/setupTests` | Get help setting up a testing framework for your code. Get recommendation for a relevant testing framework, steps to set up and configure it, and suggestions for VS Code testing extensions.   |
+| `/fixTestFailure` | Ask Copilot for suggestions on how to fix failing tests. |
 | Test coverage <i class="codicon codicon-beaker"></i> | Generate tests for functions and methods that are not yet covered by tests. [Get more information](https://code.visualstudio.com/updates/v1_93#_generate-tests-based-on-test-coverage-experimental). |
 
 > **Tips**

docs/copilot/copilot-vscode-features.md

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be1a03a2a2869d65132321621ade57eb0e1671c8486b19aa8bb81b64a14d2773
+size 2477068