Skip to content

Commit 4bf7769

Browse files
authored
Merge branch 'main' into copilot/fix-quickpick-toggle-issue
2 parents ec35b90 + c6464f8 commit 4bf7769

File tree

473 files changed

+6727
-4285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

473 files changed

+6727
-4285
lines changed

.github/commands.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,5 +663,12 @@
663663
"addLabel": "agent-behavior",
664664
"removeLabel": "~agent-behavior",
665665
"comment": "Unfortunately I think you are hitting a AI quality issue that is not actionable enough for us to track a bug. We would recommend that you try other available models and look at the [Tips and tricks for Copilot in VS Code](https://code.visualstudio.com/docs/copilot/copilot-tips-and-tricks) doc page.\n\nWe are constantly improving AI quality in every release, thank you for the feedback! If you believe this is a technical bug, we recommend you report a new issue including logs described on the [Copilot Issues](https://github.com/microsoft/vscode/wiki/Copilot-Issues) wiki page."
666+
},
667+
{
668+
"type": "label",
669+
"name": "~accessibility-sla",
670+
"addLabel": "accessibility-sla",
671+
"removeLabel": "~accessibility-sla",
672+
"comment": "The Visual Studio and VS Code teams have an agreement with the Accessibility team that 3:1 contrast is enough for inside the editor."
666673
}
667674
]
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
agent: agent
3+
description: 'Update doc comments'
4+
tools: ['edit', 'search', 'new', 'runCommands', 'runTasks', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'extensions', 'todos', 'runTests']
5+
---
6+
# Role
7+
8+
You are an expert technical documentation editor specializing in public API documentation.
9+
10+
## Instructions
11+
12+
Review user's request and update code documentation comments in appropriate locations.
13+
14+
## Guidelines
15+
16+
- **Important** Do not, under any circumstances, change any of the public API naming or signatures.
17+
- **Important** Fetch and review relevant code context (i.e. implementation source code) before making changes or adding comments.
18+
- **Important** Do not use 'VS Code', 'Visual Studio Code' or similar product term anywhere in the comments (this causes lint errors).
19+
- Follow American English grammar, orthography, and punctuation.
20+
- Summary and description comments must use sentences if possible and end with a period.
21+
- Use {@link \<symbol\>} where possible **and reasonable** to refer to code symbols.
22+
- If a @link uses a custom label, keep it - for example: {@link Uri address} - do not remove the 'address' label.
23+
- Use `code` formatting for code elements and keywords in comments, for example: `undefined`.
24+
- Limit the maximum line length of comments to 120 characters.
25+
26+
## Cleanup Mode
27+
28+
If the user instructed you to "clean up" doc comments (e.g. by passing in "cleanup" as their prompt),
29+
it is **very important** that you limit your changes to only fixing grammar, punctuation, formatting, and spelling mistakes.
30+
**YOU MUST NOT** add new or remove or expand existing comments in cleanup mode.
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
---
2+
agent: agent
3+
tools: ['github/github-mcp-server/issue_read', 'github/github-mcp-server/list_issues', 'github/github-mcp-server/search_issues', 'runSubagent']
4+
model: Claude Sonnet 4.5 (copilot)
5+
description: 'Describe your issue...'
6+
---
7+
8+
## Role
9+
You are **FindIssue**, a focused GitHub issue investigator for this repository.
10+
Your job is to locate any existing issues that match the user's natural-language description, while making your search process transparent.
11+
12+
## Objective
13+
When the user describes a potential bug, crash, or feature request:
14+
1. Search the repository for similar issues using parallel tool calls when possible
15+
2. Display *every search query* attempted for transparency
16+
3. Return the most relevant issues (open or closed) with short summaries
17+
4. If nothing matches, provide a complete new issue template in a dedicated section
18+
19+
## Context
20+
- Users may not phrase things the same way as existing issues.
21+
- Always prefer **semantic relevance** and **clarity** over keyword quantity.
22+
- Include **open** issues first, but consider **recently closed** ones when relevant.
23+
24+
## Workflow
25+
1. **Interpret Input**
26+
- Summarize the user's request in 1 line (you may restate it as a possible issue title)
27+
- **Identify the specific context and component** (e.g., "chat window UI" vs "prompt file editor" vs "settings page")
28+
- Derive 2 concise search queries using likely keywords or variations (avoid creating too many queries)
29+
30+
2. **Search**
31+
- Run a subAgent that uses parallel tool calls of `github/github-mcp-server/search_issues` with `perPage: 5` and `owner: microsoft`.
32+
- If no results, try variations:
33+
* Remove UI-specific modifiers ("right click", "context menu")
34+
* Substitute action verbs (hide→remove, dismiss→close)
35+
* Remove platform/OS qualifiers
36+
37+
3. **Read & Analyze**
38+
- **First evaluate search results by title, state, and labels only** - often sufficient to determine relevance
39+
- **Only read full issue content** (via `github/github-mcp-server/issue_read`) **for the top 1-2 most promising matches** that you cannot confidently assess from title alone
40+
- **Verify the issue context matches the user's context** - check if the issue is about the same UI component, file type, or workflow step
41+
- Evaluate relevance based on:
42+
* Core concept match (most important)
43+
* Component/context match
44+
* Action/behavior match (user's requested action may differ from issue's proposed solution)
45+
- **If the issue mentions similar features but in a different context, mark it as "related" not "exact match"**
46+
47+
4. **Display Results**
48+
- **First**, list the searches you performed, for transparency:
49+
```
50+
🔍 Searches performed:
51+
- "DataLoader null pointer Windows"
52+
- "NullReferenceException loader crash"
53+
- "Windows DataLoader crash"
54+
```
55+
- **Then**, summarize results in a Markdown table with the following columns: #, Title, State, Relevance, Notes. Use emojis for state (🔓 Open, 🔒 Closed) and relevance (✅ Exact, 🔗 Related).
56+
57+
5. **Conclude**
58+
- Matching context → recommend most relevant issue
59+
- Different context → explain difference and suggest new issue
60+
- Nothing found → suggest title and keywords for new issue
61+
62+
<output_style>
63+
## Style
64+
- Keep explanations short and scannable
65+
- Use Markdown formatting (bullets, tables)
66+
- Go straight to findings—no preamble
67+
</output_style>
68+
69+
## Example
70+
71+
**User:**
72+
> "I get an access violation when I close the app after running the renderer."
73+
74+
**Assistant:**
75+
🔍 **Searches performed:**
76+
- "renderer crash" (core concepts)
77+
- "renderer exit crash" (core + action)
78+
- "access violation renderer shutdown" (original phrasing)
79+
- "renderer close segmentation fault" (synonym variation)
80+
81+
Found 2 similar issues:
82+
| # | Title | State | Relevance | Notes |
83+
|---|--------|--------|-----------|-------|
84+
| #201 | Renderer crash on exit | 🔓 Open | ✅ Exact | Matches shutdown sequence and context |
85+
| #178 | App closes unexpectedly after render | 🔒 Closed | 🔗 Related | Similar timing but fixed in v2.3 |
86+
87+
✅ **You can comment on #201** as it matches your issue.
88+
89+
---
90+
91+
### 📝 Alternative: Suggested New Issue
92+
93+
**Title:**
94+
Renderer access violation on app exit
95+
96+
**Description:**
97+
The application crashes with an access violation error when closing after running the renderer. This occurs consistently during the shutdown sequence and prevents clean application termination.
98+
99+
**Keywords:**
100+
`renderer`, `shutdown`, `access-violation`, `crash`

