Skip to content

Commit 72dba68

Browse files
BABA983BABA983
authored
Merge branch 'main' into fix-146732
2 parents 095334e + c19df5b commit 72dba68

File tree

1,539 files changed

+214635
-35194
lines changed

Some content is hidden

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

1,539 files changed

+214635
-35194
lines changed

‎.devcontainer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Code - OSS Development Container
22

3-
[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
3+
[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
44

55
This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
66

‎.github/classifier.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"layout": {"assign": ["benibenj"]},
128128
"lcd-text-rendering": {"assign": []},
129129
"list-widget": {"assign": ["joaomoreno"]},
130-
"live-preview": {"assign": ["andreamah"]},
130+
"live-preview": {"assign": []},
131131
"log": {"assign": ["sandy081"]},
132132
"markdown": {"assign": ["mjbvz"]},
133133
"marketplace": {"assign": ["isidorn"]},
@@ -199,9 +199,9 @@
199199
"sash-widget": {"assign": ["joaomoreno"]},
200200
"scm": {"assign": ["lszomoru"]},
201201
"screencast-mode": {"assign": ["joaomoreno"]},
202-
"search": {"assign": ["andreamah", "roblourens"]},
203-
"search-api": {"assign": ["andreamah", "roblourens"]},
204-
"search-editor": {"assign": ["andreamah", "roblourens"]},
202+
"search": {"assign": ["roblourens"]},
203+
"search-api": {"assign": ["roblourens"]},
204+
"search-editor": {"assign": ["roblourens"]},
205205
"search-replace": {"assign": ["sandy081"]},
206206
"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
207207
"server": {"assign": ["alexdima"]},
@@ -215,7 +215,6 @@
215215
"snap": {"assign": ["deepak1556"]},
216216
"snippets": {"assign": ["jrieken"]},
217217
"splitview-widget": {"assign": ["joaomoreno"]},
218-
"ssh": {"assign": ["eleanorjboyd"]},
219218
"suggest": {"assign": ["jrieken"]},
220219
"table-widget": {"assign": ["joaomoreno"]},
221220
"tasks": {"assign": ["meganrogge"], "accuracy": 0.85},

‎.github/commands.yml

-13
This file was deleted.

‎.github/copilot-instructions.md

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Coding Guidelines
2+
3+
## Introduction
4+
5+
These are VS Code coding guidelines. Please also review our [Source Code Organisation](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) page.
6+
7+
## Indentation
8+
9+
We use tabs, not spaces.
10+
11+
## Naming Conventions
12+
13+
* Use PascalCase for `type` names
14+
* Use PascalCase for `enum` values
15+
* Use camelCase for `function` and `method` names
16+
* Use camelCase for `property` names and `local variables`
17+
* Use whole words in names when possible
18+
19+
## Types
20+
21+
* Do not export `types` or `functions` unless you need to share it across multiple components
22+
* Do not introduce new `types` or `values` to the global namespace
23+
24+
## Comments
25+
26+
* When there are comments for `functions`, `interfaces`, `enums`, and `classes` use JSDoc style comments
27+
28+
## Strings
29+
30+
* Use "double quotes" for strings shown to the user that need to be externalized (localized)
31+
* Use 'single quotes' otherwise
32+
* All strings visible to the user need to be externalized
33+
34+
## Style
35+
36+
* Use arrow functions `=>` over anonymous function expressions
37+
* Only surround arrow function parameters when necessary. For example, `(x) => x + x` is wrong but the following are correct:
38+
39+
```javascript
40+
x => x + x
41+
(x, y) => x + y
42+
<T>(x: T, y: T) => x === y
43+
```
44+
45+
* Always surround loop and conditional bodies with curly braces
46+
* Open curly braces always go on the same line as whatever necessitates them
47+
* Parenthesized constructs should have no surrounding whitespace. A single space follows commas, colons, and semicolons in those constructs. For example:
48+
49+
```javascript
50+
for (let i = 0, n = str.length; i < 10; i++) {
51+
if (x < 10) {
52+
foo();
53+
}
54+
}
55+
56+
function f(x: number, y: string): void { }
57+
```

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- uses: actions/setup-python@v5
3030
with:
31-
python-version: "2.x"
31+
python-version: "3.x"
3232

3333
- name: Compute node modules cache key
3434
id: nodeModulesCacheKey

‎.npmrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
disturl="https://electronjs.org/headers"
2-
target="32.1.2"
3-
ms_build_id="10323173"
2+
target="32.2.6"
3+
ms_build_id="10629634"
44
runtime="electron"
55
build_from_source="true"
66
legacy-peer-deps="true"

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.17.0
1+
20.18.0

‎.vscode-test.js

+10
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ const extensions = [
4242
workspaceFolder: `extensions/vscode-colorize-tests/test`,
4343
mocha: { timeout: 60_000 }
4444
},
45+
{
46+
label: 'terminal-suggest',
47+
workspaceFolder: path.join(os.tmpdir(), `terminal-suggest-${Math.floor(Math.random() * 100000)}`),
48+
mocha: { timeout: 60_000 }
49+
},
50+
{
51+
label: 'vscode-colorize-perf-tests',
52+
workspaceFolder: `extensions/vscode-colorize-perf-tests/test`,
53+
mocha: { timeout: 6000_000 }
54+
},
4555
{
4656
label: 'configuration-editing',
4757
workspaceFolder: path.join(os.tmpdir(), `confeditout-${Math.floor(Math.random() * 100000)}`),

‎.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class ScriptCoverageTracker {
142142
}
143143
}
144144

145-
export class V8CoverageFile extends vscode.FileCoverage2 {
145+
export class V8CoverageFile extends vscode.FileCoverage {
146146
public details: vscode.StatementCoverage[] = [];
147147

148148
constructor(

‎.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,11 @@ export async function activate(context: vscode.ExtensionContext) {
8686
}, uri => ctrl.items.get(uri.toString().toLowerCase()));
8787
ctrl.relatedCodeProvider = graph;
8888

89-
context.subscriptions.push(
90-
new FailureTracker(context, folder.uri.fsPath),
91-
fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)),
92-
);
89+
if (context.storageUri) {
90+
context.subscriptions.push(new FailureTracker(context.storageUri.fsPath, folder.uri.fsPath));
91+
}
92+
93+
context.subscriptions.push(fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)));
9394
});
9495

