Skip to content

Commit 537502b

Browse files
committed
Merge branch 'main' into vnext
2 parents 1e27ff2 + 63ae03d commit 537502b

24 files changed

+155
-95
lines changed

api/extension-guides/chat.md

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -288,22 +288,24 @@ The following code snippet shows how to implement participant detection at the p
288288
```json
289289
"contributes": {
290290
"chatParticipants": [
291-
"id": "chat-sample.cat",
292-
"fullName": "Cat",
293-
"name": "cat",
294-
"description": "Meow! What can I teach you?",
291+
{
292+
"id": "chat-sample.cat",
293+
"fullName": "Cat",
294+
"name": "cat",
295+
"description": "Meow! What can I teach you?",
295296

296-
"disambiguation": [
297-
{
298-
"category": "cat",
299-
"description": "The user wants to learn a specific computer science topic in an informal way.",
300-
"examples": [
301-
"Teach me C++ pointers using metaphors",
302-
"Explain to me what is a linked list in a simple way",
303-
"Can you explain to me what is a function in programming?"
304-
]
305-
}
306-
]
297+
"disambiguation": [
298+
{
299+
"category": "cat",
300+
"description": "The user wants to learn a specific computer science topic in an informal way.",
301+
"examples": [
302+
"Teach me C++ pointers using metaphors",
303+
"Explain to me what is a linked list in a simple way",
304+
"Can you explain to me what is a function in programming?"
305+
]
306+
}
307+
]
308+
}
307309
]
308310
}
309311
```
@@ -473,7 +475,7 @@ const logger = vscode.env.createTelemetryLogger({
473475
});
474476