.vscode/launch.json

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,11 +588,33 @@
588588
]
589589
},
590590
{
591-
"name": "Monaco Editor Playground",
591+
"name": "Monaco Editor - Playground",
592592
"type": "chrome",
593593
"request": "launch",
594-
"url": "http://localhost:5001",
595-
"preLaunchTask": "Launch Http Server",
594+
"url": "https://microsoft.github.io/monaco-editor/playground.html?source=http%3A%2F%2Flocalhost%3A5199%2Fbuild%2Fmonaco-editor-playground%2Findex.ts%3Fesm#example-creating-the-editor-hello-world",
595+
"preLaunchTask": "Launch Monaco Editor Vite",
596+
"presentation": {
597+
"group": "monaco",
598+
"order": 4
599+
}
600+
},
601+
{
602+
"name": "Monaco Editor - Self Contained Diff Editor",
603+
"type": "chrome",
604+
"request": "launch",
605+
"url": "http://localhost:5199/build/monaco-editor-playground/index.html",
606+
"preLaunchTask": "Launch Monaco Editor Vite",
607+
"presentation": {
608+
"group": "monaco",
609+
"order": 4
610+
}
611+
},
612+
{
613+
"name": "Monaco Editor - Workbench",
614+
"type": "chrome",
615+
"request": "launch",
616+
"url": "http://localhost:5199/build/monaco-editor-playground/workbench-vite.html",
617+
"preLaunchTask": "Launch Monaco Editor Vite",
596618
"presentation": {
597619
"group": "monaco",
598620
"order": 4

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@
203203
// "application.experimental.rendererProfiling": true, // https://github.com/microsoft/vscode/issues/265654
204204
"editor.aiStats.enabled": true, // Team selfhosting on ai stats
205205
"chat.emptyState.history.enabled": true,
206-
"chat.agentSessionsViewLocation": "view",
207206
"chat.promptFilesRecommendations": {
208207
"plan-fast": true,
209208
"plan-deep": true

.vscode/tasks.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,12 @@
279279
"detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit"
280280
},
281281
{
282-
"label": "Launch Http Server",
282+
"label": "Launch Monaco Editor Vite",
283283
"type": "shell",
284-
"command": "node_modules/.bin/ts-node -T ./scripts/playground-server",
284+
"command": "npm run dev",
285+
"options": {
286+
"cwd": "./build/monaco-editor-playground/"
287+
},
285288
"isBackground": true,
286289
"problemMatcher": {
287290
"pattern": {
@@ -292,10 +295,7 @@
292295
"beginsPattern": "never match",
293296
"endsPattern": ".*"
294297
}
295-
},
296-
"dependsOn": [
297-
"Core - Build"
298-
]
298+
}
299299
},
300300
{
301301
"label": "Launch MCP Server",

ThirdPartyNotices.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2277,7 +2277,7 @@ written authorization of the copyright holder.
22772277

22782278
---------------------------------------------------------
22792279

2280-
vscode-codicons 0.0.14 - MIT and Creative Commons Attribution 4.0
2280+
vscode-codicons 0.0.41 - MIT and Creative Commons Attribution 4.0
22812281
https://github.com/microsoft/vscode-codicons
22822282

22832283
Attribution 4.0 International

build/filters.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ module.exports.unicodeFilter = [
4949
'!build/win32/**',
5050
'!extensions/markdown-language-features/notebook-out/*.js',
5151
'!extensions/markdown-math/notebook-out/**',
52+
'!extensions/mermaid-chat-features/chat-webview-out/**',
5253
'!extensions/ipynb/notebook-out/**',
5354
'!extensions/notebook-renderers/renderer-out/**',
5455
'!extensions/php-language-features/src/features/phpGlobalFunctions.ts',
@@ -140,6 +141,7 @@ module.exports.indentationFilter = [
140141
'!**/*.dockerfile',
141142

142143
// except for built files
144+
'!extensions/mermaid-chat-features/chat-webview-out/*.js',
143145
'!extensions/markdown-language-features/media/*.js',
144146
'!extensions/markdown-language-features/notebook-out/*.js',
145147
'!extensions/markdown-math/notebook-out/*.js',

build/gulpfile.hygiene.js renamed to build/gulpfile.hygiene.mjs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5+
import gulp from 'gulp';
6+
import es from 'event-stream';
7+
import path from 'path';
8+
import fs from 'fs';
9+
import task from './lib/task.js';
10+
import { hygiene } from './hygiene.mjs';
511

6-
const gulp = require('gulp');
7-
const es = require('event-stream');
8-
const path = require('path');
9-
const task = require('./lib/task');
10-
const { hygiene } = require('./hygiene');
12+
const dirName = path.dirname(new URL(import.meta.url).pathname);
1113

1214
/**
1315
* @param {string} actualPath
1416
*/
1517
function checkPackageJSON(actualPath) {
16-
const actual = require(path.join(__dirname, '..', actualPath));
17-
const rootPackageJSON = require('../package.json');
18+
const actual = JSON.parse(fs.readFileSync(path.join(dirName, '..', actualPath), 'utf8'));
19+
const rootPackageJSON = JSON.parse(fs.readFileSync(path.join(dirName, '..', 'package.json'), 'utf8'));
1820
const checkIncluded = (set1, set2) => {
1921
for (const depName in set1) {
2022
const depVersion = set1[depName];

build/gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ process.on('unhandledRejection', (reason, p) => {
4949
});
5050

5151
// Load all the gulpfiles only if running tasks other than the editor tasks
52-
require('glob').sync('gulpfile.*.js', { cwd: __dirname })
52+
require('glob').sync('gulpfile.*.{js,mjs}', { cwd: __dirname })
5353
.forEach(f => require(`./${f}`));

0 commit comments

Comments
 (0)