9596
const createRunHandler = (

‎.vscode/extensions/vscode-selfhost-test-provider/src/failureTracker.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export class FailureTracker {
3333
private readonly logFile: string;
3434
private logs?: ITrackedRemediation[];
3535

36-
constructor(context: vscode.ExtensionContext, private readonly rootDir: string) {
37-
this.logFile = join(context.globalStorageUri.fsPath, '.build/vscode-test-failures.json');
36+
constructor(storageLocation: string, private readonly rootDir: string) {
37+
this.logFile = join(storageLocation, '.build/vscode-test-failures.json');
3838
mkdirSync(dirname(this.logFile), { recursive: true });
3939

4040
const oldLogFile = join(rootDir, '.build/vscode-test-failures.json');

‎.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"src/**/*",
1212
"../../../src/vscode-dts/vscode.d.ts",
1313
"../../../src/vscode-dts/vscode.proposed.testObserver.d.ts",
14-
"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts",
15-
"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts"
14+
"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts"
1615
]
1716
}

‎.vscode/launch.json

+18
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,24 @@
202202
"order": 5
203203
}
204204
},
205+
{
206+
"type": "extensionHost",
207+
"request": "launch",
208+
"name": "VS Code Tokenizer Performance Tests",
209+
"runtimeExecutable": "${execPath}",
210+
"args": [
211+
"${workspaceFolder}/extensions/vscode-colorize-perf-tests/test",
212+
"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-colorize-perf-tests",
213+
"--extensionTestsPath=${workspaceFolder}/extensions/vscode-colorize-perf-tests/out"
214+
],
215+
"outFiles": [
216+
"${workspaceFolder}/out/**/*.js"
217+
],
218+
"presentation": {
219+
"group": "5_tests",
220+
"order": 6
221+
}
222+
},
205223
{
206224
"type": "chrome",
207225
"request": "attach",

‎.vscode/notebooks/api.github-issues

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"September 2024\""
10+
"value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"November 2024\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/endgame.github-issues

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"September 2024\""
10+
"value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"November 2024\""
1111
},
1212
{
1313
"kind": 1,

0 commit comments

Comments
 (0)