475477
cat.onDidReceiveFeedback((feedback: vscode.ChatResultFeedback) => {
476-
// Log chat result feedback to be able to compute the success matric of the participant
478+
// Log chat result feedback to be able to compute the success metric of the participant
477479
logger.logUsage('chatResultFeedback', {
478480
kind: feedback.kind
479481
});

api/extension-guides/web-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ To make sure as much source code as possible can be reused, here are a few techn
460460

461461
* To polyfill a Node.js core module such as `path`, add an entry to [resolve.fallback](https://webpack.js.org/configuration/resolve/#resolvefallback).
462462
* To provide a Node.js global such as `process` use the [DefinePlugin plugin](https://webpack.js.org/plugins/define-plugin).
463-
* Use node modules that work in both browser and node runtime. Node modules can do that by defining both `browser` and `main` entry points. Webpack will automatically use the one matching its target. Examples of node modules that do this are [request-light](https://github.com/microsoft/node-request-light) and [vscode-nls](https://github.com/Microsoft/vscode-nls).
463+
* Use node modules that work in both browser and node runtime. Node modules can do that by defining both `browser` and `main` entry points. Webpack will automatically use the one matching its target. Examples of node modules that do this are [request-light](https://github.com/microsoft/node-request-light) and [@vscode/l10n](https://github.com/microsoft/vscode-l10n).
464464
* To provide an alternate implementation for a node module or source file, use [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealias).
465465
* Separate your code in a browser part, Node.js part, and common part. In common, only use code that works in both the browser and Node.js runtime. Create abstractions for functionality that has different implementations in Node.js and the browser.
466466
* Look out for usages of `path`, `URI.file`, `context.extensionPath`, `rootPath`. `uri.fsPath`. These will not work with virtual workspaces (non-file system) as they are used in VS Code for the Web. Instead use URIs with `URI.parse`, `context.extensionUri`. The [vscode-uri](https://www.npmjs.com/package/vscode-uri) node module provides `joinPath`, `dirName`, `baseName`, `extName`, `resolvePath`.

api/extension-guides/webview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ function getWebviewContent() {
721721

722722
![A script running in a webview](images/webview/scripts-basic.gif)
723723

724-
Wow! that's one productive cat.
724+
Wow! That's one productive cat.
725725

726726
Webview scripts can do just about anything that a script on a normal webpage can. Keep in mind though that webviews exist in their own context, so scripts in a webview do not have access to the VS Code API. That's where message passing comes in!
727727

api/ux-guidelines/quick-picks.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ MetaDescription: UX guidelines for quick picks used in a Visual Studio Code exte
1616
**✔️ Do**
1717

1818
* Use icons for clear metaphors
19+
* Use thoughtful icons that add clarity and help differentiate items
1920
* Use the description for displaying the current items (if applicable)
2021
* Use the detail for providing (brief) additional context
2122
* Use the multi-step pattern for a series of basic inputs
@@ -28,8 +29,6 @@ MetaDescription: UX guidelines for quick picks used in a Visual Studio Code exte
2829
❌ Don't
2930

3031
* Repeat existing functionality
31-
* Use the same icon for multiple items
32-
* Use more than six icons in a list
3332
* Use a title when the placeholder can describe the purpose on its own
3433
* Use inputs without a placeholder
3534

docs/csharp/cs-dev-kit-faq.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,22 @@ C# Dev Kit requires that it has built your project successfully before tests wil
193193

194194
Build your solution by right-clicking on the solution in the Solution Explorer and select **Build** or `kb(workbench.action.tasks.build)`. Once the build has been completed, your tests will appear in the Test Explorer panel.
195195

196+
### How do I collect logs for troubleshooting issues with Test Explorer?
197+
198+
If you are encountering issues with Test Explorer, you can enable diagnostic logging to gather more information for troubleshooting:
199+
200+
1. Increase Test Explorer verbosity:
201+
Navigate to the C# Dev Kit settings and increase the Test Explorer Verbosity setting from `minimal` to `diagnostic`. This will generate more detailed logs.
202+
2. Check the Output Window:
203+
Open the Output window in Visual Studio Code, and select **C# Dev Kit - Test Explorer** from the dropdown. Diagnostic messages will appear with a `[dev]` prefix.
204+
3. Collect the following information:
205+
When reporting an issue, ensure you include:
206+
- The diagnostic logs from the Output window.
207+
- Your operating system and version (for example, Windows 10, macOS 13).
208+
- The version of the C# Dev Kit extension you are using. Go to the Extensions view, and hover over the extension to view the version information.
209+
210+
This information will help in diagnosing and resolving the issue more efficiently.
211+
196212
## Debugger
197213

198214
### When I F5, nothing happens

docs/csharp/debugging.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,16 @@ In the dropdown, it lists all your existing debug configurations. If you hover o
7171

7272
![Remove dynamic configuration](images/debugging/delete-dynamic-config.gif)
7373

74+
### Debug with editor debug/run buttons
75+
76+
When a `.cs` file is open in the editor, run and debug options are accessible via the buttons located in the upper-right corner of the editor window. These actions will use the current file to query the project system and determine the associated project to launch.
77+
78+
The two options are:
79+
- <span class="codicon codicon-debug-start"></span> `Run project associated with this file`: This will launch your program with `noDebug: true` with the debug adapter.
80+
- <span class="codicon codicon-debug-alt"></span> `Debug project associated with this file`: This will launch your program under the debugger.
81+
82+
![Editor Run or Debug](images/debugging/editor-run-debug.png)
83+
7484
### Debug with launch.json
7585

7686
If you are using the C# Dev Kit, we recommend not using this option. However, if you have the need to modify the debug configuration directly, see [Configuring launch.json for C# debugging](/docs/csharp/debugger-settings.md).
Lines changed: 3 additions & 0 deletions
Loading

docs/editor/codebasics.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,16 @@ For more control over `Auto Save`, open User or Workspace [settings](/docs/getst
9898
* `onWindowChange` - to save files when the focus moves out of the VS Code window.
9999
* `setting(files.autoSaveDelay)`: Configures the delay in milliseconds when `setting(files.autoSave)` is configured to `afterDelay`. The default is 1000 ms.
100100

101+
If you want to customize the `Auto Save` functionality for specific languages or file types, you can do so from the `settings.json` file by adding language-specific rules.
102+
103+
For example, to disable `Auto Save` for LaTeX files:
104+
105+
```json
106+
"[latex]": {
107+
"files.autoSave": "off",
108+
},
109+
```
110+
101111
## Hot Exit
102112

103113
By default, VS Code remembers unsaved changes to files when you exit. Hot exit is triggered when the application is closed via **File** > **Exit** (**Code** > **Quit** on macOS) or when the last window is closed.

docs/editor/profiles.md

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -194,52 +194,50 @@ VS Code comes with a predefined set of profile templates that you can use to cus
194194
The Python profile is a good starting point for Python development. It comes with Python specific snippets and has the following extensions:
195195

196196
* [autoDocstring](https://marketplace.visualstudio.com/items?itemName=njpwerner.autodocstring) - Generate Python docstrings automatically.
197-
* [Black Formatter](https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter) - Formatting support using the [black](https://github.com/python/black) formatter.
198197
* [Docker](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) - Create, manage, and debug containerized applications.
199-
* [Even Better TOML](https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml) - Fully-featured TOML support.
200-
* [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python) - IntelliSense, linting, formatting, debugging, refactoring.
198+
* [Even Better TOML](https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml) - Fully-featured TOML support for e.g. `pyproject.toml` files.
199+
* [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python) - IntelliSense, environment management, debugging, refactoring.
201200
* [Python Environment Manager](https://marketplace.visualstudio.com/items?itemName=donjayamanne.python-environment-manager) - Manage Python environments and packages.
202201
* [Remote Development](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack) extension pack - Supports SSH, WSL, and Dev Containers.
203-
* [Ruff](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff) - Integrates the [Ruff](https://github.com/charliermarsh/ruff) Python linter.
202+
* [Ruff](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff) - Integrates the [Ruff](https://github.com/charliermarsh/ruff) Python linter and formatter.
204203

205204
This profile also sets the following settings:
206205

207206
```json
208207
"python.analysis.autoImportCompletions": true,
209208
"python.analysis.fixAll": ["source.unusedImports"],
210-
"editor.defaultFormatter": "ms-python.black-formatter"
209+
"editor.defaultFormatter": "charliermarsh.ruff"
211210
```
212211

213212
### Data Science Profile Template
214213

215214
The Data Science profile is a good starting point for all data and notebook work. It comes with specific snippets and has the following extensions:
216215

217216
* [Data Wrangler](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.datawrangler) - Data viewing, cleaning and preparation for tabular datasets and Excel/CSV/Parquet files.
218-
* [Black Formatter](https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter) - Formatting support using the [black](https://github.com/python/black) formatter.
219-
* [Jupyter](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) - Use Jupyter notebooks within VS Code.
220-
* [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python) - IntelliSense, linting, formatting, debugging, refactoring.
221-
* [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) - Create custom development environments inside a Docker container.
222217
* [GitHub Copilot](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot) - Your AI pair programmer.
218+
* [Jupyter](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) - Use Jupyter notebooks within VS Code.
219+
* [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python) - IntelliSense, environment management, debugging, refactoring.
220+
* [Remote Development](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack) extension pack - Supports SSH, WSL, and Dev Containers.
221+
* [Ruff](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff) - Integrates the [Ruff](https://github.com/charliermarsh/ruff) Python linter and formatter.
223222

224223
This profile also sets the following settings:
225224

226225
```json
227226
"[python]": {
228-
"editor.defaultFormatter": "ms-python.black-formatter",
227+
"editor.defaultFormatter": "charliermarsh.ruff",
229228
"editor.formatOnType": true,
230229
"editor.formatOnSave": true
231230
},
232231
"editor.inlineSuggest.enabled": true,
233232
"editor.lineHeight": 17,
234233
"breadcrumbs.enabled": false,
235234
"files.autoSave": "afterDelay",
235+
"notebook.output.scrolling": true,
236236
"jupyter.themeMatplotlibPlots": true,
237237
"jupyter.widgetScriptSources": [
238238
"unpkg.com",
239239
"jsdelivr.com"
240240
],
241-
"notebook.experimental.outputScrolling": true,
242-
// "notebook.outline.showCodeCells": true,
243241
"files.exclude": {
244242
"**/.csv": true,
245243
"**/.parquet": true,
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)